Change all one-off lifecycle callers to FrameView::updateLayoutAndStyleForPainting

Source/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 209 matching lines @@
     void setIsPainting(bool val) { m_isPainting = val; }
     bool isPainting() const;
     void setLastPaintTime(double val) { m_lastPaintTime = val; }
     bool hasEverPainted() const { return m_lastPaintTime; }
     void setNodeToDraw(Node*);
     Node* nodeToDraw() { return m_nodeToDraw.get(); }
 
     Color documentBackgroundColor() const;
 
     void updateLayoutAndStyleForPainting();
-    void updateLayoutAndStyleIfNeededRecursive();
 
-    void invalidateTreeIfNeededRecursive();
     bool invalidateViewportConstrainedObjects();
 
     void incrementVisuallyNonEmptyCharacterCount(unsigned);
     void incrementVisuallyNonEmptyPixelCount(const IntSize&);
     void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; }
     void enableAutoSizeMode(const IntSize& minSize, const IntSize& maxSize);
     void disableAutoSizeMode();
 
     void forceLayoutForPagination(const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkFactor);
 
     bool scrollToFragment(const KURL&);
     bool scrollToAnchor(const String&);
     void maintainScrollPositionAtAnchor(Node*);
 
     // Scrolls an |element| into a given |rect| in the frame view. The given
     // |element| must either be in this Frame's document, or the document of one
     // of this Frame's child Frames. This method is not recursive; it will not
     // scroll the child Frames so that the |element| is in view. Returns the
     // amount of scroll remaining to center the |element|, e.g. this can happen
     // if the FrameView becomes fully scrolled but |element| still isn't
     // centered in |rect|.
     DoubleSize scrollElementToRect(Element*, const FloatRect&);
-    void scrollContentsIfNeededRecursive();
 
     // Methods to convert points and rects between the coordinate space of the layoutObject, and this view.
     IntRect convertFromLayoutObject(const LayoutObject&, const IntRect&) const;
     IntRect convertToLayoutObject(const LayoutObject&, const IntRect&) const;
     IntPoint convertFromLayoutObject(const LayoutObject&, const IntPoint&) const;
     IntPoint convertToLayoutObject(const LayoutObject&, const IntPoint&) const;
 
     bool isFrameViewScrollCorner(LayoutScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; }
 
     enum ScrollingReasons {
@@ skipping 350 matching lines @@
         explicit InUpdateScrollbarsScope(FrameView* view)
             : m_scope(view->m_inUpdateScrollbars, true)
         { }
     private:
         TemporaryChange<bool> m_scope;
     };
 
 private:
     explicit FrameView(LocalFrame*);
 
+    void updateLayoutAndStyleForPaintingInternal();
+    void invalidateTreeIfNeededRecursive();
+    void scrollContentsIfNeededRecursive();
+    void updateLayoutAndStyleIfNeededRecursive();
+
     void reset();
     void init();
 
     void clearLayoutSubtreeRootsAndMarkContainingBlocks();
 
     // Called when our frame rect changes (or the rect/scroll position of an ancestor changes).
     virtual void frameRectsChanged() override;
 
     friend class LayoutPart;
 
@@ skipping 236 matching lines @@
     static const unsigned visualPixelThreshold = 32 * 32;
     if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
         setIsVisuallyNonEmpty();
 }
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 
 } // namespace blink
 
 #endif // FrameView_h