| 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 a7e11670445cc2f999893b79637bf65c2604e720..6f7520744b63b39fefbdd18ecda4837c6e5913ca 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h
|
| @@ -188,10 +188,6 @@ public:
|
| WebDisplayMode displayMode() { return m_displayMode; }
|
| void setDisplayMode(WebDisplayMode);
|
|
|
| - void addSlowRepaintObject();
|
| - void removeSlowRepaintObject();
|
| - bool hasSlowRepaintObjects() const { return m_slowRepaintObjectCount; }
|
| -
|
| // Fixed-position objects.
|
| typedef HashSet<LayoutObject*> ViewportConstrainedObjectSet;
|
| void addViewportConstrainedObject(LayoutObject*);
|
| @@ -199,6 +195,12 @@ public:
|
| const ViewportConstrainedObjectSet* viewportConstrainedObjects() const { return m_viewportConstrainedObjects.get(); }
|
| bool hasViewportConstrainedObjects() const { return m_viewportConstrainedObjects && m_viewportConstrainedObjects->size() > 0; }
|
|
|
| + // Objects with background-attachment:fixed.
|
| + void addBackgroundAttachmentFixedObject(LayoutObject*);
|
| + void removeBackgroundAttachmentFixedObject(LayoutObject*);
|
| + bool hasBackgroundAttachmentFixedObjects() const { return m_backgroundAttachmentFixedObjects.size(); }
|
| + void invalidateBackgroundAttachmentFixedObjects();
|
| +
|
| void handleLoadCompleted();
|
|
|
| void updateDocumentAnnotatedRegions() const;
|
| @@ -739,7 +741,6 @@ private:
|
| bool m_doFullPaintInvalidation;
|
|
|
| bool m_canHaveScrollbars;
|
| - unsigned m_slowRepaintObjectCount;
|
|
|
| bool m_hasPendingLayout;
|
| LayoutSubtreeRootList m_layoutSubtreeRootList;
|
| @@ -783,6 +784,7 @@ private:
|
| OwnPtrWillBeMember<ScrollableAreaSet> m_animatingScrollableAreas;
|
| OwnPtr<ResizerAreaSet> m_resizerAreas;
|
| OwnPtr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects;
|
| + ViewportConstrainedObjectSet m_backgroundAttachmentFixedObjects;
|
| OwnPtrWillBeMember<FrameViewAutoSizeInfo> m_autoSizeInfo;
|
|
|
| IntSize m_inputEventsOffsetForEmulation;
|
|
|