Early out PrePaintTreeWalk::walk() earlier

third_party/WebKit/Source/core/paint/PrePaintTreeWalk.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/PrePaintTreeWalk.h"
 
 #include "core/dom/DocumentLifecycle.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
@@ skipping 197 matching lines @@
     context.forceSubtreeUpdate = true;
   }
 
   paintLayer.setPreviousPaintingClipRects(*clipRects);
 }
 
 void PrePaintTreeWalk::walk(const LayoutObject& object,
                             const PrePaintTreeWalkContext& parentContext) {
   PrePaintTreeWalkContext context(parentContext);
 
-  // This must happen before updateContextForBoxPosition, because the
-  // latter reads some of the state computed uere.
-  updateAuxiliaryObjectProperties(object, context);
-
-  // Ensure the current context takes into account the box's position. This can
-  // force a subtree update due to paint offset changes and must precede any
-  // early out from the treewalk.
-  m_propertyTreeBuilder.updateContextForBoxPosition(object,
-                                                    context.treeBuilderContext);
-
   // Early out from the treewalk if possible.
   if (!object.needsPaintPropertyUpdate() &&
       !object.descendantNeedsPaintPropertyUpdate() &&
       !context.treeBuilderContext.forceSubtreeUpdate &&
       !context.paintInvalidatorContext.forcedSubtreeInvalidationFlags &&
       !object
-           .shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState()) {
+           .shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState())
     return;
-  }
+
+  // This must happen before updatePropertiesForSelf, because the latter reads
+  // some of the state computed here.
+  updateAuxiliaryObjectProperties(object, context);
 
   m_propertyTreeBuilder.updatePropertiesForSelf(object,
                                                 context.treeBuilderContext);
   m_paintInvalidator.invalidatePaintIfNeeded(object,
                                              context.paintInvalidatorContext);
   m_propertyTreeBuilder.updatePropertiesForChildren(object,
                                                     context.treeBuilderContext);
 
   if (object.isBoxModelObject() && object.hasLayer()) {
     if (object.styleRef().hasTransform() ||
@@ skipping 27 matching lines @@
           roundedIntPoint(context.treeBuilderContext.current.paintOffset);
       walk(*toFrameView(widget), context);
     }
     // TODO(pdr): Investigate RemoteFrameView (crbug.com/579281).
   }
 
   object.getMutableForPainting().clearPaintFlags();
 }
 
 }  // namespace blink