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 febffe1f46970a60cefc6842a93ad26fea17afb6..e704eaa21c4607bb040c4ae73f7b9a160c742869 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.h |
+++ b/third_party/WebKit/Source/core/frame/FrameView.h |
@@ -31,7 +31,6 @@ |
#include "core/frame/LayoutSubtreeRootList.h" |
#include "core/frame/RootFrameViewport.h" |
#include "core/layout/LayoutAnalyzer.h" |
-#include "core/paint/PaintInvalidationCapableScrollableArea.h" |
#include "core/paint/PaintPhase.h" |
#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/Widget.h" |
@@ -40,6 +39,7 @@ |
#include "platform/graphics/Color.h" |
#include "platform/graphics/paint/TransformPaintPropertyNode.h" |
#include "platform/scroll/ScrollTypes.h" |
+#include "platform/scroll/ScrollableArea.h" |
#include "platform/scroll/Scrollbar.h" |
#include "public/platform/WebDisplayMode.h" |
#include "public/platform/WebRect.h" |
@@ -79,7 +79,7 @@ |
typedef unsigned long long DOMTimeStamp; |
-class CORE_EXPORT FrameView final : public Widget, public PaintInvalidationCapableScrollableArea { |
+class CORE_EXPORT FrameView final : public Widget, public ScrollableArea { |
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FrameView); |
friend class PaintControllerPaintTestBase; |
@@ -339,7 +339,7 @@ |
invalidatePaintForTickmarks(); |
} |
- void invalidatePaintForTickmarks(); |
+ void invalidatePaintForTickmarks() const; |
// Since the compositor can resize the viewport due to top controls and |
// commit scroll offsets before a WebView::resize occurs, we need to adjust |
@@ -350,7 +350,7 @@ |
IntPoint maximumScrollPosition() const override; |
// ScrollableArea interface |
- void scrollControlWasSetNeedsPaintInvalidation() override { } |
+ void invalidateScrollbarRect(Scrollbar*, const IntRect&) override; |
void getTickmarks(Vector<IntRect>&) const override; |
void scrollTo(const DoublePoint&); |
IntRect scrollableAreaBoundingBox() const override; |
@@ -390,7 +390,7 @@ |
// can be used to obtain those scrollbars. |
Scrollbar* horizontalScrollbar() const override { return m_horizontalScrollbar.get(); } |
Scrollbar* verticalScrollbar() const override { return m_verticalScrollbar.get(); } |
- LayoutScrollbarPart* scrollCorner() const override { return m_scrollCorner; } |
+ LayoutScrollbarPart* scrollCorner() const { return m_scrollCorner; } |
void positionScrollbarLayers(); |
@@ -443,8 +443,8 @@ |
// Scroll the actual contents of the view (either blitting or invalidating as needed). |
void scrollContents(const IntSize& scrollDelta); |
- // This gives us a means of blocking updating our scrollbars until the first layout has occurred. |
- void setScrollbarsSuppressed(bool suppressed) { m_scrollbarsSuppressed = suppressed; } |
+ // This gives us a means of blocking painting on our scrollbars until the first layout has occurred. |
+ void setScrollbarsSuppressed(bool suppressed, bool repaintOnUnsuppress = false); |
bool scrollbarsSuppressed() const { return m_scrollbarsSuppressed; } |
// Methods for converting between this frame and other coordinate spaces. |
@@ -589,6 +589,7 @@ |
void setHasHorizontalScrollbar(bool); |
void setHasVerticalScrollbar(bool); |
+ void invalidateScrollCornerRect(const IntRect&) override; |
ScrollBehavior scrollBehaviorStyle() const override; |
void scrollContentsIfNeeded(); |
@@ -742,10 +743,6 @@ |
void updateViewportIntersectionsForSubtree(); |
void updateViewportIntersectionIfNeeded(); |
void notifyIntersectionObservers(); |
- |
- // PaintInvalidationCapableScrollableArea |
- LayoutBox& boxForScrollControlPaintInvalidation() const override; |
- LayoutScrollbarPart* resizer() const override { return nullptr; } |
LayoutSize m_size; |