Fix bustage from bug 933549 because I am an idiot who forgot to qref,…

… on a CLOSED TREE
mozilla-spidermonkey · Jan 8, 2014 · 0dfd68f · 0dfd68f
1 parent f716ad9
commit 0dfd68f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
@@ -1500,6 +1500,7 @@ PrintInfo(nsACString& aTo, LayerComposite* aLayerComposite)
 void
 SetAntialiasingFlags(Layer* aLayer, DrawTarget* aTarget)
 {
+  bool permitSubpixelAA = !(aLayer->GetContentFlags() & Layer::CONTENT_DISABLE_SUBPIXEL_AA);
   if (aTarget->GetFormat() != FORMAT_B8G8R8A8) {
     aTarget->SetPermitSubpixelAA(permitSubpixelAA);
     return;
@@ -1519,12 +1520,12 @@ SetAntialiasingFlags(Layer* aLayer, DrawTarget* aTarget)
 void
 SetAntialiasingFlags(Layer* aLayer, gfxContext* aTarget)
 {
-  bool permitSubpixelAA = !(aLayer->GetContentFlags() & Layer::CONTENT_DISABLE_SUBPIXEL_AA);
   if (!aTarget->IsCairo()) {
     SetAntialiasingFlags(aLayer, aTarget->GetDrawTarget());
     return;
   }
 
+  bool permitSubpixelAA = !(aLayer->GetContentFlags() & Layer::CONTENT_DISABLE_SUBPIXEL_AA);
   nsRefPtr<gfxASurface> surface = aTarget->CurrentSurface();
   if (surface->GetContentType() != GFX_CONTENT_COLOR_ALPHA) {
     // Destination doesn't have alpha channel; no need to set any special flags

diff --git a/gfx/layers/client/ContentClient.cpp b/gfx/layers/client/ContentClient.cpp
@@ -1170,7 +1170,7 @@ ContentClientIncremental::BeginPaintBuffer(ThebesLayer* aLayer,
   } else {
     nsRefPtr<gfxASurface> surf = GetUpdateSurface(BUFFER_BLACK, result.mRegionToDraw);
     MOZ_ASSERT(gfxPlatform::GetPlatform()->SupportsAzureContent());
-    mLoanedDrawTarget = gfxPlatform::GetPlatform()->CreateDrawTargetForUpdateSurface(surf, surf->GetSize());
+    mLoanedDrawTarget = gfxPlatform::GetPlatform()->CreateDrawTargetForUpdateSurface(surf, surf->GetSize().ToIntSize());
   }
   if (!mLoanedDrawTarget) {
     NS_WARNING("unable to get context for update");