Clean up some remaining obsolete coordinate-space naming.

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 112 matching lines @@
         paintTickmarks(graphicsContext, scrollbar, trackPaintRect);
     }
 
     // Paint the thumb.
     if (scrollMask & ThumbPart)
         paintThumb(graphicsContext, scrollbar, thumbRect);
 
     return true;
 }
 
-ScrollbarPart ScrollbarTheme::hitTest(const ScrollbarThemeClient* scrollbar, const IntPoint& position)
+ScrollbarPart ScrollbarTheme::hitTest(const ScrollbarThemeClient* scrollbar, const IntPoint& positionInRootFrame)
 {
     ScrollbarPart result = NoPart;
     if (!scrollbar->enabled())
         return result;
 
-    IntPoint testPosition = scrollbar->convertFromContainingWindow(position);
+    IntPoint testPosition = scrollbar->convertFromRootFrame(positionInRootFrame);
     testPosition.move(scrollbar->x(), scrollbar->y());
 
     if (!scrollbar->frameRect().contains(testPosition))
         return NoPart;
 
     result = ScrollbarBGPart;
 
     IntRect track = trackRect(scrollbar);
     if (track.contains(testPosition)) {
         IntRect beforeThumbRect;
@@ skipping 36 matching lines @@
 #endif
 }
 
 bool ScrollbarTheme::shouldCenterOnThumb(const ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& evt)
 {
     return Platform::current()->scrollbarBehavior()->shouldCenterOnThumb(static_cast<WebScrollbarBehavior::Button>(evt.button()), evt.shiftKey(), evt.altKey());
 }
 
 bool ScrollbarTheme::shouldSnapBackToDragOrigin(const ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& evt)
 {
-    IntPoint mousePosition = scrollbar->convertFromContainingWindow(evt.position());
+    IntPoint mousePosition = scrollbar->convertFromRootFrame(evt.position());
     mousePosition.move(scrollbar->x(), scrollbar->y());
     return Platform::current()->scrollbarBehavior()->shouldSnapBackToDragOrigin(mousePosition, trackRect(scrollbar), scrollbar->orientation() == HorizontalScrollbar);
 }
 
 int ScrollbarTheme::thumbPosition(const ScrollbarThemeClient* scrollbar)
 {
     if (scrollbar->enabled()) {
         float size = scrollbar->totalSize() - scrollbar->visibleSize();
         // Avoid doing a floating point divide by zero and return 1 when usedTotalSize == visibleSize.
         if (!size)
@@ skipping 125 matching lines @@
         return DisplayItem::ScrollbarBackTrack;
     case ForwardTrackPart:
         return DisplayItem::ScrollbarForwardTrack;
     default:
         ASSERT_NOT_REACHED();
         return DisplayItem::ScrollbarBackTrack;
     }
 }
 
 } // namespace blink