From d800b22456c0d9d19ff4c748289bc2417d3a0bb7 Mon Sep 17 00:00:00 2001 From: Jeff Gilbert Date: Wed, 4 Jun 2014 15:20:25 -0700 Subject: [PATCH] Bug 1000640 - Death to whitespace. - r=mattwoodrow --- content/canvas/test/reftest/reftest.list | 2 +- gfx/layers/Layers.h | 8 ++++---- gfx/layers/basic/BasicCompositor.cpp | 2 +- gfx/layers/client/ClientCanvasLayer.cpp | 4 ++-- gfx/layers/composite/TextureHost.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/content/canvas/test/reftest/reftest.list b/content/canvas/test/reftest/reftest.list index dca01879c84..26b991141a5 100644 --- a/content/canvas/test/reftest/reftest.list +++ b/content/canvas/test/reftest/reftest.list @@ -107,7 +107,7 @@ random-if(B2G) random-if(Android&&AndroidVersion<15) == webgl-color-test.html?_ random-if(B2G) random-if(Android&&AndroidVersion<15) == webgl-color-test.html?aa&_____&depth&premult&________&stencil wrapper.html?colors.png # Bug 844439 random-if(gtk2Widget) random-if(B2G) random-if(Android&&AndroidVersion<15) == webgl-color-test.html?__&alpha&depth&premult&________&stencil wrapper.html?colors.png # Bug 844439 random-if(gtk2Widget) random-if(B2G) random-if(Android&&AndroidVersion<15) == webgl-color-test.html?aa&alpha&depth&premult&________&stencil wrapper.html?colors.png # Bug 844439 - + random-if(B2G) random-if(Android&&AndroidVersion<15) == webgl-color-test.html?__&_____&_____&_______&preserve&stencil wrapper.html?colors.png # Bug 844439 random-if(B2G) random-if(Android&&AndroidVersion<15) == webgl-color-test.html?aa&_____&_____&_______&preserve&stencil wrapper.html?colors.png # Bug 844439 random-if(gtk2Widget) random-if(B2G) random-if(Android&&AndroidVersion<15) == webgl-color-test.html?__&alpha&_____&_______&preserve&stencil wrapper.html?colors.png # Bug 844439 diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h index 0d2f608c101..e511d542368 100644 --- a/gfx/layers/Layers.h +++ b/gfx/layers/Layers.h @@ -831,7 +831,7 @@ public: Mutated(); } } - + void DeprecatedSetMixBlendMode(gfxContext::GraphicsOperator aMixBlendMode) { SetMixBlendMode(gfx::CompositionOpForOp(aMixBlendMode)); @@ -845,7 +845,7 @@ public: Mutated(); } } - + bool GetForceIsolatedGroup() const { return mForceIsolatedGroup; @@ -1249,13 +1249,13 @@ public: * to and excluding the nearest ancestor that has UseIntermediateSurface() set. */ float GetEffectiveOpacity(); - + /** * Returns the blendmode of this layer. */ gfx::CompositionOp GetEffectiveMixBlendMode(); gfxContext::GraphicsOperator DeprecatedGetEffectiveMixBlendMode(); - + /** * This returns the effective transform computed by * ComputeEffectiveTransforms. Typically this is a transform that transforms diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp index 5bc922a5673..ef26247ca99 100644 --- a/gfx/layers/basic/BasicCompositor.cpp +++ b/gfx/layers/basic/BasicCompositor.cpp @@ -474,7 +474,7 @@ BasicCompositor::EndFrame() RefPtr dest(mTarget ? mTarget : mDrawTarget); nsIntPoint offset = mTarget ? mTargetBounds.TopLeft() : nsIntPoint(); - + // The source DrawTarget is clipped to the invalidation region, so we have // to copy the individual rectangles in the region or else we'll draw blank // pixels. diff --git a/gfx/layers/client/ClientCanvasLayer.cpp b/gfx/layers/client/ClientCanvasLayer.cpp index 2b2e7256350..7ee8404a8c4 100644 --- a/gfx/layers/client/ClientCanvasLayer.cpp +++ b/gfx/layers/client/ClientCanvasLayer.cpp @@ -136,7 +136,7 @@ ClientCanvasLayer::RenderLayer() if (GetMaskLayer()) { ToClientLayer(GetMaskLayer())->RenderLayer(); } - + if (!mCanvasClient) { TextureFlags flags = TextureFlags::IMMEDIATE_UPLOAD; if (mNeedsYFlip) { @@ -161,7 +161,7 @@ ClientCanvasLayer::RenderLayer() ClientManager()->AsShadowForwarder()->Attach(mCanvasClient, this); } } - + FirePreTransactionCallback(); mCanvasClient->Update(gfx::IntSize(mBounds.width, mBounds.height), this); diff --git a/gfx/layers/composite/TextureHost.h b/gfx/layers/composite/TextureHost.h index a482b3370c3..b8a4baead58 100644 --- a/gfx/layers/composite/TextureHost.h +++ b/gfx/layers/composite/TextureHost.h @@ -438,7 +438,7 @@ public: // to forget about the shmem _without_ releasing it. virtual void OnShutdown() {} - // Forget buffer actor. Used only for hacky fix for bug 966446. + // Forget buffer actor. Used only for hacky fix for bug 966446. virtual void ForgetBufferActor() {} virtual const char *Name() { return "TextureHost"; }