| 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
|
|
|