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..4fdb3ca294dfe79b29094898f00f560dc1eb4e7e 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); |
@@ -980,7 +980,6 @@ void PaintLayerCompositor::ensureRootLayer() |
IntRect overflowRect = m_layoutView.pixelSnappedLayoutOverflowRect(); |
m_rootContentLayer->setSize(FloatSize(overflowRect.maxX(), overflowRect.maxY())); |
m_rootContentLayer->setPosition(FloatPoint()); |
- m_rootContentLayer->setOwnerNodeId(DOMNodeIds::idForNode(m_layoutView.generatingNode())); |
// FIXME: with rootLayerScrolls, we probably don't even need m_rootContentLayer? |
if (!(settings && settings->rootLayerScrolls())) { |