Refactor LayoutView paint offset updates out of FrameView update code

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/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 84 matching lines @@
     existingScroll->update(std::move(parent), std::move(scrollOffset), clip,
                            bounds, userScrollableHorizontal,
                            userScrollableVertical);
   } else {
     frameView.setScroll(ScrollPaintPropertyNode::create(
         std::move(parent), std::move(scrollOffset), clip, bounds,
         userScrollableHorizontal, userScrollableVertical));
   }
 }
 
-void PaintPropertyTreeBuilder::updatePropertiesAndContext(
+void PaintPropertyTreeBuilder::updateFramePropertiesAndContext(
     FrameView& frameView,
     PaintPropertyTreeBuilderContext& context) {
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-    LayoutView* layoutView = frameView.layoutView();
-    if (!layoutView)
-      return;
-
-    TransformationMatrix frameTranslate;
-    frameTranslate.translate(frameView.x() + layoutView->location().x() +
-                                 context.current.paintOffset.x(),
-                             frameView.y() + layoutView->location().y() +
-                                 context.current.paintOffset.y());
-    layoutView->getMutableForPainting()
-        .ensurePaintProperties()
-        .updatePaintOffsetTranslation(context.current.transform, frameTranslate,
-                                      FloatPoint3D());
-
-    const auto* properties = layoutView->paintProperties();
-    DCHECK(properties && properties->paintOffsetTranslation());
-    context.current.transform = properties->paintOffsetTranslation();
-    context.current.paintOffset = LayoutPoint();
+    // With RootLayerScrolling, the LayoutView (a LayoutObject) properties are
+    // updated like other objects (see updatePropertiesAndContextForSelf and
+    // updatePropertiesAndContextForChildren) instead of having LayoutView-
+    // specific property updates here.
+    context.current.paintOffset.moveBy(frameView.location());
     context.current.renderingContextID = 0;
     context.current.shouldFlattenInheritedTransform = true;
     context.absolutePosition = context.current;
-    context.containerForAbsolutePosition =
-        nullptr;  // This will get set in updateOutOfFlowContext().
+    context.containerForAbsolutePosition = nullptr;
     context.fixedPosition = context.current;
     return;
   }
 
   TransformationMatrix frameTranslate;
   frameTranslate.translate(frameView.x() + context.current.paintOffset.x(),
                            frameView.y() + context.current.paintOffset.y());
   updateFrameViewPreTranslation(frameView, context.current.transform,
                                 frameTranslate, FloatPoint3D());
 
@@ skipping 48 matching lines @@
   context.fixedPosition = context.current;
   context.fixedPosition.transform = fixedTransformNode;
   context.fixedPosition.scroll = fixedScrollNode;
 
   std::unique_ptr<PropertyTreeState> contentsState(
       new PropertyTreeState(context.current.transform, context.current.clip,
                             context.currentEffect, context.current.scroll));
   frameView.setTotalPropertyTreeStateForContents(std::move(contentsState));
 }
 
+void PaintPropertyTreeBuilder::updateLayoutViewPaintOffsetTranslation(
+    const LayoutView& view,
+    PaintPropertyTreeBuilderContext& context) {
+  DCHECK(RuntimeEnabledFeatures::rootLayerScrollingEnabled());
+  TransformationMatrix translate;
+  translate.translate(context.current.paintOffset.x(),
+                      context.current.paintOffset.y());
+  view.getMutableForPainting()
+      .ensurePaintProperties()
+      .updatePaintOffsetTranslation(context.current.transform, translate,
+                                    FloatPoint3D());
+
+  const auto* properties = view.paintProperties();
+  DCHECK(properties && properties->paintOffsetTranslation());
+  context.current.transform = context.absolutePosition.transform =
+      context.fixedPosition.transform = properties->paintOffsetTranslation();
+  context.current.paintOffset = context.absolutePosition.paintOffset =
+      context.fixedPosition.paintOffset = LayoutPoint();
+}
+
 void PaintPropertyTreeBuilder::updatePaintOffsetTranslation(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
-  // LayoutView's paint offset is updated in the FrameView property update.
-  if (object.isLayoutView()) {
-    DCHECK(context.current.paintOffset == LayoutPoint());
+  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
+      object.isLayoutView()) {

[trchen, 2016/11/01 23:36:25]

Is the special case still needed?

It looks like there are subtle differences in flattening and fixed-pos context
bookkeeping. I'm okay with it if not special casing makes it too awkward.

+    updateLayoutViewPaintOffsetTranslation(toLayoutView(object), context);
     return;
   }
 
   bool usesPaintOffsetTranslation = false;
   if (object.isBoxModelObject() &&
       context.current.paintOffset != LayoutPoint()) {
     // TODO(trchen): Eliminate PaintLayer dependency.
     PaintLayer* layer = toLayoutBoxModelObject(object).layer();
     if (layer && layer->paintsWithTransform(GlobalPaintNormalPhase))
       usesPaintOffsetTranslation = true;
@@ skipping 652 matching lines @@
     return;
 
   updateOverflowClip(object, context);
   updatePerspective(object, context);
   updateSvgLocalToBorderBoxTransform(object, context);
   updateScrollAndScrollTranslation(object, context);
   updateOutOfFlowContext(object, context);
 }
 
 }  // namespace blink