Remove more stuff from Widget.

sky/engine/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 63 matching lines @@
 
 // MakePlatformMouseEvent -----------------------------------------------------
 
 PlatformMouseEventBuilder::PlatformMouseEventBuilder(Widget* widget, const WebMouseEvent& e)
 {
     float scale = widgetInputEventsScaleFactor(widget);
     IntSize offset = widgetInputEventsOffset(widget);
 
     // FIXME: Widget is always toplevel, unless it's a popup. We may be able
     // to get rid of this once we abstract popups into a WebKit API.
-    m_position = widget->convertFromContainingWindow(
+    m_position = widget->convertFromContainingView(
         IntPoint((e.x - offset.width()) / scale, (e.y - offset.height()) / scale));
     m_globalPosition = IntPoint(e.globalX, e.globalY);
     m_movementDelta = IntPoint(e.movementX / scale, e.movementY / scale);
     m_button = static_cast<MouseButton>(e.button);
 
     m_modifiers = 0;
     if (e.modifiers & WebInputEvent::ShiftKey)
         m_modifiers |= PlatformEvent::ShiftKey;
     if (e.modifiers & WebInputEvent::ControlKey)
         m_modifiers |= PlatformEvent::CtrlKey;
@@ skipping 25 matching lines @@
     }
 }
 
 // PlatformWheelEventBuilder --------------------------------------------------
 
 PlatformWheelEventBuilder::PlatformWheelEventBuilder(Widget* widget, const WebMouseWheelEvent& e)
 {
     float scale = widgetInputEventsScaleFactor(widget);
     IntSize offset = widgetInputEventsOffset(widget);
 
-    m_position = widget->convertFromContainingWindow(
+    m_position = widget->convertFromContainingView(
         IntPoint((e.x - offset.width()) / scale, (e.y - offset.height()) / scale));
     m_globalPosition = IntPoint(e.globalX, e.globalY);
     m_deltaX = e.deltaX;
     m_deltaY = e.deltaY;
     m_wheelTicksX = e.wheelTicksX;
     m_wheelTicksY = e.wheelTicksY;
     m_granularity = e.scrollByPage ?
         ScrollByPageWheelEvent : ScrollByPixelWheelEvent;
 
     m_type = PlatformEvent::Wheel;
@@ skipping 97 matching lines @@
     case WebInputEvent::GesturePinchEnd:
         m_type = PlatformEvent::GesturePinchEnd;
         break;
     case WebInputEvent::GesturePinchUpdate:
         m_type = PlatformEvent::GesturePinchUpdate;
         m_data.m_pinchUpdate.m_scale = e.data.pinchUpdate.scale;
         break;
     default:
         ASSERT_NOT_REACHED();
     }
-    m_position = widget->convertFromContainingWindow(
+    m_position = widget->convertFromContainingView(
         IntPoint((e.x - offset.width()) / scale, (e.y - offset.height()) / scale));
     m_globalPosition = IntPoint(e.globalX, e.globalY);
     m_timestamp = e.timeStampSeconds;
 
     m_modifiers = 0;
     if (e.modifiers & WebInputEvent::ShiftKey)
         m_modifiers |= PlatformEvent::ShiftKey;
     if (e.modifiers & WebInputEvent::ControlKey)
         m_modifiers |= PlatformEvent::CtrlKey;
     if (e.modifiers & WebInputEvent::AltKey)
@@ skipping 146 matching lines @@
 }
 
 PlatformTouchPointBuilder::PlatformTouchPointBuilder(Widget* widget, const WebTouchPoint& point)
 {
     float scale = 1.0f / widgetInputEventsScaleFactor(widget);
     IntSize offset = widgetInputEventsOffset(widget);
     m_id = point.id;
     m_state = toPlatformTouchPointState(point.state);
     FloatPoint pos = (point.position - offset).scaledBy(scale);
     IntPoint flooredPoint = flooredIntPoint(pos);
-    // This assumes convertFromContainingWindow does only translations, not scales.
-    m_pos = widget->convertFromContainingWindow(flooredPoint) + (pos - flooredPoint);
+    // This assumes convertFromContainingView does only translations, not scales.
+    m_pos = widget->convertFromContainingView(flooredPoint) + (pos - flooredPoint);
     m_screenPos = FloatPoint(point.screenPosition.x, point.screenPosition.y);
     m_radius = FloatSize(point.radiusX, point.radiusY).scaledBy(scale);
     m_rotationAngle = point.rotationAngle;
     m_force = point.force;
 }
 
 PlatformTouchEventBuilder::PlatformTouchEventBuilder(Widget* widget, const WebTouchEvent& event)
 {
     m_type = toPlatformTouchEventType(event.type);
 
@@ skipping 37 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);
 
-    FrameView* view = toFrameView(widget.parent());
     IntPoint windowPoint = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y());
-    if (view)
-        windowPoint = view->contentsToWindow(windowPoint);
+    windowPoint = widget.convertToContainingView(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();
 }
 
 WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const RenderObject* renderObject, const MouseEvent& event)
@@ skipping 64 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.
-    FrameView* view = toFrameView(widget->parent());
     IntPoint windowPoint = roundedIntPoint(touch->absoluteLocation());
-    if (view)
-        windowPoint = view->contentsToWindow(windowPoint);
+    windowPoint = widget->convertToContainingView(windowPoint);
     IntPoint screenPoint = roundedIntPoint(touch->screenLocation());
     globalX = screenPoint.x();
     globalY = screenPoint.y();
     windowX = windowPoint.x();
     windowY = windowPoint.y();
 
     button = WebMouseEvent::ButtonLeft;
     modifiers |= WebInputEvent::LeftButtonDown;
     clickCount = (type == MouseDown || type == MouseUp);
 
@@ skipping 25 matching lines @@
         modifiers |= ShiftKey;
     if (event.modifiers() & PlatformEvent::CtrlKey)
         modifiers |= ControlKey;
     if (event.modifiers() & PlatformEvent::AltKey)
         modifiers |= AltKey;
     if (event.modifiers() & PlatformEvent::MetaKey)
         modifiers |= MetaKey;
 
     timeStampSeconds = event.timestamp();
 
-    // FIXME: Widget is always toplevel, unless it's a popup. We may be able
-    // to get rid of this once we abstract popups into a WebKit API.
-    IntPoint position = widget->convertToContainingWindow(event.position());
+    IntPoint position = event.position();
     float scale = widgetInputEventsScaleFactor(widget);
     position.scale(scale, scale);
     x = position.x();
     y = position.y();
     globalX = event.globalPosition().x();
     globalY = event.globalPosition().y();
     movementX = event.movementDelta().x() * scale;
     movementY = event.movementDelta().y() * scale;
 
     button = static_cast<Button>(event.button());
@@ skipping 166 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