wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out bug 792663 (1ba44c7c860a)

Browse Source
This commit is contained in:
Chris Jones 2012-09-21 00:46:18 -07:00
parent 32e3c522a7
commit 016257de46
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/layers/ThebesLayerBuffer.h
View File

@ -190,10 +190,6 @@ protected:
mBufferProvider = aProvider;
if (!mBufferProvider) {
mBuffer = nullptr;
} else {
// Only this buffer provider can give us a buffer. If we
// already have one, something has gone wrong.
MOZ_ASSERT(!mBuffer);
}
}

11
gfx/layers/basic/BasicThebesLayer.cpp
View File

@ -314,6 +314,12 @@ BasicShadowableThebesLayer::SetBackBufferAndAttrs(const OptionalThebesBuffer& aB
mROFrontBuffer = aReadOnlyFrontBuffer;
mFrontUpdatedRegion = aFrontUpdatedRegion;
mFrontValidRegion = aValidRegion;
if (OptionalThebesBuffer::Tnull_t == mROFrontBuffer.type()) {
// For null readonly front, we have single buffer mode
// so we can do sync right now, because it does not create new buffer and
// don't do any graphic operations
SyncFrontBufferToBackBuffer();
}
}
void
@ -323,11 +329,6 @@ BasicShadowableThebesLayer::SyncFrontBufferToBackBuffer()
return;
}
// We temporarily map our back buffer here in order to copy from the
// front buffer. We need a live buffer tracker in order to unmap
// that buffer when appropriate.
MOZ_ASSERT(mBufferTracker);
gfxASurface* backBuffer = mBuffer.GetBuffer();
if (!IsSurfaceDescriptorValid(mBackBuffer)) {
MOZ_ASSERT(!backBuffer);