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

Unified Diff: third_party/WebKit/Source/core/paint/SVGClipPainter.cpp

Issue 2465983002: Rename "paint invalidation rect" etc. to "visual rect". (Closed)
Patch Set: - Created 4 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: third_party/WebKit/Source/core/paint/SVGClipPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/SVGClipPainter.cpp b/third_party/WebKit/Source/core/paint/SVGClipPainter.cpp
index df4c1923ae27c28abc1c3ceb14f56c09376d6a84..8f4b92d9fc957dec53bef763b923f476fe1a25d9 100644
--- a/third_party/WebKit/Source/core/paint/SVGClipPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/SVGClipPainter.cpp
@@ -39,7 +39,7 @@ class SVGClipExpansionCycleHelper {
bool SVGClipPainter::prepareEffect(const LayoutObject& target,
const FloatRect& targetBoundingBox,
- const FloatRect& paintInvalidationRect,
+ const FloatRect& visualRect,
const FloatPoint& layerPositionOffset,
GraphicsContext& context,
ClipperState& clipperState) {
@@ -48,7 +48,7 @@ bool SVGClipPainter::prepareEffect(const LayoutObject& target,
m_clip.clearInvalidationMask();
- if (paintInvalidationRect.isEmpty() || m_clip.hasCycle())
+ if (visualRect.isEmpty() || m_clip.hasCycle())
return false;
SVGClipExpansionCycleHelper inClipExpansionChange(m_clip);
@@ -83,11 +83,10 @@ bool SVGClipPainter::prepareEffect(const LayoutObject& target,
// Begin compositing the clip mask.
CompositingRecorder::beginCompositing(context, target, SkBlendMode::kSrcOver,
- 1, &paintInvalidationRect);
+ 1, &visualRect);
{
- if (!drawClipAsMask(context, target, targetBoundingBox,
- paintInvalidationRect, animatedLocalTransform,
- layerPositionOffset)) {
+ if (!drawClipAsMask(context, target, targetBoundingBox, visualRect,
+ animatedLocalTransform, layerPositionOffset)) {
// End the clip mask's compositor.
CompositingRecorder::endCompositing(context, target);
return false;
@@ -96,7 +95,7 @@ bool SVGClipPainter::prepareEffect(const LayoutObject& target,
// Masked content layer start.
CompositingRecorder::beginCompositing(context, target, SkBlendMode::kSrcIn, 1,
- &paintInvalidationRect);
+ &visualRect);
return true;
}
@@ -122,19 +121,17 @@ void SVGClipPainter::finishEffect(const LayoutObject& target,
}
}
-bool SVGClipPainter::drawClipAsMask(
- GraphicsContext& context,
- const LayoutObject& layoutObject,
- const FloatRect& targetBoundingBox,
- const FloatRect& targetPaintInvalidationRect,
- const AffineTransform& localTransform,
- const FloatPoint& layerPositionOffset) {
+bool SVGClipPainter::drawClipAsMask(GraphicsContext& context,
+ const LayoutObject& layoutObject,
+ const FloatRect& targetBoundingBox,
+ const FloatRect& targetVisualRect,
+ const AffineTransform& localTransform,
+ const FloatPoint& layerPositionOffset) {
if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(
context, layoutObject, DisplayItem::kSVGClip))
return true;
- SkPictureBuilder maskPictureBuilder(targetPaintInvalidationRect, nullptr,
- &context);
+ SkPictureBuilder maskPictureBuilder(targetVisualRect, nullptr, &context);
GraphicsContext& maskContext = maskPictureBuilder.context();
{
TransformRecorder recorder(maskContext, layoutObject, localTransform);
@@ -163,9 +160,8 @@ bool SVGClipPainter::drawClipAsMask(
}
}
- LayoutObjectDrawingRecorder drawingRecorder(context, layoutObject,
- DisplayItem::kSVGClip,
- targetPaintInvalidationRect);
+ LayoutObjectDrawingRecorder drawingRecorder(
+ context, layoutObject, DisplayItem::kSVGClip, targetVisualRect);
sk_sp<SkPicture> maskPicture = maskPictureBuilder.endRecording();
context.drawPicture(maskPicture.get());
return true;
« no previous file with comments | « third_party/WebKit/Source/core/paint/SVGClipPainter.h ('k') | third_party/WebKit/Source/core/paint/SVGContainerPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698