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

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

Issue 2351433002: Switch LocalBorderBoxProperties to store raw pointers (Closed)
Patch Set: Created 4 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
Index: third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
index 11af26372097f6b2de63f7de1c718d6f8da8241f..2977e44733ff2ea58229f5d8b5ddd1791ebb1639 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
@@ -6,19 +6,27 @@
namespace blink {
-void ObjectPaintProperties::getContentsProperties(GeometryPropertyTreeState& properties) const
+GeometryPropertyTreeState ObjectPaintProperties::getContentsProperties() const
{
- properties = localBorderBoxProperties()->geometryPropertyTreeState;
+ const LocalBorderBoxProperties* localBorderBox = localBorderBoxProperties();
+ GeometryPropertyTreeState geometryPropertyTreeState(
+ localBorderBox->transform,
+ localBorderBox->clip,
+ localBorderBox->effect);
+
if (scrollTranslation())
- properties.transform = scrollTranslation();
+ geometryPropertyTreeState.transform = scrollTranslation();
else if (svgLocalToBorderBoxTransform())
- properties.transform = svgLocalToBorderBoxTransform();
+ geometryPropertyTreeState.transform = svgLocalToBorderBoxTransform();
if (overflowClip())
- properties.clip = overflowClip();
+ geometryPropertyTreeState.clip = overflowClip();
else if (cssClip())
- properties.clip = cssClip();
+ geometryPropertyTreeState.clip = cssClip();
+
// TODO(chrishtr): cssClipFixedPosition needs to be handled somehow.
+
+ return geometryPropertyTreeState;
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698