corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 7e2fc94f5be9 (bug 1409871)

Browse Source
This commit is contained in:
Sebastian Hengst
2017-10-23 23:42:51 +02:00
parent f4cf06d700
commit 05fcd344ca
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/layers/PaintThread.cpp
View File

@@ -30,7 +30,7 @@ struct MOZ_STACK_CLASS AutoCapturedPaintSetup
{ {
AutoCapturedPaintSetup(CapturedPaintState* aState, CompositorBridgeChild* aBridge) AutoCapturedPaintSetup(CapturedPaintState* aState, CompositorBridgeChild* aBridge)
: mState(aState) : mState(aState)
, mTarget(aState->mTargetDual) , mTarget(aState->mTarget)
, mRestorePermitsSubpixelAA(mTarget->GetPermitSubpixelAA()) , mRestorePermitsSubpixelAA(mTarget->GetPermitSubpixelAA())
, mOldTransform(mTarget->GetTransform()) , mOldTransform(mTarget->GetTransform())
, mBridge(aBridge) , mBridge(aBridge)
@@ -186,7 +186,7 @@ PaintThread::AsyncPaintContents(CompositorBridgeChild* aBridge,
MOZ_ASSERT(IsOnPaintThread()); MOZ_ASSERT(IsOnPaintThread());
MOZ_ASSERT(aState); MOZ_ASSERT(aState);
DrawTarget* target = aState->mTargetDual; DrawTarget* target = aState->mTarget;
DrawTargetCapture* capture = aState->mCapture; DrawTargetCapture* capture = aState->mCapture;
AutoCapturedPaintSetup setup(aState, aBridge); AutoCapturedPaintSetup setup(aState, aBridge);

3
gfx/layers/PaintThread.h
View File

@@ -28,14 +28,12 @@ class CapturedPaintState {
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CapturedPaintState) NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CapturedPaintState)
public: public:
CapturedPaintState(nsIntRegion& aRegionToDraw, CapturedPaintState(nsIntRegion& aRegionToDraw,
gfx::DrawTarget* aTargetDual,
gfx::DrawTarget* aTarget, gfx::DrawTarget* aTarget,
gfx::DrawTarget* aTargetOnWhite, gfx::DrawTarget* aTargetOnWhite,
const gfx::Matrix& aTargetTransform, const gfx::Matrix& aTargetTransform,
SurfaceMode aSurfaceMode, SurfaceMode aSurfaceMode,
gfxContentType aContentType) gfxContentType aContentType)
: mRegionToDraw(aRegionToDraw) : mRegionToDraw(aRegionToDraw)
, mTargetDual(aTargetDual)
, mTarget(aTarget) , mTarget(aTarget)
, mTargetOnWhite(aTargetOnWhite) , mTargetOnWhite(aTargetOnWhite)
, mTargetTransform(aTargetTransform) , mTargetTransform(aTargetTransform)
@@ -47,7 +45,6 @@ public:
RefPtr<TextureClient> mTextureClient; RefPtr<TextureClient> mTextureClient;
RefPtr<TextureClient> mTextureClientOnWhite; RefPtr<TextureClient> mTextureClientOnWhite;
RefPtr<gfx::DrawTargetCapture> mCapture; RefPtr<gfx::DrawTargetCapture> mCapture;
RefPtr<gfx::DrawTarget> mTargetDual;
RefPtr<gfx::DrawTarget> mTarget; RefPtr<gfx::DrawTarget> mTarget;
RefPtr<gfx::DrawTarget> mTargetOnWhite; RefPtr<gfx::DrawTarget> mTargetOnWhite;
gfx::Matrix mTargetTransform; gfx::Matrix mTargetTransform;

2
gfx/layers/client/ClientPaintedLayer.cpp
View File

@@ -224,7 +224,7 @@ ClientPaintedLayer::PaintOffMainThread()
while (RefPtr<CapturedPaintState> captureState = while (RefPtr<CapturedPaintState> captureState =
mContentClient->BorrowDrawTargetForRecording(state, &iter)) mContentClient->BorrowDrawTargetForRecording(state, &iter))
{ {
DrawTarget* target = captureState->mTargetDual; DrawTarget* target = captureState->mTarget;
if (!target || !target->IsValid()) { if (!target || !target->IsValid()) {
if (target) { if (target) {
mContentClient->ReturnDrawTargetToBuffer(target); mContentClient->ReturnDrawTargetToBuffer(target);

3
gfx/layers/client/ContentClient.cpp
View File

@@ -253,7 +253,7 @@ ContentClient::BorrowDrawTargetForPainting(ContentClient::PaintState& aPaintStat
return nullptr; return nullptr;
} }
return capturedState->mTargetDual; return capturedState->mTarget;
} }
RefPtr<CapturedPaintState> RefPtr<CapturedPaintState>
@@ -282,7 +282,6 @@ ContentClient::BorrowDrawTargetForRecording(ContentClient::PaintState& aPaintSta
RefPtr<CapturedPaintState> state = RefPtr<CapturedPaintState> state =
new CapturedPaintState(regionToDraw, new CapturedPaintState(regionToDraw,
result, result,
mBuffer->GetDTBuffer(),
mBuffer->GetDTBufferOnWhite(), mBuffer->GetDTBufferOnWhite(),
transform, transform,
aPaintState.mMode, aPaintState.mMode,