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

Backed out changeset 8a5c1027e6e6 (bug 953303) for bustage.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2014-01-17 14:50:58 -05:00
parent 3f4057c3a9
commit 27e42e40e3
7 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/layers/Compositor.h
View File

@ -304,11 +304,6 @@ public:
gfx::Float aOpacity, const gfx::Matrix4x4 &aTransform)
{ /* Should turn into pure virtual once implemented in D3D */ }
/*
* Clear aRect on FrameBuffer.
*/
virtual void clearFBRect(const gfx::Rect* aRect) { }
/**
* Start a new frame.
*

6
gfx/layers/composite/ContainerLayerComposite.cpp
View File

@ -318,12 +318,6 @@ ContainerRender(ContainerT* aContainer,
// Composer2D will compose this layer so skip GPU composition
// this time & reset composition flag for next composition phase
layerToRender->SetLayerComposited(false);
if (layerToRender->GetClearFB()) {
// Clear layer's visible rect on FrameBuffer with transparent pixels
gfx::Rect aRect(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
compositor->clearFBRect(&aRect);
layerToRender->SetClearFB(false);
}
} else {
layerToRender->RenderLayer(clipRect);
}

1
gfx/layers/composite/LayerManagerComposite.cpp
View File

@ -764,7 +764,6 @@ LayerComposite::LayerComposite(LayerManagerComposite *aManager)
, mShadowTransformSetByAnimation(false)
, mDestroyed(false)
, mLayerComposited(false)
, mClearFB(false)
{ }
LayerComposite::~LayerComposite()

7
gfx/layers/composite/LayerManagerComposite.h
View File

@ -358,11 +358,6 @@ public:
mLayerComposited = value;
}
void SetClearFB(bool value)
{
mClearFB = value;
}
// These getters can be used anytime.
float GetShadowOpacity() { return mShadowOpacity; }
const nsIntRect* GetShadowClipRect() { return mUseShadowClipRect ? &mShadowClipRect : nullptr; }
@ -370,7 +365,6 @@ public:
const gfx3DMatrix& GetShadowTransform() { return mShadowTransform; }
bool GetShadowTransformSetByAnimation() { return mShadowTransformSetByAnimation; }
bool HasLayerBeenComposited() { return mLayerComposited; }
bool GetClearFB() { return mClearFB; }
protected:
gfx3DMatrix mShadowTransform;
@ -383,7 +377,6 @@ protected:
bool mShadowTransformSetByAnimation;
bool mDestroyed;
bool mLayerComposited;
bool mClearFB;
};

14
gfx/layers/opengl/CompositorOGL.cpp
View File

@ -767,20 +767,6 @@ CalculatePOTSize(const IntSize& aSize, GLContext* gl)
return IntSize(NextPowerOfTwo(aSize.width), NextPowerOfTwo(aSize.height));
}
void
CompositorOGL::clearFBRect(const gfx::Rect* aRect)
{
if (!aRect) {
return;
}
mGLContext->fScissor(aRect->x, aRect->y, aRect->width, aRect->height);
mGLContext->PushScissorRect();
mGLContext->fClearColor(0.0, 0.0, 0.0, 0.0);
mGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
mGLContext->PopScissorRect();
}
void
CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
const Rect *aClipRectIn,

5
gfx/layers/opengl/CompositorOGL.h
View File

@ -252,11 +252,6 @@ private:
*/
bool mFrameInProgress;
/*
* Clear aRect on FrameBuffer.
*/
virtual void clearFBRect(const gfx::Rect* aRect);
/* Start a new frame. If aClipRectIn is null and aClipRectOut is non-null,
* sets *aClipRectOut to the screen dimensions.
*/

7
widget/gonk/HwcComposer2D.cpp
View File

@ -507,13 +507,6 @@ HwcComposer2D::TryHwComposition()
// Overlay Composition, set layer composition flag
// on mapped LayerComposite to skip GPU composition
mHwcLayerMap[k]->SetLayerComposited(true);
if (k && (mList->hwLayers[k].hints & HWC_HINT_CLEAR_FB) &&
(mList->hwLayers[k].blending == HWC_BLENDING_NONE)) {
// Clear visible rect on FB with transparent pixels.
// Never clear the 1st layer since we're guaranteed
// that FB is already cleared.
mHwcLayerMap[k]->SetClearFB(true);
}
break;
default:
break;