Make scroll translation transform nodes reference scroll nodes

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp

 // 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.
 
 #include "core/paint/PaintPropertyTreeBuilder.h"
 
 #include "core/dom/DOMNodeIds.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
@@ skipping 52 matching lines @@
   if (auto* existingContentClip = frameView.contentClip()) {
     existingContentClip->update(std::move(parent),
                                 std::move(localTransformSpace), clipRect);
     return false;
   }
   frameView.setContentClip(ClipPaintPropertyNode::create(
       std::move(parent), std::move(localTransformSpace), clipRect));
   return true;
 }
 
-// True if a new property was created, false if an existing one was updated.
-static bool updateScrollTranslation(
-    FrameView& frameView,
-    PassRefPtr<const TransformPaintPropertyNode> parent,
-    const TransformationMatrix& matrix,
-    const FloatPoint3D& origin) {
-  DCHECK(!RuntimeEnabledFeatures::rootLayerScrollingEnabled());
-  if (auto* existingScrollTranslation = frameView.scrollTranslation()) {
-    existingScrollTranslation->update(std::move(parent), matrix, origin);
-    return false;
-  }
-  frameView.setScrollTranslation(
-      TransformPaintPropertyNode::create(std::move(parent), matrix, origin));
-  return true;
-}
-
 static CompositorElementId createDomNodeBasedCompositorElementId(
     const LayoutObject& object) {
   return createCompositorElementId(DOMNodeIds::idForNode(object.node()),
                                    CompositorSubElementId::Primary);
 }
 
+// True if a new property was created, false if an existing one was updated.
+static bool updateScrollTranslation(
+    FrameView& frameView,
+    PassRefPtr<const TransformPaintPropertyNode> parent,
+    const TransformationMatrix& matrix,
+    const FloatPoint3D& origin,
+    PassRefPtr<const ScrollPaintPropertyNode> scroll) {
+  DCHECK(!RuntimeEnabledFeatures::rootLayerScrollingEnabled());
+  CompositorElementId compositorElementId =
+      createDomNodeBasedCompositorElementId(*frameView.layoutView());
+  if (auto* existingScrollTranslation = frameView.scrollTranslation()) {
+    existingScrollTranslation->update(
+        std::move(parent), matrix, origin, std::move(scroll), false, 0,
+        CompositingReasonNone, compositorElementId);
+    return false;
+  }
+  frameView.setScrollTranslation(TransformPaintPropertyNode::create(
+      std::move(parent), matrix, origin, std::move(scroll), false, 0,
+      CompositingReasonNone, compositorElementId));
+  return true;
+}
+
 // True if a new property was created or a main thread scrolling reason changed
 // (which can affect descendants), false if an existing one was updated.
 static bool updateScroll(
     FrameView& frameView,
     PassRefPtr<const ScrollPaintPropertyNode> parent,
-    PassRefPtr<const TransformPaintPropertyNode> scrollOffset,
     const IntSize& clip,
     const IntSize& bounds,
     bool userScrollableHorizontal,
     bool userScrollableVertical,
     MainThreadScrollingReasons mainThreadScrollingReasons) {
   DCHECK(!RuntimeEnabledFeatures::rootLayerScrollingEnabled());
-
-  CompositorElementId compositorElementId =
-      createDomNodeBasedCompositorElementId(*frameView.layoutView());
   if (auto* existingScroll = frameView.scroll()) {
     auto existingReasons = existingScroll->mainThreadScrollingReasons();
-    existingScroll->update(std::move(parent), std::move(scrollOffset), clip,
-                           bounds, userScrollableHorizontal,
-                           userScrollableVertical, mainThreadScrollingReasons,
-                           compositorElementId);
+    existingScroll->update(std::move(parent), clip, bounds,
+                           userScrollableHorizontal, userScrollableVertical,
+                           mainThreadScrollingReasons);
     return existingReasons != mainThreadScrollingReasons;
   }
   frameView.setScroll(ScrollPaintPropertyNode::create(
-      std::move(parent), std::move(scrollOffset), clip, bounds,
-      userScrollableHorizontal, userScrollableVertical,
-      mainThreadScrollingReasons, compositorElementId));
+      std::move(parent), clip, bounds, userScrollableHorizontal,
+      userScrollableVertical, mainThreadScrollingReasons));
   return true;
 }
 
 static MainThreadScrollingReasons mainThreadScrollingReasons(
     const FrameView& frameView,
     MainThreadScrollingReasons ancestorReasons) {
   auto reasons = ancestorReasons;
   if (!frameView.frame().settings()->getThreadedScrollingEnabled())
     reasons |= MainThreadScrollingReason::kThreadedScrollingDisabled;
   if (frameView.hasBackgroundAttachmentFixedObjects())
@@ skipping 30 matching lines @@
         frameView, context.current.transform, frameTranslate, FloatPoint3D());
 
     FloatRoundedRect contentClip(
         IntRect(IntPoint(), frameView.visibleContentSize()));
     context.forceSubtreeUpdate |=
         updateContentClip(frameView, context.current.clip,
                           frameView.preTranslation(), contentClip);
 
     ScrollOffset scrollOffset = frameView.getScrollOffset();
     if (frameView.isScrollable() || !scrollOffset.isZero()) {
-      TransformationMatrix frameScroll;
-      frameScroll.translate(-scrollOffset.width(), -scrollOffset.height());
-      context.forceSubtreeUpdate |= updateScrollTranslation(
-          frameView, frameView.preTranslation(), frameScroll, FloatPoint3D());
-
       IntSize scrollClip = frameView.visibleContentSize();
       IntSize scrollBounds = frameView.contentsSize();
       bool userScrollableHorizontal =
           frameView.userInputScrollable(HorizontalScrollbar);
       bool userScrollableVertical =
           frameView.userInputScrollable(VerticalScrollbar);
 
       auto ancestorReasons =
           context.current.scroll->mainThreadScrollingReasons();
       auto reasons = mainThreadScrollingReasons(frameView, ancestorReasons);
+      context.forceSubtreeUpdate |= updateScroll(
+          frameView, context.current.scroll, scrollClip, scrollBounds,
+          userScrollableHorizontal, userScrollableVertical, reasons);
 
-      context.forceSubtreeUpdate |= updateScroll(
-          frameView, context.current.scroll, frameView.scrollTranslation(),
-          scrollClip, scrollBounds, userScrollableHorizontal,
-          userScrollableVertical, reasons);
+      TransformationMatrix frameScroll;
+      frameScroll.translate(-scrollOffset.width(), -scrollOffset.height());
+      context.forceSubtreeUpdate |= updateScrollTranslation(
+          frameView, frameView.preTranslation(), frameScroll, FloatPoint3D(),
+          frameView.scroll());
     } else {
       if (frameView.scrollTranslation() || frameView.scroll()) {
         // Ensure pre-existing properties are cleared if there is no scrolling.
         frameView.setScrollTranslation(nullptr);
         frameView.setScroll(nullptr);
 
         // Rebuild all descendant properties because a property was removed.
         context.forceSubtreeUpdate = true;
       }
     }
