Merge FrameView and ScrollView.

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 27 matching lines @@
 #include "core/events/MouseEvent.h"
 #include "core/events/TouchEvent.h"
 #include "core/events/WheelEvent.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/PinchViewport.h"
 #include "core/page/Page.h"
 #include "core/rendering/RenderObject.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/Widget.h"
-#include "platform/scroll/ScrollView.h"
 
 namespace blink {
 
 static const double millisPerSecond = 1000.0;
 
 static float widgetInputEventsScaleFactor(const Widget* widget)
 {
     if (!widget)
         return 1;
 
-    ScrollView* rootView =  toScrollView(widget->root());
+    FrameView* rootView =  toFrameView(widget->root());
     if (!rootView)
         return 1;
 
     return rootView->inputEventsScaleFactor();
 }
 
 static IntSize widgetInputEventsOffset(const Widget* widget)
 {
     if (!widget)
         return IntSize();
-    ScrollView* rootView =  toScrollView(widget->root());
+    FrameView* rootView =  toFrameView(widget->root());
     if (!rootView)
         return IntSize();
 
     return rootView->inputEventsOffsetForEmulation();
 }
 
 static IntPoint pinchViewportOffset(const Widget* widget)
 {
     // Event position needs to be adjusted by the pinch viewport's offset within the
     // main frame before being passed into the widget's convertFromContainingWindow.
@@ skipping 401 matching lines @@
 static IntPoint convertAbsoluteLocationForRenderObject(const LayoutPoint& location, const RenderObject& renderObject)
 {
     return roundedIntPoint(convertAbsoluteLocationForRenderObjectFloat(location, renderObject));
 }
 
 static void updateWebMouseEventFromCoreMouseEvent(const MouseRelatedEvent& event, const Widget& widget, const RenderObject& renderObject, WebMouseEvent& webEvent)
 {
     webEvent.timeStampSeconds = event.timeStamp() / millisPerSecond;
     webEvent.modifiers = getWebInputModifiers(event);
 
-    ScrollView* view =  toScrollView(widget.parent());
+    FrameView* view =  toFrameView(widget.parent());
     IntPoint windowPoint = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y());
     if (view)
         windowPoint = view->contentsToWindow(windowPoint);
     webEvent.globalX = event.screenX();
     webEvent.globalY = event.screenY();
     webEvent.windowX = windowPoint.x();
     webEvent.windowY = windowPoint.y();
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), renderObject);
     webEvent.x = localPoint.x();
     webEvent.y = localPoint.y();
@@ skipping 69 matching lines @@
         type = MouseMove;
     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.
-    ScrollView* view =  toScrollView(widget->parent());
+    FrameView* view =  toFrameView(widget->parent());
     IntPoint windowPoint = roundedIntPoint(touch->absoluteLocation());
     if (view)
         windowPoint = view->contentsToWindow(windowPoint);
     IntPoint screenPoint = roundedIntPoint(touch->screenLocation());
     globalX = screenPoint.x();
     globalY = screenPoint.y();
     windowX = windowPoint.x();
     windowY = windowPoint.y();
 
     button = WebMouseEvent::ButtonLeft;
@@ skipping 235 matching lines @@
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), *renderObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink