From 4b6793f937c27bedd71b22d2006646d81697304a Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Fri, 20 Mar 2015 16:46:29 +1300 Subject: [PATCH] Bug 1143575. Fix some code formatting. r=nical --HG-- extra : commitid : ClRm5y4d3Tv extra : rebase_source : 3b4629fc4e171ce31cfb761e831974191d3ae35c --- gfx/layers/client/ImageClient.cpp | 2 +- gfx/layers/ipc/ImageBridgeChild.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gfx/layers/client/ImageClient.cpp b/gfx/layers/client/ImageClient.cpp index a51bb81a7b3e..67423597804a 100644 --- a/gfx/layers/client/ImageClient.cpp +++ b/gfx/layers/client/ImageClient.cpp @@ -130,7 +130,7 @@ ImageClientSingle::FlushAllImages(bool aExceptFront, if (!aExceptFront && mFrontBuffer) { RemoveTextureWithTracker(mFrontBuffer, aAsyncTransactionTracker); mFrontBuffer = nullptr; - } else if(aAsyncTransactionTracker) { + } else if (aAsyncTransactionTracker) { // already flushed aAsyncTransactionTracker->NotifyComplete(); } diff --git a/gfx/layers/ipc/ImageBridgeChild.cpp b/gfx/layers/ipc/ImageBridgeChild.cpp index a4619b1a5286..3f191d1e1d37 100644 --- a/gfx/layers/ipc/ImageBridgeChild.cpp +++ b/gfx/layers/ipc/ImageBridgeChild.cpp @@ -413,7 +413,8 @@ void ImageBridgeChild::DispatchImageClientUpdate(ImageClient* aClient, nsRefPtr >(&UpdateImageClientNow, aClient, aContainer)); } -static void FlushAllImagesSync(ImageClient* aClient, ImageContainer* aContainer, bool aExceptFront, AsyncTransactionTracker* aStatus) +static void FlushAllImagesSync(ImageClient* aClient, ImageContainer* aContainer, + bool aExceptFront, AsyncTransactionTracker* aStatus) { MOZ_ASSERT(aClient); sImageBridgeChildSingleton->BeginTransaction(); @@ -426,7 +427,8 @@ static void FlushAllImagesSync(ImageClient* aClient, ImageContainer* aContainer, } //static -void ImageBridgeChild::FlushAllImages(ImageClient* aClient, ImageContainer* aContainer, bool aExceptFront) +void ImageBridgeChild::FlushAllImages(ImageClient* aClient, + ImageContainer* aContainer, bool aExceptFront) { if (!IsCreated()) { return; @@ -436,8 +438,8 @@ void ImageBridgeChild::FlushAllImages(ImageClient* aClient, ImageContainer* aCon MOZ_ASSERT(!InImageBridgeChildThread()); if (InImageBridgeChildThread()) { NS_ERROR("ImageBridgeChild::FlushAllImages() is called on ImageBridge thread."); - return; - } + return; + } RefPtr status = aClient->PrepareFlushAllImages();