Make scroll translation transform nodes reference scroll nodes

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PropertyTreeManager_h
 #define PropertyTreeManager_h
 
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/Noncopyable.h"
@@ skipping 64 matching lines @@
 
   int ensureCompositorTransformNode(const TransformPaintPropertyNode*);
   int ensureCompositorClipNode(const ClipPaintPropertyNode*);
   int ensureCompositorScrollNode(const ScrollPaintPropertyNode*);
 
   int switchToEffectNode(const EffectPaintPropertyNode& nextEffect);
   int getCurrentCompositorEffectNodeIndex() const {
     return m_effectStack.back().id;
   }
 
-  // Scroll offset has special treatment in the transform and scroll trees.
-  void updateScrollOffset(const ScrollPaintPropertyNode*);
-
  private:
   void buildEffectNodesRecursively(const EffectPaintPropertyNode* nextEffect);
 
   cc::TransformTree& transformTree();
   cc::ClipTree& clipTree();
   cc::EffectTree& effectTree();
   cc::ScrollTree& scrollTree();
 
   const EffectPaintPropertyNode* currentEffectNode() const;
 
+  // Scroll translation has special treatment in the transform and scroll trees.
+  void updateScrollAndScrollTranslationNodes(const TransformPaintPropertyNode*);
+
   // Property trees which should be updated by the manager.
   cc::PropertyTrees& m_propertyTrees;
 
   // Layer to which transform "owner" layers should be added. These will not
   // have any actual children, but at present must exist in the tree.
   cc::Layer* m_rootLayer;
 
   // Maps from Blink-side property tree nodes to cc property node indices.
   HashMap<const TransformPaintPropertyNode*, int> m_transformNodeMap;
   HashMap<const ClipPaintPropertyNode*, int> m_clipNodeMap;
   HashMap<const ScrollPaintPropertyNode*, int> m_scrollNodeMap;
 
   struct BlinkEffectAndCcIdPair {
     const EffectPaintPropertyNode* effect;
     // The cc property tree effect node id, or 'node index', for the cc effect
     // node corresponding to the above Blink effect paint property node.
     int id;
   };
   Vector<BlinkEffectAndCcIdPair> m_effectStack;
 
 #if DCHECK_IS_ON()
   HashSet<const EffectPaintPropertyNode*> m_effectNodesConverted;
 #endif
 };
 
 }  // namespace blink
 
 #endif  // PropertyTreeManager_h