[RLS] Remove references to RootLayerScrollingEnabled in various files

Bug:823365

Change-Id: I188e8521d0981c3da23f978caaffdc0009190691
Reviewed-on: https://chromium-review.googlesource.com/1070887
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561316}

third_party/blink/renderer/core/dom/tree_scope.cc

@@ -208,11 +208,6 @@ static bool PointInFrameContentIfVisible(Document& document,
     return false;
 
   point_in_frame.Scale(frame->PageZoomFactor(), frame->PageZoomFactor());
-  // For non RLS case, the point needs to be adjusted by the frame's scroll
-  // offset.
-  if (!RuntimeEnabledFeatures::RootLayerScrollingEnabled())
-    point_in_frame.Move(scrollable_area->GetScrollOffset());
-
   return true;
 }
 

third_party/blink/renderer/core/editing/finder/text_finder.cc

@@ -763,20 +763,17 @@ int TextFinder::SelectFindMatch(unsigned index, WebRect* selection_rect) {
                                   ScrollAlignment::kAlignCenterIfNeeded,
                                   kUserScroll));
 
-      if (RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
-        // If RLS is on, absolute coordinates are scroll-variant so the
-        // bounding box will change if the page is scrolled by
-        // ScrollRectToVisible above. Recompute the bounding box so we have the
-        // updated location for the zoom below.
-        // TODO(bokan): This should really use the return value from
-        // ScrollRectToVisible which returns the updated position of the
-        // scrolled rect. However, this was recently added and this is a fix
-        // that needs to be merged to a release branch.
-        // https://crbug.com/823365.
-        active_match_bounding_box =
-            EnclosingIntRect(LayoutObject::AbsoluteBoundingBoxRectForRange(
-                EphemeralRange(active_match_.Get())));
-      }
+      // Absolute coordinates are scroll-variant so the bounding box will change
+      // if the page is scrolled by ScrollRectToVisible above. Recompute the
+      // bounding box so we have the updated location for the zoom below.
+      // TODO(bokan): This should really use the return value from
+      // ScrollRectToVisible which returns the updated position of the
+      // scrolled rect. However, this was recently added and this is a fix
+      // that needs to be merged to a release branch.
+      // https://crbug.com/823365.
+      active_match_bounding_box =
+          EnclosingIntRect(LayoutObject::AbsoluteBoundingBoxRectForRange(
+              EphemeralRange(active_match_.Get())));
     }
 
     // Zoom to the active match.

third_party/blink/renderer/core/exported/web_view_impl.cc

