Deleted Widget/FrameViewBase

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 338 matching lines @@
   if (!view)
     return parent_point;
 
   IntPoint point = view->GetFrameView()->ConvertToLayoutItem(
       LayoutBoxItem(&Box()), parent_point);
 
   point.Move(-ScrollbarOffset(scrollbar));
   return point;
 }
 
+IntPoint PaintLayerScrollableArea::ConvertFromRootFrame(
+    const IntPoint& point_in_root_frame) const {
+  LayoutView* view = Box().View();
+  if (!view)
+    return point_in_root_frame;
+
+  return view->GetFrameView()->ConvertFromRootFrame(point_in_root_frame);
+}
+
 int PaintLayerScrollableArea::ScrollSize(
     ScrollbarOrientation orientation) const {
   IntSize scroll_dimensions =
       MaximumScrollOffsetInt() - MinimumScrollOffsetInt();
   return (orientation == kHorizontalScrollbar) ? scroll_dimensions.Width()
                                                : scroll_dimensions.Height();
 }
 
 void PaintLayerScrollableArea::UpdateScrollOffset(
     const ScrollOffset& new_offset,
@@ skipping 1666 matching lines @@
   } else {
     ScrollbarControlSize scrollbar_size = kRegularScrollbar;
     if (style_source.StyleRef().HasAppearance()) {
       scrollbar_size = LayoutTheme::GetTheme().ScrollbarControlSizeForPart(
           style_source.StyleRef().Appearance());
     }
     scrollbar = Scrollbar::Create(
         ScrollableArea(), orientation, scrollbar_size,
         &ScrollableArea()->Box().GetFrame()->GetPage()->GetChromeClient());
   }
-  ScrollableArea()->Box().GetDocument().View()->AddScrollbar(scrollbar);
+  ScrollableArea()->Box().GetDocument().View()->AddPaintScrollbar(scrollbar);
   return scrollbar;
 }
 
 void PaintLayerScrollableArea::ScrollbarManager::DestroyScrollbar(
     ScrollbarOrientation orientation) {
   Member<Scrollbar>& scrollbar =
       orientation == kHorizontalScrollbar ? h_bar_ : v_bar_;
   DCHECK(orientation == kHorizontalScrollbar ? !h_bar_is_attached_
                                              : !v_bar_is_attached_);
   if (!scrollbar)
     return;
 
   ScrollableArea()->SetScrollbarNeedsPaintInvalidation(orientation);
   if (orientation == kHorizontalScrollbar)
     ScrollableArea()->rebuild_horizontal_scrollbar_layer_ = true;
   else
     ScrollableArea()->rebuild_vertical_scrollbar_layer_ = true;
 
   if (!scrollbar->IsCustomScrollbar())
     ScrollableArea()->WillRemoveScrollbar(*scrollbar, orientation);
 
-  ScrollableArea()->Box().GetDocument().View()->RemoveScrollbar(scrollbar);
+  ScrollableArea()->Box().GetDocument().View()->RemovePaintScrollbar(scrollbar);
   scrollbar->DisconnectFromScrollableArea();
   scrollbar = nullptr;
 }
 
 uint64_t PaintLayerScrollableArea::Id() const {
   return DOMNodeIds::IdForNode(Box().GetNode());
 }
 
 int PaintLayerScrollableArea::PreventRelayoutScope::count_ = 0;
 SubtreeLayoutScope*
@@ skipping 97 matching lines @@
 
 void PaintLayerScrollableArea::DelayScrollOffsetClampScope::
     ClampScrollableAreas() {
   for (auto& scrollable_area : *needs_clamp_)
     scrollable_area->ClampScrollOffsetAfterOverflowChange();
   delete needs_clamp_;
   needs_clamp_ = nullptr;
 }
 
 }  // namespace blink