From a31601cee7fc108bed92d3c0a977cd5bcdb87ca0 Mon Sep 17 00:00:00 2001
From: cku <cku@mozilla.com>
Date: Fri, 7 Oct 2016 12:42:35 +0800
Subject: [PATCH] Bug 1299715 - Part 5. Correct clip region for opacity
 surface. r=mstange

MozReview-Commit-ID: 1wiQKsHKJsg

--HG--
extra : rebase_source : d07c35615119fdae64c0bffd4cbd6290630fbc4e
---
 layout/svg/nsSVGIntegrationUtils.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/layout/svg/nsSVGIntegrationUtils.cpp b/layout/svg/nsSVGIntegrationUtils.cpp
index 504a144f442d..510adcf93dcb 100644
--- a/layout/svg/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/nsSVGIntegrationUtils.cpp
@@ -875,7 +875,7 @@ nsSVGIntegrationUtils::PaintMaskAndClipPath(const PaintFramesParams& aParams)
 
       matSR.SetContext(&context);
       SetupContextMatrix(firstFrame, aParams, offsetToBoundingBox,
-                         offsetToUserSpace, true);
+                         offsetToUserSpace, false);
     }
 
     if (aParams.layerManager->GetRoot()->GetContentFlags() & Layer::CONTENT_COMPONENT_ALPHA) {
@@ -920,12 +920,6 @@ nsSVGIntegrationUtils::PaintMaskAndClipPath(const PaintFramesParams& aParams)
 
   if (shouldGenerateMask) {
     context.PopGroupAndBlend();
-
-    if (!shouldGenerateClipMaskLayer && !shouldGenerateMaskLayer) {
-      MOZ_ASSERT(opacity != 1.0f);
-      // Pop the clip push by SetupContextMatrix
-      context.PopClip();
-    }
   }
 
   return result;