mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 18:55:30 +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
137 lines
3.9 KiB
C++
137 lines
3.9 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 "X11BasicCompositor.h"
|
|
#include "gfxPlatform.h"
|
|
#include "gfx2DGlue.h"
|
|
#include "gfxXlibSurface.h"
|
|
#include "gfxImageSurface.h"
|
|
#include "mozilla/X11Util.h"
|
|
|
|
namespace mozilla {
|
|
using namespace mozilla::gfx;
|
|
|
|
namespace layers {
|
|
|
|
bool
|
|
X11DataTextureSourceBasic::Update(gfx::DataSourceSurface* aSurface,
|
|
nsIntRegion* aDestRegion,
|
|
gfx::IntPoint* aSrcOffset)
|
|
{
|
|
// Reallocate our internal X11 surface if we don't have a DrawTarget yet,
|
|
// or if we changed surface size or format since last update.
|
|
if (!mBufferDrawTarget ||
|
|
(aSurface->GetSize() != mBufferDrawTarget->GetSize()) ||
|
|
(aSurface->GetFormat() != mBufferDrawTarget->GetFormat())) {
|
|
|
|
RefPtr<gfxASurface> surf;
|
|
gfxImageFormat imageFormat = SurfaceFormatToImageFormat(aSurface->GetFormat());
|
|
Display *display = DefaultXDisplay();
|
|
Screen *screen = DefaultScreenOfDisplay(display);
|
|
XRenderPictFormat *xrenderFormat =
|
|
gfxXlibSurface::FindRenderFormat(display, imageFormat);
|
|
|
|
if (xrenderFormat) {
|
|
surf = gfxXlibSurface::Create(screen, xrenderFormat,
|
|
aSurface->GetSize());
|
|
}
|
|
|
|
if (!surf) {
|
|
NS_WARNING("Couldn't create native surface, fallback to image surface");
|
|
surf = new gfxImageSurface(aSurface->GetSize(), imageFormat);
|
|
}
|
|
|
|
mBufferDrawTarget = gfxPlatform::GetPlatform()->
|
|
CreateDrawTargetForSurface(surf, aSurface->GetSize());
|
|
}
|
|
|
|
// Image contents have changed, upload to our DrawTarget
|
|
// If aDestRegion is null, means we're updating the whole surface
|
|
// Note : Incremental update with a source offset is only used on Mac.
|
|
NS_ASSERTION(!aSrcOffset, "SrcOffset should not be used with linux OMTC basic");
|
|
|
|
if (aDestRegion) {
|
|
nsIntRegionRectIterator iter(*aDestRegion);
|
|
while (const IntRect* iterRect = iter.Next()) {
|
|
IntRect srcRect(iterRect->x, iterRect->y, iterRect->width, iterRect->height);
|
|
IntPoint dstPoint(iterRect->x, iterRect->y);
|
|
|
|
// We're uploading regions to our buffer, so let's just copy contents over
|
|
mBufferDrawTarget->CopySurface(aSurface, srcRect, dstPoint);
|
|
}
|
|
} else {
|
|
// We're uploading the whole buffer, so let's just copy the full surface
|
|
IntSize size = aSurface->GetSize();
|
|
mBufferDrawTarget->CopySurface(aSurface, IntRect(0, 0, size.width, size.height),
|
|
IntPoint(0, 0));
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
TextureSourceBasic*
|
|
X11DataTextureSourceBasic::AsSourceBasic()
|
|
{
|
|
return this;
|
|
}
|
|
|
|
IntSize
|
|
X11DataTextureSourceBasic::GetSize() const
|
|
{
|
|
if (!mBufferDrawTarget) {
|
|
NS_WARNING("Trying to query the size of an uninitialized TextureSource");
|
|
return IntSize(0, 0);
|
|
} else {
|
|
return mBufferDrawTarget->GetSize();
|
|
}
|
|
}
|
|
|
|
gfx::SurfaceFormat
|
|
X11DataTextureSourceBasic::GetFormat() const
|
|
{
|
|
if (!mBufferDrawTarget) {
|
|
NS_WARNING("Trying to query the format of an uninitialized TextureSource");
|
|
return gfx::SurfaceFormat::UNKNOWN;
|
|
} else {
|
|
return mBufferDrawTarget->GetFormat();
|
|
}
|
|
}
|
|
|
|
SourceSurface*
|
|
X11DataTextureSourceBasic::GetSurface(DrawTarget* aTarget)
|
|
{
|
|
RefPtr<gfx::SourceSurface> surface;
|
|
if (mBufferDrawTarget) {
|
|
surface = mBufferDrawTarget->Snapshot();
|
|
return surface.get();
|
|
} else {
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
void
|
|
X11DataTextureSourceBasic::DeallocateDeviceData()
|
|
{
|
|
mBufferDrawTarget = nullptr;
|
|
}
|
|
|
|
already_AddRefed<DataTextureSource>
|
|
X11BasicCompositor::CreateDataTextureSource(TextureFlags aFlags)
|
|
{
|
|
RefPtr<DataTextureSource> result =
|
|
new X11DataTextureSourceBasic();
|
|
return result.forget();
|
|
}
|
|
|
|
void
|
|
X11BasicCompositor::EndFrame()
|
|
{
|
|
BasicCompositor::EndFrame();
|
|
XFlush(DefaultXDisplay());
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|