Removed FrameView's windowToContents and contentsToWindow methods.

Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 469 matching lines @@
 }
 
 // FIXME: Change |widget| to const Widget& after RemoteFrames get
 // RemoteFrameViews.
 static void updateWebMouseEventFromCoreMouseEvent(const MouseRelatedEvent& event, const Widget* widget, const LayoutObject& layoutObject, WebMouseEvent& webEvent)
 {
     webEvent.timeStampSeconds = event.timeStamp() / millisPerSecond;
     webEvent.modifiers = getWebInputModifiers(event);
 
     FrameView* view = widget ? toFrameView(widget->parent()) : 0;
-    IntPoint windowPoint = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y());
+    // FIXME: If view == nullptr, pointInRootFrame will really be pointInRootContent.
+    IntPoint pointInRootFrame = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y());
     if (view)
-        windowPoint = view->contentsToWindow(windowPoint);
+        pointInRootFrame = view->contentsToRootFrame(pointInRootFrame);
     webEvent.globalX = event.screenX();
     webEvent.globalY = event.screenY();
-    webEvent.windowX = windowPoint.x();
-    webEvent.windowY = windowPoint.y();
+    webEvent.windowX = pointInRootFrame.x();
+    webEvent.windowY = pointInRootFrame.y();
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteLocation(), layoutObject);
     webEvent.x = localPoint.x();
     webEvent.y = localPoint.y();
 }
 
 WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const LayoutObject* layoutObject, const MouseEvent& event)
 {
     if (event.type() == EventTypeNames::mousemove)
         type = WebInputEvent::MouseMove;
     else if (event.type() == EventTypeNames::mouseout)
@@ skipping 63 matching lines @@
     else if (event.type() == EventTypeNames::touchend)
         type = MouseUp;
     else
         return;
 
     timeStampSeconds = event.timeStamp() / millisPerSecond;
     modifiers = getWebInputModifiers(event);
 
     // The mouse event co-ordinates should be generated from the co-ordinates of the touch point.
     FrameView* view =  toFrameView(widget->parent());
-    IntPoint windowPoint = roundedIntPoint(touch->absoluteLocation());
+    // FIXME: if view == nullptr, pointInRootFrame will really be pointInRootContent.
+    IntPoint pointInRootFrame = roundedIntPoint(touch->absoluteLocation());
     if (view)
-        windowPoint = view->contentsToWindow(windowPoint);
+        pointInRootFrame = view->contentsToRootFrame(pointInRootFrame);
     IntPoint screenPoint = roundedIntPoint(touch->screenLocation());
     globalX = screenPoint.x();
     globalY = screenPoint.y();
-    windowX = windowPoint.x();
-    windowY = windowPoint.y();
+    windowX = pointInRootFrame.x();
+    windowY = pointInRootFrame.y();
 
     button = WebMouseEvent::ButtonLeft;
     modifiers |= WebInputEvent::LeftButtonDown;
     clickCount = (type == MouseDown || type == MouseUp);
 
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(touch->absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
@@ skipping 213 matching lines @@
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink