MainFrame scrollbars should work with RFV instead of FV

third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

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..9b32c7a62cc9b404ae8218ef9effca53512c4ae9 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,13 @@ PaintLayerScrollableArea::compositorAnimationTimeline() const {
   return nullptr;
 }
 
+void PaintLayerScrollableArea::getTickmarks(Vector<IntRect>& tickmarks) const {
+  if (LocalFrame* frame = box().frame()) {
+    tickmarks = frame->document()->markers().renderedRectsForMarkers(

[bokan, 2016/11/03 19:59:59]

I think this should probably use the RFV markers if it's the main frame.
Probably makes sense to just call frame->view()->getTickmarks and let it decide.

[ymalik, 2016/11/04 18:54:18]

See comment above. This is only called from RFV and we will only get here for
the default case (no custom tickmarks set). I agree its better to call
frame()->view()->getTickmarks though. 

+        DocumentMarker::TextMatch);
+  }
+}
+
 PaintLayerScrollableArea*
 PaintLayerScrollableArea::ScrollbarManager::scrollableArea() {
   return toPaintLayerScrollableArea(m_scrollableArea.get());