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

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

Issue 2430813002: Switch to shorter names for property tree storage and updates (Closed)
Patch Set: Created 4 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: third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
index 9b59bc34a9fe0daedaadc409f4442bab5d44b668..3d764b2e0f81f549b3a04f5747ab9b314d566e2d 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
@@ -214,11 +214,11 @@ LayoutRect PaintLayerClipper::localClipRect(
FloatRect clippedRectInLocalSpace =
m_geometryMapper->mapRectToDestinationSpace(
FloatRect(clipRect.rect()), clippingRootLayer->layoutObject()
- ->objectPaintProperties()
+ ->paintProperties()
->localBorderBoxProperties()
->propertyTreeState,
m_layer.layoutObject()
- ->objectPaintProperties()
+ ->paintProperties()
->localBorderBoxProperties()
->propertyTreeState,
success);
@@ -257,16 +257,15 @@ void PaintLayerClipper::mapLocalToRootWithGeometryMapper(
bool success;
const ObjectPaintProperties::PropertyTreeStateWithOffset*
- layerBorderBoxProperties = m_layer.layoutObject()
- ->objectPaintProperties()
- ->localBorderBoxProperties();
+ layerBorderBoxProperties =
+ m_layer.layoutObject()->paintProperties()->localBorderBoxProperties();
FloatRect localRect(layoutRect);
localRect.moveBy(FloatPoint(layerBorderBoxProperties->paintOffset));
layoutRect = LayoutRect(m_geometryMapper->mapRectToDestinationSpace(
localRect, layerBorderBoxProperties->propertyTreeState,
context.rootLayer->layoutObject()
- ->objectPaintProperties()
+ ->paintProperties()
->localBorderBoxProperties()
->propertyTreeState,
success));
@@ -436,8 +435,7 @@ ClipRect PaintLayerClipper::clipRectWithGeometryMapper(
DCHECK(m_geometryMapper);
LayoutRect source(LayoutRect::infiniteIntRect());
bool success = false;
- const ObjectPaintProperties* properties =
- m_layer.layoutObject()->objectPaintProperties();
+ const auto* properties = m_layer.layoutObject()->paintProperties();
PropertyTreeState propertyTreeState =
properties->localBorderBoxProperties()->propertyTreeState;
@@ -447,8 +445,8 @@ ClipRect PaintLayerClipper::clipRectWithGeometryMapper(
if (isForeground && shouldClipOverflow(context) && properties->overflowClip())
propertyTreeState.setClip(properties->overflowClip());
- const ObjectPaintProperties* ancestorProperties =
- context.rootLayer->layoutObject()->objectPaintProperties();
+ const auto* ancestorProperties =
+ context.rootLayer->layoutObject()->paintProperties();
PropertyTreeState destinationPropertyTreeState =
ancestorProperties->localBorderBoxProperties()->propertyTreeState;
if (!context.rootLayer->clipper().shouldRespectOverflowClip(context)) {
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintInvalidator.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698