mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 00:35:44 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
110 lines
2.7 KiB
C++
110 lines
2.7 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "X11TextureHost.h"
|
|
#include "mozilla/layers/BasicCompositor.h"
|
|
#include "mozilla/layers/X11TextureSourceBasic.h"
|
|
#ifdef GL_PROVIDER_GLX
|
|
#include "mozilla/layers/CompositorOGL.h"
|
|
#include "mozilla/layers/X11TextureSourceOGL.h"
|
|
#endif
|
|
#include "gfxXlibSurface.h"
|
|
#include "gfx2DGlue.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
X11TextureHost::X11TextureHost(TextureFlags aFlags,
|
|
const SurfaceDescriptorX11& aDescriptor)
|
|
: TextureHost(aFlags)
|
|
{
|
|
RefPtr<gfxXlibSurface> surface = aDescriptor.OpenForeign();
|
|
mSurface = surface.get();
|
|
|
|
if (!(aFlags & TextureFlags::DEALLOCATE_CLIENT)) {
|
|
mSurface->TakePixmap();
|
|
}
|
|
}
|
|
|
|
bool
|
|
X11TextureHost::Lock()
|
|
{
|
|
if (!mCompositor) {
|
|
return false;
|
|
}
|
|
|
|
if (!mTextureSource) {
|
|
switch (mCompositor->GetBackendType()) {
|
|
case LayersBackend::LAYERS_BASIC:
|
|
mTextureSource =
|
|
new X11TextureSourceBasic(static_cast<BasicCompositor*>(mCompositor.get()),
|
|
mSurface);
|
|
break;
|
|
#ifdef GL_PROVIDER_GLX
|
|
case LayersBackend::LAYERS_OPENGL:
|
|
mTextureSource =
|
|
new X11TextureSourceOGL(static_cast<CompositorOGL*>(mCompositor.get()),
|
|
mSurface);
|
|
break;
|
|
#endif
|
|
default:
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
X11TextureHost::SetCompositor(Compositor* aCompositor)
|
|
{
|
|
mCompositor = aCompositor;
|
|
if (mTextureSource) {
|
|
mTextureSource->SetCompositor(aCompositor);
|
|
}
|
|
}
|
|
|
|
SurfaceFormat
|
|
X11TextureHost::GetFormat() const
|
|
{
|
|
gfxContentType type = mSurface->GetContentType();
|
|
#ifdef GL_PROVIDER_GLX
|
|
if (mCompositor->GetBackendType() == LayersBackend::LAYERS_OPENGL) {
|
|
return X11TextureSourceOGL::ContentTypeToSurfaceFormat(type);
|
|
}
|
|
#endif
|
|
return X11TextureSourceBasic::ContentTypeToSurfaceFormat(type);
|
|
}
|
|
|
|
IntSize
|
|
X11TextureHost::GetSize() const
|
|
{
|
|
return mSurface->GetSize();
|
|
}
|
|
|
|
already_AddRefed<gfx::DataSourceSurface>
|
|
X11TextureHost::GetAsSurface()
|
|
{
|
|
if (!mTextureSource || !mTextureSource->AsSourceBasic()) {
|
|
return nullptr;
|
|
}
|
|
RefPtr<DrawTarget> tempDT =
|
|
gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(
|
|
GetSize(), GetFormat());
|
|
if (!tempDT) {
|
|
return nullptr;
|
|
}
|
|
RefPtr<SourceSurface> surf = mTextureSource->AsSourceBasic()->GetSurface(tempDT);
|
|
if (!surf) {
|
|
return nullptr;
|
|
}
|
|
return surf->GetDataSurface();
|
|
}
|
|
|
|
}
|
|
}
|