Move rendering/RenderObject to layout/LayoutObject.

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 23 matching lines @@
 #include "core/dom/Touch.h"
 #include "core/dom/TouchList.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #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/layout/LayoutObject.h"
 #include "core/page/Page.h"
-#include "core/rendering/RenderObject.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/Widget.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 static const double millisPerSecond = 1000.0;
 
 static float scaleDeltaToWindow(const Widget* widget, float delta)
 {
@@ skipping 404 matching lines @@
         modifiers |= WebInputEvent::ControlKey;
     if (event.shiftKey())
         modifiers |= WebInputEvent::ShiftKey;
     if (event.altKey())
         modifiers |= WebInputEvent::AltKey;
     if (event.metaKey())
         modifiers |= WebInputEvent::MetaKey;
     return modifiers;
 }
 
-static FloatPoint convertAbsoluteLocationForRenderObjectFloat(const LayoutPoint& location, const RenderObject& renderObject)
+static FloatPoint convertAbsoluteLocationForLayoutObjectFloat(const LayoutPoint& location, const LayoutObject& layoutObject)
 {
-    return renderObject.absoluteToLocal(FloatPoint(location), UseTransforms);
+    return layoutObject.absoluteToLocal(FloatPoint(location), UseTransforms);
 }
 
-static IntPoint convertAbsoluteLocationForRenderObject(const LayoutPoint& location, const RenderObject& renderObject)
+static IntPoint convertAbsoluteLocationForLayoutObject(const LayoutPoint& location, const LayoutObject& layoutObject)
 {
-    return roundedIntPoint(convertAbsoluteLocationForRenderObjectFloat(location, renderObject));
+    return roundedIntPoint(convertAbsoluteLocationForLayoutObjectFloat(location, layoutObject));
 }
 
 // FIXME: Change |widget| to const Widget& after RemoteFrames get
 // RemoteFrameViews.
-static void updateWebMouseEventFromCoreMouseEvent(const MouseRelatedEvent& event, const Widget* widget, const RenderObject& renderObject, WebMouseEvent& webEvent)
+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());
     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);
+    IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteLocation(), layoutObject);
     webEvent.x = localPoint.x();
     webEvent.y = localPoint.y();
 }
 
-WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const RenderObject* renderObject, const MouseEvent& event)
+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)
         type = WebInputEvent::MouseLeave;
     else if (event.type() == EventTypeNames::mouseover)
         type = WebInputEvent::MouseEnter;
     else if (event.type() == EventTypeNames::mousedown)
         type = WebInputEvent::MouseDown;
     else if (event.type() == EventTypeNames::mouseup)
         type = WebInputEvent::MouseUp;
     else if (event.type() == EventTypeNames::contextmenu)
         type = WebInputEvent::ContextMenu;
     else
         return; // Skip all other mouse events.
 
-    updateWebMouseEventFromCoreMouseEvent(event, widget, *renderObject, *this);
+    updateWebMouseEventFromCoreMouseEvent(event, widget, *layoutObject, *this);
 
     switch (event.button()) {
     case LeftButton:
         button = WebMouseEvent::ButtonLeft;
         break;
     case MiddleButton:
         button = WebMouseEvent::ButtonMiddle;
         break;
     case RightButton:
         button = WebMouseEvent::ButtonRight;
@@ skipping 13 matching lines @@
         }
     } else
         button = WebMouseEvent::ButtonNone;
     movementX = event.movementX();
     movementY = event.movementY();
     clickCount = event.detail();
 }
 
 // Generate a synthetic WebMouseEvent given a TouchEvent (eg. for emulating a mouse
 // with touch input for plugins that don't support touch input).
-WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const RenderObject* renderObject, const TouchEvent& event)
+WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const LayoutObject* layoutObject, const TouchEvent& event)
 {
     if (!event.touches())
         return;
     if (event.touches()->length() != 1) {
         if (event.touches()->length() || event.type() != EventTypeNames::touchend || !event.changedTouches() || event.changedTouches()->length() != 1)
             return;
     }
 
     const Touch* touch = event.touches()->length() == 1 ? event.touches()->item(0) : event.changedTouches()->item(0);
     if (touch->identifier())
@@ skipping 19 matching lines @@
     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);
 
-    IntPoint localPoint = convertAbsoluteLocationForRenderObject(touch->absoluteLocation(), *renderObject);
+    IntPoint localPoint = convertAbsoluteLocationForLayoutObject(touch->absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const PlatformMouseEvent& event)
 {
     switch (event.type()) {
     case PlatformEvent::MouseMoved:
         type = MouseMove;
         break;
@@ skipping 26 matching lines @@
     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());
     clickCount = event.clickCount();
 }
 
-WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const RenderObject* renderObject, const WheelEvent& event)
+WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const LayoutObject* layoutObject, const WheelEvent& event)
 {
     if (event.type() != EventTypeNames::wheel && event.type() != EventTypeNames::mousewheel)
         return;
     type = WebInputEvent::MouseWheel;
-    updateWebMouseEventFromCoreMouseEvent(event, widget, *renderObject, *this);
+    updateWebMouseEventFromCoreMouseEvent(event, widget, *layoutObject, *this);
     deltaX = -event.deltaX();
     deltaY = -event.deltaY();
     wheelTicksX = event.ticksX();
     wheelTicksY = event.ticksY();
     scrollByPage = event.deltaMode() == WheelEvent::DOM_DELTA_PAGE;
     canScroll = event.canScroll();
 }
 
 WebKeyboardEventBuilder::WebKeyboardEventBuilder(const KeyboardEvent& event)
 {
@@ skipping 60 matching lines @@
     domCode = Platform::current()->domEnumFromCodeString(event.code());
 
     windowsKeyCode = windowsKeyCodeWithoutLocation(event.windowsVirtualKeyCode());
     modifiers |= locationModifiersFromWindowsKeyCode(event.windowsVirtualKeyCode());
 
     event.text().copyTo(text, 0, textLengthCap);
     event.unmodifiedText().copyTo(unmodifiedText, 0, textLengthCap);
     memcpy(keyIdentifier, event.keyIdentifier().ascii().data(), std::min(static_cast<unsigned>(keyIdentifierLengthCap), event.keyIdentifier().length()));
 }
 
