Merge RenderWidget into single subclass, RenderPart

Source/core/html/HTMLPlugInElement.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 28 matching lines @@
 #include "core/html/HTMLImageLoader.h"
 #include "core/html/PluginDocument.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/EventHandler.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/plugins/PluginView.h"
 #include "core/rendering/RenderBlockFlow.h"
 #include "core/rendering/RenderEmbeddedObject.h"
 #include "core/rendering/RenderImage.h"
-#include "core/rendering/RenderWidget.h"
+#include "core/rendering/RenderPart.h"
 #include "platform/Logging.h"
 #include "platform/MIMETypeFromURL.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/Widget.h"
 #include "platform/plugins/PluginData.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 38 matching lines @@
 {
     if (isDisabledFormControl())
         return false;
     RenderObject* r = renderer();
     return r && (r->isEmbeddedObject() || r->isWidget());
 }
 
 void HTMLPlugInElement::removeAllEventListeners()
 {
     HTMLFrameOwnerElement::removeAllEventListeners();
-    if (RenderWidget* renderer = existingRenderWidget()) {
+    if (RenderPart* renderer = existingRenderPart()) {
         if (Widget* widget = renderer->widget())
             widget->eventListenersRemoved();
     }
 }
 
 void HTMLPlugInElement::didMoveToNewDocument(Document& oldDocument)
 {
     if (m_imageLoader)
         m_imageLoader->elementDidMoveToNewDocument();
     HTMLFrameOwnerElement::didMoveToNewDocument(oldDocument);
@@ skipping 102 matching lines @@
         m_NPObject = 0;
     }
 
     HTMLFrameOwnerElement::detach(context);
 }
 
 RenderObject* HTMLPlugInElement::createRenderer(RenderStyle* style)
 {
     // Fallback content breaks the DOM->Renderer class relationship of this
     // class and all superclasses because createObject won't necessarily
-    // return a RenderEmbeddedObject, RenderPart or even RenderWidget.
+    // return a RenderEmbeddedObject, RenderPart or even RenderPart.

[Julien - ping for review, 2014/10/07 17:53:22]

Maybe a bit redundant: RenderPart or even RenderPart :-)

[Zeeshan Qureshi, 2014/10/10 19:32:38]

Ah, yes! I remember doing this in a commit but probably lost when reverting some
breaking changes.

     if (useFallbackContent())
         return RenderObject::createObject(this, style);
 
     if (isImageType()) {
         RenderImage* image = new RenderImage(this);
         image->setImageResource(RenderImageResource::create());
         return image;
     }
 
     if (usePlaceholderContent())
@@ skipping 36 matching lines @@
             plugin = pluginWidget();
 
         if (plugin)
             m_pluginWrapper = frame->script().createPluginWrapper(plugin);
     }
     return m_pluginWrapper.get();
 }
 
 Widget* HTMLPlugInElement::pluginWidget() const
 {
-    if (RenderWidget* renderWidget = renderWidgetForJSBindings())
-        return renderWidget->widget();
+    if (RenderPart* renderPart = renderPartForJSBindings())
+        return renderPart->widget();
     return 0;
 }
 
 bool HTMLPlugInElement::isPresentationAttribute(const QualifiedName& name) const
 {
     if (name == widthAttr || name == heightAttr || name == vspaceAttr || name == hspaceAttr || name == alignAttr)
         return true;
     return HTMLFrameOwnerElement::isPresentationAttribute(name);
 }
 
@@ skipping 28 matching lines @@
     // FIXME: Mouse down and scroll events are passed down to plug-in via custom
     // code in EventHandler; these code paths should be united.
 
     RenderObject* r = renderer();
     if (!r || !r->isWidget())
         return;
     if (r->isEmbeddedObject()) {
         if (toRenderEmbeddedObject(r)->showsUnavailablePluginIndicator())
             return;
     }
-    RefPtr<Widget> widget = toRenderWidget(r)->widget();
+    RefPtr<Widget> widget = toRenderPart(r)->widget();
     if (!widget)
         return;
     widget->handleEvent(event);
     if (event->defaultHandled())
         return;
     HTMLFrameOwnerElement::defaultEventHandler(event);
 }
 
-RenderWidget* HTMLPlugInElement::renderWidgetForJSBindings() const
+RenderPart* HTMLPlugInElement::renderPartForJSBindings() const
 {
     // Needs to load the plugin immediatedly because this function is called
     // when JavaScript code accesses the plugin.
     // FIXME: Check if dispatching events here is safe.
     document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
-    return existingRenderWidget();
+    return existingRenderPart();
 }
 
 bool HTMLPlugInElement::isKeyboardFocusable() const
 {
     if (!document().isActive())
         return false;
     return pluginWidget() && pluginWidget()->isPluginView() && toPluginView(pluginWidget())->supportsKeyboardFocus();
 }
 
 bool HTMLPlugInElement::hasCustomFocusLogic() const
@@ skipping 226 matching lines @@
     }
 }
 
 void HTMLPlugInElement::lazyReattachIfNeeded()
 {
     if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && renderer() && !isImageType())
         lazyReattachIfAttached();
 }
 
 }