mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
b75b514a74
- Bug 1194059 (Part 1) - Ensure that metadata decode progress is always delivered atomically. r=tn (07f0441600) - Bug 1191090 - Use the normal PNG decoder for PNG metadata decodes. r=tn (ce3fe1be5f) - Bug 1191114 (Part 1) - Always detect HAS_TRANSPARENCY during the metadata decode. r=tn (3841132932) - Bug 1191114 (Part 2) - Add support for creating an anonymous metadata decoder, for use in tests. r=tn (2cdcc0c278) - Bug 1191114 (Part 3) - Add flags to image test cases. r=tn (4a6f5a5230) - Bug 1191114 (Part 4) - Add tests for metadata decoding, including that we always deliver HAS_TRANSPARENCY during the metadata decode. r=tn (b9c5d1cd4a) - Bug 1126330 - Remove the check for non-looping animations. r=seth (828dabba24) - Bug 1194059 (Part 2) - Always detect IS_ANIMATED during the metadatadecode. r=tn (0ba5bf38f1) - Bug 1194059 (Part 3) - Ensure the nsIInputStream LoadImage() returns is always buffered. r=tn (ed2b02205b) - Bug 1194059 (Part 4) - Add tests that we detect IS_ANIMATED during the metadata decode. r=tn (298f14a7c9) - Bug 1188705 (part 1) - Remove gfxASurface::GetMemoryLocation(). r=seth. (1f0da73a08) - Bug 1188705 (part 2) - Remove unused SizeOfDecodedWithComputedFallbackIfHeap declaration. r=seth. (3356dbed06) - Bug 1188705 (part 3) - Simplify imgFrame::SizeOfExcludingThis(). r=seth. (563262a834) - Bug 1155252 - Don't allocate X11TextureClients bigger than xlib's maximum surface size. r=jrmuizel (3f11590667) - Bug 1143994 - Fix some -Wunreachable-code and -Wswitch warnings in imagelib. r=seth (008becc7e2) - Bug 1060609 (Part 1) - Disable downscale-during-decode when HQ scaling is disabled. r=tn (6da77e3cad) - Bug 1187569 - PNGs getting stuck in a pixelated state. r=seth (da305ef99c) - Bug 1194900 - Stop deciding when to send invalidations in nsPNGDecoder and let Decoder handle it. r=tn (50fa14a984) - Bug 1151694 - Part 1 - Move CommonAnimationManager::sLayerAnimationInfo into LayerAnimationInfo.(cpp|h). r=bbirtles (9f93e0d569) - Bug 1151694 - Part 2 - imgTools should be inside mozilla::image namespace. r=bbirtles (8dfc3f2e4b) - Bug 1196066 (Part 1) - Fix bad directory entries in two of our ICO reftests. r=tn (9e4c70d2b4) - Bug 1196065 - Add sanity tests for image decoders. r=tn (557b9131cb) - Bug 1194912 (Part 1) - Add CopyOnWrite<T> to support automatic copy-on-write for recursive writes to data structures. r=tn (b081a50716) - Bug 1196066 (Part 2) - Add a streaming lexing framework to ImageLib. r=tn (59eb634ea5) - Bug 1196476 - Replace ProgressTracker::FirstObserverIs() with a simpler mechanism on imgRequest. r=tn (db9ecc65ef) - missing part of Bug 1139225 (Part 2) - Dispatch OnImageAvailable to the main thread manually in imgRequest. r=tn (e7b22db614) - Bug 1194912 (Part 2) - Store ProgressTracker observers in a copy-on-write hash table, and dispatch notifications to them using a template. r=tn (5efd7b38b3) - Bug 1180225. Make convolver more like upstream. r=seth (18e3c168fc) - Bug 1149318 - Fix the calling convention on SkGetUserDefaultLocaleNameProc. r=eihrul (7b750d4e4e) - Bug 1210493 - enlarge stroke bounds by line width when doing a quick-reject in SkDraw::drawRect. r=jmuizelaar (e8b5d0fe2d) - Bug 1188206 - Fix more constructors in gfx; r=jrmuizel (944ea9938c)
169 lines
4.6 KiB
C++
169 lines
4.6 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 "mozilla/layers/TextureClientX11.h"
|
|
#include "mozilla/layers/CompositableClient.h"
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
#include "mozilla/layers/ShadowLayerUtilsX11.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/gfx/Logging.h"
|
|
#include "gfxXlibSurface.h"
|
|
#include "gfx2DGlue.h"
|
|
|
|
#include "mozilla/X11Util.h"
|
|
#include <X11/Xlib.h>
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::gfx;
|
|
using namespace mozilla::layers;
|
|
|
|
TextureClientX11::TextureClientX11(ISurfaceAllocator* aAllocator,
|
|
SurfaceFormat aFormat,
|
|
TextureFlags aFlags)
|
|
: TextureClient(aAllocator, aFlags),
|
|
mFormat(aFormat),
|
|
mLocked(false)
|
|
{
|
|
MOZ_COUNT_CTOR(TextureClientX11);
|
|
}
|
|
|
|
TextureClientX11::~TextureClientX11()
|
|
{
|
|
MOZ_COUNT_DTOR(TextureClientX11);
|
|
}
|
|
|
|
already_AddRefed<TextureClient>
|
|
TextureClientX11::CreateSimilar(TextureFlags aFlags,
|
|
TextureAllocationFlags aAllocFlags) const
|
|
{
|
|
RefPtr<TextureClient> tex = new TextureClientX11(mAllocator, mFormat, mFlags);
|
|
|
|
// mSize is guaranteed to be non-negative
|
|
MOZ_ASSERT(mSize.width >= 0 && mSize.height >= 0);
|
|
if (!tex->AllocateForSurface(mSize, aAllocFlags)) {
|
|
return nullptr;
|
|
}
|
|
|
|
return tex.forget();
|
|
}
|
|
|
|
bool
|
|
TextureClientX11::IsAllocated() const
|
|
{
|
|
return !!mSurface;
|
|
}
|
|
|
|
bool
|
|
TextureClientX11::Lock(OpenMode aMode)
|
|
{
|
|
MOZ_ASSERT(!mLocked, "The TextureClient is already Locked!");
|
|
mLocked = IsValid() && IsAllocated();
|
|
return mLocked;
|
|
}
|
|
|
|
void
|
|
TextureClientX11::Unlock()
|
|
{
|
|
MOZ_ASSERT(mLocked, "The TextureClient is already Unlocked!");
|
|
mLocked = false;
|
|
|
|
if (mDrawTarget) {
|
|
// see the comment on TextureClient::BorrowDrawTarget.
|
|
// This DrawTarget is internal to the TextureClient and is only exposed to the
|
|
// outside world between Lock() and Unlock(). This assertion checks that no outside
|
|
// reference remains by the time Unlock() is called.
|
|
MOZ_ASSERT(mDrawTarget->refCount() == 1);
|
|
|
|
mDrawTarget->Flush();
|
|
mDrawTarget = nullptr;
|
|
}
|
|
|
|
if (mSurface && !mAllocator->IsSameProcess()) {
|
|
FinishX(DefaultXDisplay());
|
|
}
|
|
}
|
|
|
|
bool
|
|
TextureClientX11::ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor)
|
|
{
|
|
MOZ_ASSERT(IsValid());
|
|
if (!mSurface) {
|
|
return false;
|
|
}
|
|
|
|
if (!(mFlags & TextureFlags::DEALLOCATE_CLIENT)) {
|
|
// Pass to the host the responsibility of freeing the pixmap. ReleasePixmap means
|
|
// the underlying pixmap will not be deallocated in mSurface's destructor.
|
|
// ToSurfaceDescriptor is at most called once per TextureClient.
|
|
mSurface->ReleasePixmap();
|
|
}
|
|
|
|
aOutDescriptor = SurfaceDescriptorX11(mSurface);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TextureClientX11::AllocateForSurface(IntSize aSize, TextureAllocationFlags aTextureFlags)
|
|
{
|
|
MOZ_ASSERT(IsValid());
|
|
MOZ_ASSERT(!IsAllocated());
|
|
//MOZ_ASSERT(mFormat != gfx::FORMAT_YUV, "This TextureClient cannot use YCbCr data");
|
|
|
|
MOZ_ASSERT(aSize.width >= 0 && aSize.height >= 0);
|
|
if (aSize.width <= 0 || aSize.height <= 0 ||
|
|
aSize.width > XLIB_IMAGE_SIDE_SIZE_LIMIT ||
|
|
aSize.height > XLIB_IMAGE_SIDE_SIZE_LIMIT) {
|
|
gfxDebug() << "Asking for X11 surface of invalid size " << aSize.width << "x" << aSize.height;
|
|
return false;
|
|
}
|
|
gfxImageFormat imageFormat = SurfaceFormatToImageFormat(mFormat);
|
|
nsRefPtr<gfxASurface> surface = gfxPlatform::GetPlatform()->CreateOffscreenSurface(aSize, imageFormat);
|
|
if (!surface || surface->GetType() != gfxSurfaceType::Xlib) {
|
|
NS_ERROR("creating Xlib surface failed!");
|
|
return false;
|
|
}
|
|
|
|
mSize = aSize;
|
|
mSurface = static_cast<gfxXlibSurface*>(surface.get());
|
|
|
|
if (!mAllocator->IsSameProcess()) {
|
|
FinishX(DefaultXDisplay());
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
DrawTarget*
|
|
TextureClientX11::BorrowDrawTarget()
|
|
{
|
|
MOZ_ASSERT(IsValid());
|
|
MOZ_ASSERT(mLocked);
|
|
|
|
if (!mSurface) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (!mDrawTarget) {
|
|
IntSize size = mSurface->GetSize();
|
|
mDrawTarget = Factory::CreateDrawTargetForCairoSurface(mSurface->CairoSurface(), size);
|
|
}
|
|
|
|
return mDrawTarget;
|
|
}
|
|
|
|
void
|
|
TextureClientX11::UpdateFromSurface(gfx::SourceSurface* aSurface)
|
|
{
|
|
MOZ_ASSERT(CanExposeDrawTarget());
|
|
|
|
DrawTarget* dt = BorrowDrawTarget();
|
|
|
|
if (!dt) {
|
|
gfxCriticalError() << "Failed to borrow drawtarget for TextureClientX11::UpdateFromSurface";
|
|
return;
|
|
}
|
|
|
|
dt->CopySurface(aSurface, IntRect(IntPoint(), aSurface->GetSize()), IntPoint());
|
|
} |