MainFrame scrollbars should work with RFV instead of FV

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@gmail.com>
@@ skipping 32 matching lines @@
  */
 
 #include "core/paint/PaintLayerScrollableArea.h"
 
 #include "core/css/PseudoStyleRequest.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DOMNodeIds.h"
 #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"
 #include "core/frame/RootFrameViewport.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutFlexibleBox.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutScrollbar.h"
@@ skipping 600 matching lines @@
   if (box().style()->overflowX() == OverflowScroll && horizontalScrollbar()) {
     horizontalScrollbar()->setEnabled(hasHorizontalOverflow() &&
                                       !scrollbarsHidden());
   }
   if (box().style()->overflowY() == OverflowScroll && verticalScrollbar()) {
     verticalScrollbar()->setEnabled(hasVerticalOverflow() &&
                                     !scrollbarsHidden());
   }
 }
 
+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());
 
   bool relayoutIsPrevented = PreventRelayoutScope::relayoutIsPrevented();
   bool scrollbarsAreFrozen =
       m_inOverflowRelayout || FreezeScrollbarsScope::scrollbarsAreFrozen();
 
   if (needsScrollbarReconstruction()) {
     setHasHorizontalScrollbar(false);
     setHasVerticalScrollbar(false);
@@ skipping 1073 matching lines @@
 PaintLayerScrollableArea::compositorAnimationTimeline() const {
   if (LocalFrame* frame = box().frame()) {
     if (Page* page = frame->page())
       return page->scrollingCoordinator()
                  ? page->scrollingCoordinator()->compositorAnimationTimeline()
                  : nullptr;
   }
   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());
 }
 
 void PaintLayerScrollableArea::ScrollbarManager::destroyDetachedScrollbars() {
   DCHECK(!m_hBarIsAttached || m_hBar);
   DCHECK(!m_vBarIsAttached || m_vBar);
   if (m_hBar && !m_hBarIsAttached)
     destroyScrollbar(HorizontalScrollbar);
@@ skipping 196 matching lines @@
 
 void PaintLayerScrollableArea::DelayScrollOffsetClampScope::
     clampScrollableAreas() {
   for (auto& scrollableArea : *s_needsClamp)
     scrollableArea->clampScrollOffsetsAfterLayout();
   delete s_needsClamp;
   s_needsClamp = nullptr;
 }
 
 }  // namespace blink