| Index: Source/core/frame/FrameView.h
|
| diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
|
| index a2a24baa7b046242e08ac52057035684d553dcfa..5340a380b8154b9a30615ee8cfc91ccbcbdfaf6c 100644
|
| --- a/Source/core/frame/FrameView.h
|
| +++ b/Source/core/frame/FrameView.h
|
| @@ -227,12 +227,7 @@
|
|
|
| Color documentBackgroundColor() const;
|
|
|
| - // Run all needed lifecycle stages. After calling this method, all frames will be in the lifecycle state PaintInvalidationClean.
|
| - void updateAllLifecyclePhases();
|
| -
|
| - // Computes the style, layout and compositing lifecycle stages if needed. After calling this method, all frames wil lbe in a lifecycle
|
| - // state >= CompositingClean, and scrolling has been updated.
|
| - void updateLifecycleToCompositingCleanPlusScrolling();
|
| + void updateLayoutAndStyleForPainting();
|
|
|
| bool invalidateViewportConstrainedObjects();
|
|
|
| @@ -608,11 +603,10 @@
|
| virtual void setScrollOffset(const IntPoint&, ScrollType) override;
|
| virtual void setScrollOffset(const DoublePoint&, ScrollType) override;
|
|
|
| - void updateAllLifecyclePhasesInternal();
|
| + void updateLayoutAndStyleForPaintingInternal();
|
| void invalidateTreeIfNeededRecursive();
|
| void scrollContentsIfNeededRecursive();
|
| - void updateStyleAndLayoutIfNeededRecursive();
|
| - void updatePostLifecycleData();
|
| + void updateLayoutAndStyleIfNeededRecursive();
|
|
|
| void reset();
|
| void init();
|
|
|