@@ skipping 57 matching lines @@
   LayoutPoint fractionalPaintOffset =
       LayoutPoint(context.current.paintOffset - roundedPaintOffset);
 
   if (object.needsPaintPropertyUpdate() || context.forceSubtreeUpdate) {
     if (usesPaintOffsetTranslation) {
       auto& properties = object.getMutableForPainting().ensurePaintProperties();
       context.forceSubtreeUpdate |= properties.updatePaintOffsetTranslation(
           context.current.transform,
           TransformationMatrix().translate(roundedPaintOffset.x(),
                                            roundedPaintOffset.y()),
-          FloatPoint3D(), context.current.shouldFlattenInheritedTransform,
+          FloatPoint3D(), nullptr,
+          context.current.shouldFlattenInheritedTransform,
           context.current.renderingContextId);
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties())
         context.forceSubtreeUpdate |= properties->clearPaintOffsetTranslation();
     }
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->paintOffsetTranslation()) {
     context.current.transform = properties->paintOffsetTranslation();
@@ skipping 103 matching lines @@
 
       if (style.hasTransform() || style.preserves3D() ||
           compositingReasons != CompositingReasonNone) {
         TransformationMatrix matrix;
         style.applyTransform(
             matrix, box.size(), ComputedStyle::ExcludeTransformOrigin,
             ComputedStyle::IncludeMotionPath,
             ComputedStyle::IncludeIndependentTransformProperties);
 
         // TODO(trchen): transform-style should only be respected if a
-        // PaintLayer
-        // is created.
-        // If a node with transform-style: preserve-3d does not exist in an
-        // existing rendering context, it establishes a new one.
+        // PaintLayer is created. If a node with transform-style: preserve-3d
+        // does not exist in an existing rendering context, it establishes a new
+        // one.
         unsigned renderingContextId = context.current.renderingContextId;
         if (style.preserves3D() && !renderingContextId)
           renderingContextId = PtrHash<const LayoutObject>::hash(&object);
 
         CompositorElementId compositorElementId =
             style.hasCurrentTransformAnimation()
                 ? createDomNodeBasedCompositorElementId(object)
                 : CompositorElementId();
 
         auto& properties =
             object.getMutableForPainting().ensurePaintProperties();
         context.forceSubtreeUpdate |= properties.updateTransform(
-            context.current.transform, matrix, transformOrigin(box),
+            context.current.transform, matrix, transformOrigin(box), nullptr,
             context.current.shouldFlattenInheritedTransform, renderingContextId,
             compositingReasons, compositorElementId);
         hasTransform = true;
       }
     }
     if (!hasTransform) {
       if (auto* properties = object.getMutableForPainting().paintProperties())
         context.forceSubtreeUpdate |= properties->clearTransform();
     }
   }
