Deleted Widget/FrameViewBase

third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/scroll/Scrollbar.h"
 
 #include <algorithm>
-#include "platform/FrameViewBase.h"
 #include "platform/PlatformChromeClient.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/scroll/ScrollAnimatorBase.h"
 #include "platform/scroll/ScrollableArea.h"
+#include "platform/scroll/ScrollbarParent.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "public/platform/WebGestureEvent.h"
 #include "public/platform/WebMouseEvent.h"
 
 namespace blink {
 
 Scrollbar::Scrollbar(ScrollableArea* scrollable_area,
                      ScrollbarOrientation orientation,
                      ScrollbarControlSize control_size,
                      PlatformChromeClient* chrome_client,
@@ skipping 285 matching lines @@
 }
 
 bool Scrollbar::GestureEvent(const WebGestureEvent& evt,
                              bool* should_update_capture) {
   DCHECK(should_update_capture);
   switch (evt.GetType()) {
     case WebInputEvent::kGestureTapDown: {
       IntPoint position = FlooredIntPoint(evt.PositionInRootFrame());
       SetPressedPart(GetTheme().HitTest(*this, position));
       pressed_pos_ = Orientation() == kHorizontalScrollbar
-                         ? ConvertFromRootFrame(position).X()
-                         : ConvertFromRootFrame(position).Y();
+                         ? ConvertPointFromRootFrame(position).X()
+                         : ConvertPointFromRootFrame(position).Y();
       *should_update_capture = true;
       return true;
     }
     case WebInputEvent::kGestureTapCancel:
       if (pressed_part_ != kThumbPart)
         return false;
       scroll_pos_ = pressed_pos_;
       return true;
     case WebInputEvent::kGestureScrollBegin:
       switch (evt.source_device) {
@@ skipping 74 matching lines @@
   if (pressed_part_ == kThumbPart) {
     if (GetTheme().ShouldSnapBackToDragOrigin(*this, evt)) {
       if (scrollable_area_) {
         scrollable_area_->SetScrollOffsetSingleAxis(
             orientation_,
             drag_origin_ + scrollable_area_->MinimumScrollOffset(orientation_),
             kUserScroll);
       }
     } else {
       MoveThumb(orientation_ == kHorizontalScrollbar
-                    ? ConvertFromRootFrame(position).X()
-                    : ConvertFromRootFrame(position).Y(),
+                    ? ConvertPointFromRootFrame(position).X()
+                    : ConvertPointFromRootFrame(position).Y(),
                 GetTheme().ShouldDragDocumentInsteadOfThumb(*this, evt));
     }
     return;
   }
 
   if (pressed_part_ != kNoPart) {
     pressed_pos_ = Orientation() == kHorizontalScrollbar
-                       ? ConvertFromRootFrame(position).X()
-                       : ConvertFromRootFrame(position).Y();
+                       ? ConvertPointFromRootFrame(position).X()
+                       : ConvertPointFromRootFrame(position).Y();
   }
 
   ScrollbarPart part = GetTheme().HitTest(*this, position);
   if (part != hovered_part_) {
     if (pressed_part_ != kNoPart) {
       if (part == pressed_part_) {
         // The mouse is moving back over the pressed part.  We
         // need to start up the timer action again.
         StartTimerIfNeeded(GetTheme().AutoscrollTimerDelay());
       } else if (hovered_part_ == pressed_part_) {
@@ skipping 41 matching lines @@
 }
 
 void Scrollbar::MouseDown(const WebMouseEvent& evt) {
   // Early exit for right click
   if (evt.button == WebPointerProperties::Button::kRight)
     return;
 
   IntPoint position = FlooredIntPoint(evt.PositionInRootFrame());
   SetPressedPart(GetTheme().HitTest(*this, position));
   int pressed_pos = Orientation() == kHorizontalScrollbar
-                        ? ConvertFromRootFrame(position).X()
-                        : ConvertFromRootFrame(position).Y();
+                        ? ConvertPointFromRootFrame(position).X()
+                        : ConvertPointFromRootFrame(position).Y();
 
   if ((pressed_part_ == kBackTrackPart || pressed_part_ == kForwardTrackPart) &&
       GetTheme().ShouldCenterOnThumb(*this, evt)) {
     SetHoveredPart(kThumbPart);
     SetPressedPart(kThumbPart);
     drag_origin_ = current_pos_;
     int thumb_len = GetTheme().ThumbLength(*this);
     int desired_pos = pressed_pos;
     // Set the pressed position to the middle of the thumb so that when we do
     // the move, the delta will be from the current pixel position of the thumb
@@ skipping 47 matching lines @@
   // Non-overlay scrollbars should always participate in hit testing.
   if (!IsOverlayScrollbar())
     return true;
   return !scrollable_area_->ScrollbarsHidden();
 }
 
 bool Scrollbar::IsWindowActive() const {
   return scrollable_area_ && scrollable_area_->IsActive();
 }
 
-IntPoint Scrollbar::ConvertFromRootFrame(
+IntPoint Scrollbar::ConvertPointFromRootFrame(
     const IntPoint& point_in_root_frame) const {
-  if (const FrameViewBase* parent = Parent()) {
-    IntPoint parent_point = parent->ConvertFromRootFrame(point_in_root_frame);
+  if (const ScrollbarParent* parent = Parent()) {
+    IntPoint parent_point =
+        parent->ConvertPointFromRootFrame(point_in_root_frame);
     if (scrollable_area_) {
       return scrollable_area_->ConvertFromContainingFrameViewToScrollbar(
           *this, parent_point);
     }
   }
 
   return point_in_root_frame;
 }
 
 IntRect Scrollbar::ConvertToContainingFrameView(
@@ skipping 47 matching lines @@
     invalid_parts = kAllParts;
   if (invalid_parts & ~kThumbPart)
     track_needs_repaint_ = true;
   if (invalid_parts & kThumbPart)
     thumb_needs_repaint_ = true;
   if (scrollable_area_)
     scrollable_area_->SetScrollbarNeedsPaintInvalidation(Orientation());
 }
 
 }  // namespace blink