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

Unified Diff: Source/core/rendering/RenderLayer.cpp

Issue 547723003: Change RenderSVGResourceClipper's ClipperContext class into an enum (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Variables have to be initialized?!? Created 6 years, 3 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
« no previous file with comments | « no previous file | Source/core/rendering/svg/RenderSVGResourceClipper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index da93d50e4e03e84b9c147ddb2ff33f1d21abe6d2..171447553aa938ac3979a2f714dae86f274fc0e3 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -1720,7 +1720,7 @@ void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPainti
GraphicsContextStateSaver clipStateSaver(*context, false);
RenderStyle* style = renderer()->style();
RenderSVGResourceClipper* resourceClipper = 0;
- ClipperContext clipperContext;
+ RenderSVGResourceClipper::ClipperState clipperState = RenderSVGResourceClipper::ClipperNotApplied;
// Clip-path, like border radius, must not be applied to the contents of a composited-scrolling container.
// It must, however, still be applied to the mask layer, so that the compositor can properly mask the
@@ -1755,7 +1755,7 @@ void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPainti
resourceClipper = toRenderSVGResourceClipper(toRenderSVGResourceContainer(element->renderer()));
if (!resourceClipper->applyClippingToContext(renderer(), rootRelativeBounds,
- paintingInfo.paintDirtyRect, context, clipperContext)) {
+ paintingInfo.paintDirtyRect, context, clipperState)) {
// No need to post-apply the clipper if this failed.
resourceClipper = 0;
}
@@ -1908,7 +1908,7 @@ void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPainti
}
if (resourceClipper)
- resourceClipper->postApplyStatefulResource(renderer(), context, clipperContext);
+ resourceClipper->postApplyStatefulResource(renderer(), context, clipperState);
}
void RenderLayer::paintLayerByApplyingTransform(GraphicsContext* context, const LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutPoint& translationOffset)
« no previous file with comments | « no previous file | Source/core/rendering/svg/RenderSVGResourceClipper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698