| Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
|
| index 16650e0a8010342a0719e344c0d6a99757e6305b..30009ddcc9e3aa80d4383bb7a51673047644156f 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
|
| @@ -55,13 +55,13 @@
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| #include "platform/ScriptForbiddenScope.h"
|
| #include "platform/TraceEvent.h"
|
| +#include "platform/graphics/CompositorMutableProperties.h"
|
| #include "platform/graphics/GraphicsLayer.h"
|
| #include "platform/graphics/paint/CullRect.h"
|
| #include "platform/graphics/paint/DrawingRecorder.h"
|
| #include "platform/graphics/paint/PaintController.h"
|
| #include "platform/graphics/paint/TransformDisplayItem.h"
|
| #include "public/platform/Platform.h"
|
| -#include "public/platform/WebCompositorMutableProperties.h"
|
|
|
| namespace blink {
|
|
|
| @@ -396,10 +396,10 @@ void PaintLayerCompositor::updateIfNeeded()
|
| if (RuntimeEnabledFeatures::compositorWorkerEnabled() && m_scrollLayer) {
|
| if (Element* scrollingElement = m_layoutView.document().scrollingElement()) {
|
| uint64_t elementId = 0;
|
| - uint32_t mutableProperties = WebCompositorMutablePropertyNone;
|
| + uint32_t mutableProperties = CompositorMutablePropertyNone;
|
| if (scrollingElement->hasCompositorProxy()) {
|
| elementId = DOMNodeIds::idForNode(scrollingElement);
|
| - mutableProperties = (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop) & scrollingElement->compositorMutableProperties();
|
| + mutableProperties = (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop) & scrollingElement->compositorMutableProperties();
|
| }
|
| m_scrollLayer->setElementId(elementId);
|
| m_scrollLayer->setCompositorMutableProperties(mutableProperties);
|
|
|