| Index: third_party/WebKit/Source/core/frame/FrameView.h
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
|
| index 464953ad0d065036ef9cc5aaa9a588a63fabdee8..41990a3424389ed09b1836a96abeaa59b5b10588 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h
|
| @@ -79,6 +79,7 @@ class LayoutObject;
|
| class LayoutReplaced;
|
| class LayoutScrollbarPart;
|
| class LayoutView;
|
| +class PaintController;
|
| class PaintInvalidationState;
|
| class Page;
|
| class ScrollingCoordinator;
|
| @@ -250,10 +251,6 @@ public:
|
| // Everything except paint (the last phase).
|
| void updateAllLifecyclePhasesExceptPaint();
|
|
|
| - // Computes the style, layout and compositing lifecycle stages if needed. After calling this method, all frames will be in a lifecycle
|
| - // state >= CompositingClean, and scrolling has been updated (unless throttling is allowed).
|
| - void updateLifecycleToCompositingCleanPlusScrolling();
|
| -
|
| // Computes only the style and layout lifecycle stages.
|
| // After calling this method, all frames will be in a lifecycle state >= LayoutClean (unless throttling is allowed).
|
| void updateLifecycleToLayoutClean();
|
| @@ -951,6 +948,9 @@ private:
|
| PaintInvalidationReason reason;
|
| };
|
| std::unique_ptr<Vector<ObjectPaintInvalidation>> m_trackedObjectPaintInvalidations;
|
| +
|
| + // For Slimming Paint v2 only.
|
| + std::unique_ptr<PaintController> m_paintController;
|
| };
|
|
|
| inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count)
|
|
|