-static WebTouchPoint toWebTouchPoint(const Touch* touch, const RenderObject* renderObject, WebTouchPoint::State state)
+static WebTouchPoint toWebTouchPoint(const Touch* touch, const LayoutObject* layoutObject, WebTouchPoint::State state)
 {
     WebTouchPoint point;
     point.id = touch->identifier();
     point.screenPosition = touch->screenLocation();
-    point.position = convertAbsoluteLocationForRenderObjectFloat(touch->absoluteLocation(), *renderObject);
+    point.position = convertAbsoluteLocationForLayoutObjectFloat(touch->absoluteLocation(), *layoutObject);
     point.radiusX = touch->radiusX();
     point.radiusY = touch->radiusY();
     point.rotationAngle = touch->webkitRotationAngle();
     point.force = touch->force();
     point.state = state;
     return point;
 }
 
 static bool hasTouchPointWithId(const WebTouchPoint* touchPoints, unsigned touchPointsLength, unsigned id)
 {
     for (unsigned i = 0; i < touchPointsLength; ++i) {
         if (touchPoints[i].id == static_cast<int>(id))
             return true;
     }
     return false;
 }
 
-static void addTouchPointsIfNotYetAdded(const Widget* widget, WebTouchPoint::State state, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const RenderObject* renderObject)
+static void addTouchPointsIfNotYetAdded(const Widget* widget, WebTouchPoint::State state, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const LayoutObject* layoutObject)
 {
     unsigned initialTouchPointsLength = *touchPointsLength;
     for (unsigned i = 0; i < touches->length(); ++i) {
         const unsigned pointIndex = *touchPointsLength;
         if (pointIndex >= static_cast<unsigned>(WebTouchEvent::touchesLengthCap))
             return;
 
         const Touch* touch = touches->item(i);
         if (hasTouchPointWithId(touchPoints, initialTouchPointsLength, touch->identifier()))
             continue;
 
-        touchPoints[pointIndex] = toWebTouchPoint(touch, renderObject, state);
+        touchPoints[pointIndex] = toWebTouchPoint(touch, layoutObject, state);
         ++(*touchPointsLength);
     }
 }
 
-WebTouchEventBuilder::WebTouchEventBuilder(const Widget* widget, const RenderObject* renderObject, const TouchEvent& event)
+WebTouchEventBuilder::WebTouchEventBuilder(const Widget* widget, const LayoutObject* layoutObject, const TouchEvent& event)
 {
     if (event.type() == EventTypeNames::touchstart)
         type = TouchStart;
     else if (event.type() == EventTypeNames::touchmove)
         type = TouchMove;
     else if (event.type() == EventTypeNames::touchend)
         type = TouchEnd;
     else if (event.type() == EventTypeNames::touchcancel)
         type = TouchCancel;
     else {
         ASSERT_NOT_REACHED();
         type = Undefined;
         return;
     }
 
     modifiers = getWebInputModifiers(event);
     timeStampSeconds = event.timeStamp() / millisPerSecond;
     cancelable = event.cancelable();
 
-    addTouchPointsIfNotYetAdded(widget, toWebTouchPointState(event.type()), event.changedTouches(), touches, &touchesLength, renderObject);
-    addTouchPointsIfNotYetAdded(widget, WebTouchPoint::StateStationary, event.touches(), touches, &touchesLength, renderObject);
+    addTouchPointsIfNotYetAdded(widget, toWebTouchPointState(event.type()), event.changedTouches(), touches, &touchesLength, layoutObject);
+    addTouchPointsIfNotYetAdded(widget, WebTouchPoint::StateStationary, event.touches(), touches, &touchesLength, layoutObject);
 }
 
-WebGestureEventBuilder::WebGestureEventBuilder(const Widget* widget, const RenderObject* renderObject, const GestureEvent& event)
+WebGestureEventBuilder::WebGestureEventBuilder(const Widget* widget, const LayoutObject* layoutObject, const GestureEvent& event)
 {
     if (event.type() == EventTypeNames::gestureshowpress)
         type = GestureShowPress;
     else if (event.type() == EventTypeNames::gesturetapdown)
         type = GestureTapDown;
     else if (event.type() == EventTypeNames::gesturescrollstart)
         type = GestureScrollBegin;
     else if (event.type() == EventTypeNames::gesturescrollend)
         type = GestureScrollEnd;
     else if (event.type() == EventTypeNames::gesturescrollupdate) {
         type = GestureScrollUpdate;
         data.scrollUpdate.deltaX = event.deltaX();
         data.scrollUpdate.deltaY = event.deltaY();
     } else if (event.type() == EventTypeNames::gesturetap) {
         type = GestureTap;
         data.tap.tapCount = 1;
     }
 
     timeStampSeconds = event.timeStamp() / millisPerSecond;
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
-    IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), *renderObject);
+    IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink