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

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 2454913003: MainFrame scrollbars should work with RFV instead of FV (Closed)
Patch Set: Rebase and fix merge conflicts Created 4 years, 1 month 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: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
index b5ff43d9e63497e3970144fc3f3c584c8fc61f91..fbe68ee3a72e3a03813f1fba774ea5350787c9e4 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
@@ -50,6 +50,7 @@
#include "core/dom/Node.h"
#include "core/dom/shadow/ShadowRoot.h"
#include "core/editing/FrameSelection.h"
+#include "core/editing/markers/DocumentMarkerController.h"
#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
@@ -670,6 +671,15 @@ void PaintLayerScrollableArea::updateScrollbarsEnabledState() {
}
}
+void PaintLayerScrollableArea::updateScrollbars() {
+ if (visualViewportSuppliesScrollbars())
+ return;
+
+ // TODO(crbug.com/661236): Refactor relevant bits from updateAfterLayout and
+ // call here.
+ updateAfterLayout();
+}
+
void PaintLayerScrollableArea::updateAfterLayout() {
DCHECK(box().hasOverflowClip());
@@ -1763,6 +1773,11 @@ PaintLayerScrollableArea::compositorAnimationTimeline() const {
return nullptr;
}
+void PaintLayerScrollableArea::getTickmarks(Vector<IntRect>& tickmarks) const {
+ if (LocalFrame* frame = box().frame())
+ frame->view()->getTickmarks(tickmarks);
+}
+
PaintLayerScrollableArea*
PaintLayerScrollableArea::ScrollbarManager::scrollableArea() {
return toPaintLayerScrollableArea(m_scrollableArea.get());

Powered by Google App Engine
This is Rietveld 408576698