Set layer scroll data from PaintArtifactCompositor

third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.h

Index: third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.h
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.h b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.h
index 6704dede23b61cc432a61d12e1c78ada566c2d01..f440beafaa23b42f5ab7b0bbcd25f771435e102d 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.h
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.h
@@ -75,7 +75,9 @@ class PropertyTreeManager {
 
   int ensureCompositorTransformNode(const TransformPaintPropertyNode*);
   int ensureCompositorClipNode(const ClipPaintPropertyNode*);
-  int ensureCompositorScrollNode(const ScrollPaintPropertyNode*);
+  // Update the layer->scroll and scroll->layer mapping. The latter is temporary
+  // until |owning_layer_id| is removed from the scroll node.
+  void updateLayerScrollMapping(cc::Layer*, const TransformPaintPropertyNode*);
 
   int switchToEffectNode(const EffectPaintPropertyNode& nextEffect);
   int getCurrentCompositorEffectNodeIndex() const {
@@ -90,6 +92,8 @@ class PropertyTreeManager {
   cc::EffectTree& effectTree();
   cc::ScrollTree& scrollTree();
 
+  int ensureCompositorScrollNode(const ScrollPaintPropertyNode*);
+
   const EffectPaintPropertyNode* currentEffectNode() const;
 
   // Scroll translation has special treatment in the transform and scroll trees.