Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1834)

Unified Diff: Source/core/rendering/svg/RenderSVGResource.cpp

Issue 625933003: Consolidated checks for the PaintBehaviorRenderingSVGMask flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/svg/RenderSVGResource.cpp
diff --git a/Source/core/rendering/svg/RenderSVGResource.cpp b/Source/core/rendering/svg/RenderSVGResource.cpp
index 8c79eceabcc4560860947244970facf39c6dd3b1..c30b434b99995b5853b59d543c2282e9e09ec941 100644
--- a/Source/core/rendering/svg/RenderSVGResource.cpp
+++ b/Source/core/rendering/svg/RenderSVGResource.cpp
@@ -24,12 +24,11 @@
#include "core/rendering/svg/RenderSVGResource.h"
-#include "core/frame/FrameView.h"
-#include "core/frame/LocalFrame.h"
#include "core/rendering/svg/RenderSVGResourceClipper.h"
#include "core/rendering/svg/RenderSVGResourceFilter.h"
#include "core/rendering/svg/RenderSVGResourceMasker.h"
#include "core/rendering/svg/RenderSVGResourceSolidColor.h"
+#include "core/rendering/svg/SVGRenderSupport.h"
#include "core/rendering/svg/SVGResources.h"
#include "core/rendering/svg/SVGResourcesCache.h"
@@ -45,9 +44,7 @@ RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceM
// If we have no style at all, ignore it.
const SVGRenderStyle& svgStyle = style->svgStyle();
- bool isRenderingMask = false;
- if (object->frame() && object->frame()->view())
- isRenderingMask = object->frame()->view()->paintBehavior() & PaintBehaviorRenderingSVGMask;
+ bool isRenderingMask = SVGRenderSupport::isRenderingMaskImage(*object);
// If we have no fill/stroke, return 0.
if (mode == ApplyToFillMode) {
« no previous file with comments | « no previous file | Source/core/rendering/svg/RenderSVGResourceSolidColor.cpp » ('j') | Source/core/rendering/svg/SVGRenderSupport.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698