| Index: third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h b/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
|
| index 186fe5939736d7572652cce9e02bc0e6ca0c4ace..76844fb8d94561ee2542d86cc923ad7a799f78c9 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
|
| @@ -61,7 +61,8 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
|
| const IntSize& bounds,
|
| bool userScrollableHorizontal,
|
| bool userScrollableVertical,
|
| - MainThreadScrollingReasons mainThreadScrollingReasons) {
|
| + MainThreadScrollingReasons mainThreadScrollingReasons,
|
| + WebLayerScrollClient* scrollClient) {
|
| // If this transform is for scroll offset, it should be a 2d translation.
|
| DCHECK(matrix.isIdentityOr2DTranslation());
|
| return adoptRef(new TransformPaintPropertyNode(
|
| @@ -69,7 +70,7 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
|
| renderingContextId, directCompositingReasons, compositorElementId,
|
| ScrollPaintPropertyNode::create(
|
| std::move(parentScroll), clip, bounds, userScrollableHorizontal,
|
| - userScrollableVertical, mainThreadScrollingReasons)));
|
| + userScrollableVertical, mainThreadScrollingReasons, scrollClient)));
|
| }
|
|
|
| void update(
|
| @@ -104,14 +105,15 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
|
| const IntSize& bounds,
|
| bool userScrollableHorizontal,
|
| bool userScrollableVertical,
|
| - MainThreadScrollingReasons mainThreadScrollingReasons) {
|
| + MainThreadScrollingReasons mainThreadScrollingReasons,
|
| + WebLayerScrollClient* scrollClient) {
|
| update(std::move(parent), matrix, origin, flattensInheritedTransform,
|
| renderingContextId, directCompositingReasons, compositorElementId);
|
| DCHECK(m_scroll);
|
| DCHECK(matrix.isIdentityOr2DTranslation());
|
| m_scroll->update(std::move(parentScroll), clip, bounds,
|
| userScrollableHorizontal, userScrollableVertical,
|
| - mainThreadScrollingReasons);
|
| + mainThreadScrollingReasons, scrollClient);
|
| }
|
|
|
| const TransformationMatrix& matrix() const { return m_matrix; }
|
|
|