@@ -2974,13 +2974,6 @@ WebSize WebViewImpl::ContentsPreferredMinimumSize() {
   int width_scaled = document->GetLayoutView()
                          ->MinPreferredLogicalWidth()
                          .Round();  // Already accounts for zoom.
-  if (Scrollbar* scrollbar =
-          MainFrameImpl()->GetFrameView()->VerticalScrollbar()) {
-    DCHECK(!RuntimeEnabledFeatures::RootLayerScrollingEnabled());
-    // For RLS, this occurs in LayoutBlock::ComputeIntrinsicLogicalWidths.
-    if (!scrollbar->IsOverlayScrollbar())
-      width_scaled += scrollbar->ScrollbarThickness();
-  }
   int height_scaled =
       document->documentElement()->GetLayoutBox()->ScrollHeight().Round();
   return IntSize(width_scaled, height_scaled);

third_party/blink/renderer/core/frame/local_frame.cc

@@ -731,21 +731,6 @@ void LocalFrame::SetPageAndTextZoomFactors(float page_zoom_factor,
       return;
   }
 
-  if (page_zoom_factor_ != page_zoom_factor &&
-      !RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
-    if (LocalFrameView* view = this->View()) {
-      // Update the scroll position when doing a full page zoom, so the content
-      // stays in relatively the same position.
-      ScrollableArea* scrollable_area = view->LayoutViewportScrollableArea();
-      ScrollOffset scroll_offset = scrollable_area->GetScrollOffset();
-      float percent_difference = (page_zoom_factor / page_zoom_factor_);
-      scrollable_area->SetScrollOffset(
-          ScrollOffset(scroll_offset.Width() * percent_difference,
-                       scroll_offset.Height() * percent_difference),
-          kProgrammaticScroll);
-    }
-  }
-
   page_zoom_factor_ = page_zoom_factor;
   text_zoom_factor_ = text_zoom_factor;
 

third_party/blink/renderer/core/frame/root_frame_viewport.cc

@@ -285,8 +285,7 @@ LayoutRect RootFrameViewport::ScrollIntoView(
   LayoutRect scroll_snapport_rect(VisibleScrollSnapportRect());
 
   LayoutRect rect_in_document = rect_in_absolute;
-  if (RuntimeEnabledFeatures::RootLayerScrollingEnabled())
-    rect_in_document.Move(LayoutSize(LayoutViewport().GetScrollOffset()));
+  rect_in_document.Move(LayoutSize(LayoutViewport().GetScrollOffset()));
 
   ScrollOffset new_scroll_offset =
       ClampScrollOffset(ScrollAlignment::GetScrollOffsetToExpose(
@@ -312,8 +311,7 @@ LayoutRect RootFrameViewport::ScrollIntoView(
   // Return the newly moved rect to absolute coordinates.
   // TODO(szager): PaintLayerScrollableArea::ScrollIntoView clips the return
   // value to the visible content rect, but this does not.
-  if (RuntimeEnabledFeatures::RootLayerScrollingEnabled())
-    rect_in_document.Move(-LayoutSize(LayoutViewport().GetScrollOffset()));
+  rect_in_document.Move(-LayoutSize(LayoutViewport().GetScrollOffset()));
   return rect_in_document;
 }
 

third_party/blink/renderer/core/fullscreen/fullscreen.cc

@@ -892,13 +892,6 @@ void Fullscreen::FullscreenElementChanged(Element* old_element,
     frame->GetEventHandler().ScheduleHoverStateUpdate();
     frame->GetChromeClient().FullscreenElementChanged(old_element, new_element);
 
-    if (!RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
-      // Fullscreen status affects scroll paint properties through
-      // LocalFrameView::UserInputScrollable().
-      if (LocalFrameView* frame_view = frame->View())
-        frame_view->SetNeedsPaintPropertyUpdate();
-    }
-
     // Descendant frames may have been inert because their owner iframes were
     // outside of fullscreen element. SetIsInert recurses through subframes to
     // propagate the inert bit as needed.

third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc

@@ -223,33 +223,7 @@ void ScrollingCoordinator::UpdateAfterCompositingChangeIfNeeded(
   }
   frame_view->ClearFrameIsScrollableDidChange();
 
-  if (frame_view && !RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
-    if (cc::Layer* scroll_layer =
-            GraphicsLayerToCcLayer(frame_view->LayerForScrolling())) {
-      UpdateUserInputScrollable(frame_view);
-      scroll_layer->SetBounds(
-          static_cast<gfx::Size>(frame_view->ContentsSize()));
-    }
-  }
-
   UpdateUserInputScrollable(&page_->GetVisualViewport());
-
-  if (!RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
-    const FrameTree& tree = frame_view->GetPage()->MainFrame()->Tree();
-    for (const Frame* child = tree.FirstChild(); child;
-         child = child->Tree().NextSibling()) {
-      if (!child->IsLocalFrame())
-        continue;
-      LocalFrameView* frame_view = ToLocalFrame(child)->View();
-      if (!frame_view || frame_view->ShouldThrottleRendering())
-        continue;
-      if (cc::Layer* scroll_layer =
-              GraphicsLayerToCcLayer(frame_view->LayerForScrolling())) {
-        scroll_layer->SetBounds(
-            static_cast<gfx::Size>(frame_view->ContentsSize()));
-      }
-    }
-  }
 }
 
 static void ClearPositionConstraintExceptForLayer(GraphicsLayer* layer,
@@ -563,8 +537,7 @@ bool ScrollingCoordinator::ScrollableAreaScrollLayerDidChange(
 
   // Update the viewport layer registration if the outer viewport may have
   // changed.
-  if (RuntimeEnabledFeatures::RootLayerScrollingEnabled() &&
-      IsForRootLayer(scrollable_area))
+  if (IsForRootLayer(scrollable_area))
     page_->GetChromeClient().RegisterViewportLayers();
 
   CompositorAnimationTimeline* timeline;
@@ -794,9 +767,6 @@ void ScrollingCoordinator::Reset(LocalFrame* frame) {
   vertical_scrollbars_.clear();
   frame->View()->GetScrollingContext()->GetLayersWithTouchRects()->clear();
   frame->View()->ClearFrameIsScrollableDidChange();
-
-  if (!RuntimeEnabledFeatures::RootLayerScrollingEnabled())
-    SetShouldUpdateScrollLayerPositionOnMainThread(frame, 0);
 }
 
 // Note that in principle this could be called more often than

third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.cc

@@ -123,16 +123,9 @@ void SetNeedsCompositingUpdateOnAncestors(Element* element) {
       continue;
 
     LayoutView* layout_view = ToLocalFrame(frame)->View()->GetLayoutView();
-    if (RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
-      PaintLayer* frame_root_layer = layout_view->Layer();
-      DCHECK(frame_root_layer);
-      frame_root_layer->SetNeedsCompositingInputsUpdate();
-    } else {
-      if (PaintLayerCompositor* plc = layout_view->Compositor()) {
-        plc->SetNeedsCompositingUpdate(
-            kCompositingUpdateAfterCompositingInputChange);
-      }
-    }
+    PaintLayer* frame_root_layer = layout_view->Layer();
+    DCHECK(frame_root_layer);
+    frame_root_layer->SetNeedsCompositingInputsUpdate();
   }
 }
 

third_party/blink/renderer/core/page/spatial_navigation.cc

@@ -416,12 +416,6 @@ LayoutRect NodeRectInRootFrame(const Node* node, bool ignore_border) {
   DCHECK(node->GetLayoutObject());
   DCHECK(!node->GetDocument().View()->NeedsLayout());
 
-  if (node->IsDocumentNode() &&
-      !RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
-    LocalFrameView* view = ToDocument(node)->GetFrame()->View();
-    return LayoutRect(view->ContentsToRootFrame(
-        view->LayoutViewportScrollableArea()->VisibleContentRect()));
-  }
   LayoutRect rect = node->GetDocument().GetFrame()->View()->AbsoluteToRootFrame(
       node->BoundingBox());