Bug 666068 - Speed up nsSVGIntegrationUtils::UsingEffectsForFrame. r=jwatt,jmuizelaar
authorRobert Longson <longsonr@gmail.com>
Wed, 22 Jun 2011 21:07:31 +0100
changeset 71580 7bb02cc447e0145c73cf23bc5193d7742d80a7cd
parent 71579 b060d115f5016b18e571e46d0078da62cf965dd7
child 71581 bc0b2201ca8594d96aec985b9ad33ec98e84f6ba
push id20566
push usermlamouri@mozilla.com
push dateThu, 23 Jun 2011 09:20:24 +0000
treeherdermozilla-central@c70b05ca6e88 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwatt, jmuizelaar
bugs666068
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 666068 - Speed up nsSVGIntegrationUtils::UsingEffectsForFrame. r=jwatt,jmuizelaar
layout/svg/base/src/nsSVGIntegrationUtils.cpp
--- a/layout/svg/base/src/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/base/src/nsSVGIntegrationUtils.cpp
@@ -50,19 +50,21 @@
 #include "gfxDrawable.h"
 #include "nsSVGPaintServerFrame.h"
 
 // ----------------------------------------------------------------------
 
 PRBool
 nsSVGIntegrationUtils::UsingEffectsForFrame(const nsIFrame* aFrame)
 {
+  if (aFrame->IsFrameOfType(nsIFrame::eSVG)) {
+    return PR_FALSE;
+  }
   const nsStyleSVGReset *style = aFrame->GetStyleSVGReset();
-  return (style->mFilter || style->mClipPath || style->mMask) &&
-          !aFrame->IsFrameOfType(nsIFrame::eSVG);
+  return (style->mFilter || style->mClipPath || style->mMask);
 }
 
 /* static */ nsRect
 nsSVGIntegrationUtils::GetNonSVGUserSpace(nsIFrame* aFirst)
 {
   NS_ASSERTION(!aFirst->GetPrevContinuation(), "Not first continuation");
   return nsLayoutUtils::GetAllInFlowRectsUnion(aFirst, aFirst);
 }