Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(937)

Unified Diff: Source/core/frame/FrameView.h

Issue 1126883002: Change all one-off lifecycle callers to FrameView::updateLayoutAndStyleForPainting (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/frame/FrameView.h
diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
index 722e6d8f507328192fe40d660478b3d389111e27..5ca436e25f316f804a002aa736890c2f667e5da8 100644
--- a/Source/core/frame/FrameView.h
+++ b/Source/core/frame/FrameView.h
@@ -227,9 +227,7 @@ public:
Color documentBackgroundColor() const;
void updateLayoutAndStyleForPainting();
- void updateLayoutAndStyleIfNeededRecursive();
- void invalidateTreeIfNeededRecursive();
bool invalidateViewportConstrainedObjects();
void incrementVisuallyNonEmptyCharacterCount(unsigned);
@@ -252,7 +250,6 @@ public:
// 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;
@@ -623,6 +620,11 @@ protected:
private:
explicit FrameView(LocalFrame*);
+ void updateLayoutAndStyleForPaintingInternal();
+ void invalidateTreeIfNeededRecursive();
+ void scrollContentsIfNeededRecursive();
+ void updateLayoutAndStyleIfNeededRecursive();
+
void reset();
void init();

Powered by Google App Engine
This is Rietveld 408576698