Remove FrameViewBase as base class of RemoteFrameView.

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/ScrollbarTheme.h"
 #include "public/platform/WebGestureEvent.h"
 #include "public/platform/WebMouseEvent.h"
 
 namespace blink {
@@ skipping 532 matching lines @@
 
 bool Scrollbar::IsWindowActive() const {
   return scrollable_area_ && scrollable_area_->IsActive();
 }
 
 IntPoint Scrollbar::ConvertFromRootFrame(
     const IntPoint& point_in_root_frame) const {
   if (const FrameViewBase* parent = Parent()) {
     IntPoint parent_point = parent->ConvertFromRootFrame(point_in_root_frame);
     if (scrollable_area_) {
-      return scrollable_area_->ConvertFromContainingFrameViewBaseToScrollbar(
+      return scrollable_area_->ConvertFromContainingFrameViewToScrollbar(
           *this, parent_point);
     }
   }
 
   return point_in_root_frame;
 }
 
-IntRect Scrollbar::ConvertToContainingFrameViewBase(
+IntRect Scrollbar::ConvertToContainingFrameView(
     const IntRect& local_rect) const {
   if (scrollable_area_) {
-    return scrollable_area_->ConvertFromScrollbarToContainingFrameViewBase(
+    return scrollable_area_->ConvertFromScrollbarToContainingFrameView(
         *this, local_rect);
   }
 
   return local_rect;
 }
 
-IntPoint Scrollbar::ConvertFromContainingFrameViewBase(
+IntPoint Scrollbar::ConvertFromContainingFrameView(
     const IntPoint& parent_point) const {
   if (scrollable_area_) {
-    return scrollable_area_->ConvertFromContainingFrameViewBaseToScrollbar(
+    return scrollable_area_->ConvertFromContainingFrameViewToScrollbar(
         *this, parent_point);
   }
 
   return parent_point;
 }
 
 float Scrollbar::ScrollableAreaCurrentPos() const {
   if (!scrollable_area_)
     return 0;
 
@@ skipping 24 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