Deleted Widget/FrameViewBase

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

 /*
  * Copyright (C) 2011 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
@@ skipping 142 matching lines @@
   return true;
 }
 
 ScrollbarPart ScrollbarTheme::HitTest(const ScrollbarThemeClient& scrollbar,
                                       const IntPoint& position_in_root_frame) {
   ScrollbarPart result = kNoPart;
   if (!scrollbar.Enabled())
     return result;
 
   IntPoint test_position =
-      scrollbar.ConvertFromRootFrame(position_in_root_frame);
+      scrollbar.ConvertPointFromRootFrame(position_in_root_frame);
   test_position.Move(scrollbar.X(), scrollbar.Y());
 
   if (!scrollbar.FrameRect().Contains(test_position))
     return kNoPart;
 
   result = kScrollbarBGPart;
 
   IntRect track = TrackRect(scrollbar);
   if (track.Contains(test_position)) {
     IntRect before_thumb_rect;
@@ skipping 94 matching lines @@
     FloatRect tick_stroke(rect.X() + TickmarkBorderWidth(), y_pos + 1,
                           rect.Width() - 2 * TickmarkBorderWidth(), 1);
     context.FillRect(tick_stroke, Color(0xFF, 0xDD, 0x00, 0xFF));
   }
 #endif
 }
 
 bool ScrollbarTheme::ShouldSnapBackToDragOrigin(
     const ScrollbarThemeClient& scrollbar,
     const WebMouseEvent& evt) {
-  IntPoint mouse_position = scrollbar.ConvertFromRootFrame(
+  IntPoint mouse_position = scrollbar.ConvertPointFromRootFrame(
       FlooredIntPoint(evt.PositionInRootFrame()));
   mouse_position.Move(scrollbar.X(), scrollbar.Y());
   return Platform::Current()->ScrollbarBehavior()->ShouldSnapBackToDragOrigin(
       mouse_position, TrackRect(scrollbar),
       scrollbar.Orientation() == kHorizontalScrollbar);
 }
 
 double ScrollbarTheme::OverlayScrollbarFadeOutDelaySeconds() const {
   // On Mac, fading is controlled by the painting code in ScrollAnimatorMac.
   return 0.0;
@@ skipping 149 matching lines @@
       return DisplayItem::kScrollbarBackTrack;
     case kForwardTrackPart:
       return DisplayItem::kScrollbarForwardTrack;
     default:
       ASSERT_NOT_REACHED();
       return DisplayItem::kScrollbarBackTrack;
   }
 }
 
 }  // namespace blink