Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-28 11:28:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 946958 part 5. Misc tidy ups. r=mattwoodrow

Browse Source
This commit is contained in:
Nicholas Cameron 2013-12-09 14:41:00 +13:00
parent 9bfee51338
commit 789fd7e109
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,7 +302,7 @@ LayerManagerComposite::RootLayer() const
return nullptr;
}
return static_cast<LayerComposite*>(mRoot->ImplData());
return ToLayerComposite(mRoot);
}
static uint16_t sFrameCount = 0;
@ -718,7 +718,7 @@ LayerManagerComposite::AutoAddMaskEffect::AutoAddMaskEffect(Layer* aMaskLayer,
return;
}
mCompositable = static_cast<LayerComposite*>(aMaskLayer->ImplData())->GetCompositableHost();
mCompositable = ToLayerComposite(aMaskLayer)->GetCompositableHost();
if (!mCompositable) {
NS_WARNING("Mask layer with no compositable host");
return;

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

@ -142,7 +142,7 @@ public:
virtual LayersBackend GetBackendType() MOZ_OVERRIDE
{
return LAYERS_NONE;
MOZ_CRASH("Shouldn't be called for composited layer manager");
}
virtual void GetBackendName(nsAString& name) MOZ_OVERRIDE
{
@ -152,7 +152,6 @@ public:
virtual already_AddRefed<gfxASurface>
CreateOptimalMaskSurface(const gfxIntSize &aSize) MOZ_OVERRIDE;
virtual const char* Name() const MOZ_OVERRIDE { return ""; }
enum WorldTransforPolicy {
@ -189,7 +188,7 @@ public:
* layermanager.
*/
virtual TemporaryRef<mozilla::gfx::DrawTarget>
CreateDrawTarget(const mozilla::gfx::IntSize &aSize,
CreateDrawTarget(const mozilla::gfx::IntSize& aSize,
mozilla::gfx::SurfaceFormat aFormat) MOZ_OVERRIDE;
/**
@ -235,7 +234,7 @@ private:
nsIntRect mRenderBounds;
/** Current root layer. */
LayerComposite *RootLayer() const;
LayerComposite* RootLayer() const;
/**
* Recursive helper method for use by ComputeRenderIntegrity. Subtracts