@@ skipping 267 matching lines @@
     if (object.isBox() && style.hasPerspective()) {
       // The perspective node must not flatten (else nothing will get
       // perspective), but it should still extend the rendering context as
       // most transform nodes do.
       TransformationMatrix matrix =
           TransformationMatrix().applyPerspective(style.perspective());
       FloatPoint3D origin = perspectiveOrigin(toLayoutBox(object)) +
                             toLayoutSize(context.current.paintOffset);
       auto& properties = object.getMutableForPainting().ensurePaintProperties();
       context.forceSubtreeUpdate |= properties.updatePerspective(
-          context.current.transform, matrix, origin,
+          context.current.transform, matrix, origin, nullptr,
           context.current.shouldFlattenInheritedTransform,
           context.current.renderingContextId);
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties())
         context.forceSubtreeUpdate |= properties->clearPerspective();
     }
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->perspective()) {
@@ skipping 58 matching lines @@
           context.current.scroll->mainThreadScrollingReasons();
       auto reasons = mainThreadScrollingReasons(object, ancestorReasons);
       bool scrollNodeNeededForMainThreadReasons = ancestorReasons != reasons;
 
       const LayoutBox& box = toLayoutBox(object);
       const auto* scrollableArea = box.getScrollableArea();
       IntSize scrollOffset = box.scrolledContentOffset();
       if (scrollNodeNeededForMainThreadReasons || !scrollOffset.isZero() ||
           scrollableArea->scrollsOverflow()) {
         needsScrollProperties = true;
-        auto& properties =
-            object.getMutableForPainting().ensurePaintProperties();
-        TransformationMatrix matrix = TransformationMatrix().translate(
-            -scrollOffset.width(), -scrollOffset.height());
-        context.forceSubtreeUpdate |= properties.updateScrollTranslation(
-            context.current.transform, matrix, FloatPoint3D(),
-            context.current.shouldFlattenInheritedTransform,
-            context.current.renderingContextId);
 
         IntSize scrollClip = scrollableArea->visibleContentRect().size();
         IntSize scrollBounds = scrollableArea->contentsSize();
         bool userScrollableHorizontal =
             scrollableArea->userInputScrollable(HorizontalScrollbar);
         bool userScrollableVertical =
             scrollableArea->userInputScrollable(VerticalScrollbar);
 
         // Main thread scrolling reasons depend on their ancestor's reasons
         // so ensure the entire subtree is updated when reasons change.
+        auto& properties =
+            object.getMutableForPainting().ensurePaintProperties();
         if (auto* existingScrollNode = properties.scroll()) {
           if (existingScrollNode->mainThreadScrollingReasons() != reasons)
             context.forceSubtreeUpdate = true;
         }
 
+        context.forceSubtreeUpdate |= properties.updateScroll(
+            context.current.scroll, scrollClip, scrollBounds,
+            userScrollableHorizontal, userScrollableVertical, reasons);
+
         CompositorElementId compositorElementId =
             createDomNodeBasedCompositorElementId(object);
-
-        context.forceSubtreeUpdate |= properties.updateScroll(
-            context.current.scroll, properties.scrollTranslation(), scrollClip,
-            scrollBounds, userScrollableHorizontal, userScrollableVertical,
-            reasons, compositorElementId);
+        TransformationMatrix matrix = TransformationMatrix().translate(
+            -scrollOffset.width(), -scrollOffset.height());
+        context.forceSubtreeUpdate |= properties.updateScrollTranslation(
+            context.current.transform, matrix, FloatPoint3D(),
+            properties.scroll(),
+            context.current.shouldFlattenInheritedTransform,
+            context.current.renderingContextId, CompositingReasonNone,
+            compositorElementId);
       }
     }
 
     if (!needsScrollProperties) {
       // Ensure pre-existing properties are cleared.
       if (auto* properties = object.getMutableForPainting().paintProperties()) {
         context.forceSubtreeUpdate |= properties->clearScrollTranslation();
         context.forceSubtreeUpdate |= properties->clearScroll();
       }
     }
@@ skipping 180 matching lines @@
   updateOverflowClip(object, context);
   updatePerspective(object, context);
   updateSvgLocalToBorderBoxTransform(object, context);
   updateScrollAndScrollTranslation(object, context);
   updateOutOfFlowContext(object, context);
 
   context.forceSubtreeUpdate |= object.subtreeNeedsPaintPropertyUpdate();
 }
 
 }  // namespace blink