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

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

Issue 721073003: Pass PaintBehaviorRenderingClipPathAsMask in PaintInfo (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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/SVGRenderSupport.cpp
diff --git a/Source/core/rendering/svg/SVGRenderSupport.cpp b/Source/core/rendering/svg/SVGRenderSupport.cpp
index 55f55042ff99d18079310602f844b41024978bb7..c42435b358d09a8c4003fe31cc0bf1dd5bde3b59 100644
--- a/Source/core/rendering/svg/SVGRenderSupport.cpp
+++ b/Source/core/rendering/svg/SVGRenderSupport.cpp
@@ -25,8 +25,6 @@
#include "config.h"
#include "core/rendering/svg/SVGRenderSupport.h"
-#include "core/frame/FrameView.h"
-#include "core/frame/LocalFrame.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderGeometryMap.h"
#include "core/rendering/RenderLayer.h"
@@ -275,11 +273,6 @@ bool SVGRenderSupport::isOverflowHidden(const RenderObject* object)
return object->style()->overflowX() == OHIDDEN || object->style()->overflowX() == OSCROLL;
}
-bool SVGRenderSupport::isRenderingClipPathAsMaskImage(const RenderObject& object)
-{
- return object.frame() && object.frame()->view() && object.frame()->view()->paintBehavior() & PaintBehaviorRenderingClipPathAsMask;
-}
-
void SVGRenderSupport::intersectPaintInvalidationRectWithResources(const RenderObject* renderer, FloatRect& paintInvalidationRect)
{
ASSERT(renderer);
@@ -393,12 +386,12 @@ void SVGRenderSupport::applyStrokeStyleToStrokeData(StrokeData* strokeData, cons
strokeData->setLineDash(dashArray, svgStyle.strokeDashOffset()->value(lengthContext));
}
-bool SVGRenderSupport::updateGraphicsContext(GraphicsContextStateSaver& stateSaver, RenderStyle* style, RenderObject& renderer, RenderSVGResourceMode resourceMode, const AffineTransform* additionalPaintServerTransform)
+bool SVGRenderSupport::updateGraphicsContext(PaintInfo& paintInfo, GraphicsContextStateSaver& stateSaver, RenderStyle* style, RenderObject& renderer, RenderSVGResourceMode resourceMode, const AffineTransform* additionalPaintServerTransform)
{
ASSERT(style);
- GraphicsContext* context = stateSaver.context();
- if (isRenderingClipPathAsMaskImage(renderer)) {
+ GraphicsContext* context = paintInfo.context;
f(malita) 2014/11/18 17:35:59 I would also ASSERT(paintInfo.context == stateSave
fs 2014/11/18 18:18:34 Make sense. Done.
+ if (paintInfo.isRenderingClipPathAsMaskImage()) {
if (resourceMode == ApplyToStrokeMode)
return false;
context->setAlphaAsFloat(1);

Powered by Google App Engine
This is Rietveld 408576698