Rename renderer() to layoutObject().

Source/web/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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.
@@ skipping 118 matching lines @@
     m_webPlugin->paint(canvas, windowRect);
 
     gc->restore();
 }
 
 void WebPluginContainerImpl::invalidateRect(const IntRect& rect)
 {
     if (!parent())
         return;
 
-    LayoutBox* renderer = toLayoutBox(m_element->renderer());
+    LayoutBox* renderer = toLayoutBox(m_element->layoutObject());
     if (!renderer)
         return;
 
     IntRect dirtyRect = rect;
     dirtyRect.move(renderer->borderLeft() + renderer->paddingLeft(),
                    renderer->borderTop() + renderer->paddingTop());
 
     // For querying Layer::compositingState().
     // This code should be correct.
     DisableCompositingQueryAsserts disabler;
@@ skipping 242 matching lines @@
 }
 
 void WebPluginContainerImpl::scrollRect(const WebRect& rect)
 {
     invalidateRect(rect);
 }
 
 void WebPluginContainerImpl::reportGeometry()
 {
     // We cannot compute geometry without a parent or renderer.
-    if (!parent() || !m_element->renderer())
+    if (!parent() || !m_element->layoutObject())
         return;
 
     IntRect windowRect, clipRect;
     Vector<IntRect> cutOutRects;
     calculateGeometry(frameRect(), windowRect, clipRect, cutOutRects);
 
     m_webPlugin->updateGeometry(windowRect, clipRect, cutOutRects, isVisible());
 
     if (m_scrollbarGroup) {
         m_scrollbarGroup->scrollAnimator()->contentsResized();
@@ skipping 132 matching lines @@
         }
     }
 }
 
 WebPoint WebPluginContainerImpl::windowToLocalPoint(const WebPoint& point)
 {
     FrameView* view = toFrameView(parent());
     if (!view)
         return point;
     WebPoint windowPoint = view->windowToContents(point);
-    return roundedIntPoint(m_element->renderer()->absoluteToLocal(FloatPoint(windowPoint), UseTransforms));
+    return roundedIntPoint(m_element->layoutObject()->absoluteToLocal(FloatPoint(windowPoint), UseTransforms));
 }
 
 WebPoint WebPluginContainerImpl::localToWindowPoint(const WebPoint& point)
 {
     FrameView* view = toFrameView(parent());
     if (!view)
         return point;
-    IntPoint absolutePoint = roundedIntPoint(m_element->renderer()->localToAbsolute(FloatPoint(point), UseTransforms));
+    IntPoint absolutePoint = roundedIntPoint(m_element->layoutObject()->localToAbsolute(FloatPoint(point), UseTransforms));
     return view->contentsToWindow(absolutePoint);
 }
 
 void WebPluginContainerImpl::didReceiveResponse(const ResourceResponse& response)
 {
     // Make sure that the plugin receives window geometry before data, or else
     // plugins misbehave.
     frameRectsChanged();
 
     WrappedResourceResponse urlResponse(response);
@@ skipping 190 matching lines @@
     if (event->isDragEvent()) {
         if (m_webPlugin->canProcessDrag())
             handleDragEvent(event);
         return;
     }
 
     // We cache the parent FrameView here as the plugin widget could be deleted
     // in the call to HandleEvent. See http://b/issue?id=1362948
     FrameView* parentView = toFrameView(parent());
 
-    WebMouseEventBuilder webEvent(this, m_element->renderer(), *event);
+    WebMouseEventBuilder webEvent(this, m_element->layoutObject(), *event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
 
     if (event->type() == EventTypeNames::mousedown)
         focusPlugin();
 
     if (m_scrollbarGroup) {
         // This needs to be set before the other callbacks in this scope, since
         // the scroll animator class might query the position in response.
         m_scrollbarGroup->setLastMousePosition(IntPoint(event->x(), event->y()));
@@ skipping 39 matching lines @@
     WebDragData dragData = dataTransfer->dataObject()->toWebDragData();
     WebDragOperationsMask dragOperationMask = static_cast<WebDragOperationsMask>(dataTransfer->sourceOperation());
     WebPoint dragScreenLocation(event->screenX(), event->screenY());
     WebPoint dragLocation(event->absoluteLocation().x() - location().x(), event->absoluteLocation().y() - location().y());
 
     m_webPlugin->handleDragStatusUpdate(dragStatus, dragData, dragOperationMask, dragLocation, dragScreenLocation);
 }
 
 void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event)
 {
-    WebMouseWheelEventBuilder webEvent(this, m_element->renderer(), *event);
+    WebMouseWheelEventBuilder webEvent(this, m_element->layoutObject(), *event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
 
     WebCursorInfo cursorInfo;
     if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
         event->setDefaultHandled();
 }
 
 void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
 {
@@ skipping 37 matching lines @@
     if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
         event->setDefaultHandled();
 }
 
 void WebPluginContainerImpl::handleTouchEvent(TouchEvent* event)
 {
     switch (m_touchEventRequestType) {
     case TouchEventRequestTypeNone:
         return;
     case TouchEventRequestTypeRaw: {
-        WebTouchEventBuilder webEvent(this, m_element->renderer(), *event);
+        WebTouchEventBuilder webEvent(this, m_element->layoutObject(), *event);
         if (webEvent.type == WebInputEvent::Undefined)
             return;
 
         if (event->type() == EventTypeNames::touchstart)
             focusPlugin();
 
         WebCursorInfo cursorInfo;
         if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
             event->setDefaultHandled();
         // FIXME: Can a plugin change the cursor from a touch-event callback?
         return;
     }
     case TouchEventRequestTypeSynthesizedMouse:
         synthesizeMouseEventIfPossible(event);
         return;
     }
 }
 
 static inline bool gestureScrollHelper(ScrollbarGroup* scrollbarGroup, ScrollDirection positiveDirection, ScrollDirection negativeDirection, float delta)
 {
     if (!delta)
         return false;
     float absDelta = delta > 0 ? delta : -delta;
     return scrollbarGroup->scroll(delta < 0 ? negativeDirection : positiveDirection, ScrollByPrecisePixel, absDelta);
 }
 
 void WebPluginContainerImpl::handleGestureEvent(GestureEvent* event)
 {
-    WebGestureEventBuilder webEvent(this, m_element->renderer(), *event);
+    WebGestureEventBuilder webEvent(this, m_element->layoutObject(), *event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
     if (event->type() == EventTypeNames::gesturetapdown)
         focusPlugin();
     WebCursorInfo cursorInfo;
     if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
         event->setDefaultHandled();
         return;
     }
 
     if (webEvent.type == WebInputEvent::GestureScrollUpdate) {
         if (!m_scrollbarGroup)
             return;
         if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollLeft, ScrollRight, webEvent.data.scrollUpdate.deltaX))
             event->setDefaultHandled();
         if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollUp, ScrollDown, webEvent.data.scrollUpdate.deltaY))
             event->setDefaultHandled();
     }
     // FIXME: Can a plugin change the cursor from a touch-event callback?
 }
 
 void WebPluginContainerImpl::synthesizeMouseEventIfPossible(TouchEvent* event)
 {
-    WebMouseEventBuilder webEvent(this, m_element->renderer(), *event);
+    WebMouseEventBuilder webEvent(this, m_element->layoutObject(), *event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
 
     WebCursorInfo cursorInfo;
     if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
         event->setDefaultHandled();
 }
 
 void WebPluginContainerImpl::focusPlugin()
 {
@@ skipping 23 matching lines @@
 
 IntRect WebPluginContainerImpl::windowClipRect() const
 {
     // Start by clipping to our bounds.
     IntRect clipRect =
         convertToContainingWindow(IntRect(0, 0, width(), height()));
 
     // document().layoutView() can be 0 when we receive messages from the
     // plugins while we are destroying a frame.
     // FIXME: Can we just check m_element->document().isActive() ?
-    if (m_element->renderer()->document().layoutView()) {
+    if (m_element->layoutObject()->document().layoutView()) {
         // Take our element and get the clip rect from the enclosing layer and
         // frame view.
         clipRect.intersect(
             m_element->document().view()->windowClipRectForFrameOwner(m_element));
     }
 
     return clipRect;
 }
 
 bool WebPluginContainerImpl::pluginShouldPersist() const
 {
     return m_webPlugin->shouldPersist();
 }
 
 } // namespace blink