Merge RenderWidget into single subclass, RenderPart

Source/core/html/HTMLPlugInElement.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  *
  * 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 15 matching lines @@
 #include "bindings/core/v8/SharedPersistent.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include <v8.h>
 
 struct NPObject;
 
 namespace blink {
 
 class HTMLImageLoader;
 class RenderEmbeddedObject;
-class RenderWidget;
+class RenderPart;
 class Widget;
 
 enum PreferPlugInsForImagesOption {
     ShouldPreferPlugInsForImages,
     ShouldNotPreferPlugInsForImages
 };
 
 class HTMLPlugInElement : public HTMLFrameOwnerElement {
 public:
     virtual ~HTMLPlugInElement();
     virtual void trace(Visitor*) override;
 
     void resetInstance();
     SharedPersistent<v8::Object>* pluginWrapper();
     Widget* pluginWidget() const;
     NPObject* getNPObject();
     bool canProcessDrag() const;
     const String& url() const { return m_url; }
 
-    // Public for FrameView::addWidgetToUpdate()
+    // Public for FrameView::addPartToUpdate()
     bool needsWidgetUpdate() const { return m_needsWidgetUpdate; }
     void setNeedsWidgetUpdate(bool needsWidgetUpdate) { m_needsWidgetUpdate = needsWidgetUpdate; }
     void updateWidget();
 
     bool shouldAccelerate() const;
 
     void requestPluginCreationWithoutRendererIfPossible();
     void createPluginWithoutRenderer();
 
     bool usePlaceholderContent() const { return m_usePlaceholderContent; }
     void setUsePlaceholderContent(bool);
 
 protected:
     HTMLPlugInElement(const QualifiedName& tagName, Document&, bool createdByParser, PreferPlugInsForImagesOption);
 
     // Node functions:
     virtual void didMoveToNewDocument(Document& oldDocument) override;
 
     // Element functions:
     virtual bool isPresentationAttribute(const QualifiedName&) const override;
     virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet*) override;
 
     virtual bool hasFallbackContent() const;
     virtual bool useFallbackContent() const;
-    // Create or update the RenderWidget and return it, triggering layout if
+    // Create or update the RenderPart and return it, triggering layout if
     // necessary.
-    virtual RenderWidget* renderWidgetForJSBindings() const;
+    virtual RenderPart* renderPartForJSBindings() const;
 
     bool isImageType();
     bool shouldPreferPlugInsForImages() const { return m_shouldPreferPlugInsForImages; }
     RenderEmbeddedObject* renderEmbeddedObject() const;
     bool allowedToLoadFrameURL(const String& url);
     bool requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues);
     bool shouldUsePlugin(const KURL&, const String& mimeType, bool hasFallback, bool& useFallback);
 
     void dispatchErrorEvent();
     void lazyReattachIfNeeded();
@@ skipping 21 matching lines @@
     virtual bool supportsFocus() const override final { return true; }
     virtual bool rendererIsFocusable() const override final;
     virtual bool isKeyboardFocusable() const override final;
     virtual void didAddUserAgentShadowRoot(ShadowRoot&) override final;
     virtual void willAddFirstAuthorShadowRoot() override final;
 
     // HTMLElement function:
     virtual bool hasCustomFocusLogic() const override;
     virtual bool isPluginElement() const override final;
 
-    // Return any existing RenderWidget without triggering relayout, or 0 if it
+    // Return any existing RenderPart without triggering relayout, or 0 if it
     // doesn't yet exist.
-    virtual RenderWidget* existingRenderWidget() const = 0;
+    virtual RenderPart* existingRenderPart() const = 0;
     virtual void updateWidgetInternal() = 0;
 
     bool loadPlugin(const KURL&, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback, bool requireRenderer);
     bool pluginIsLoadable(const KURL&, const String& mimeType);
     bool wouldLoadAsNetscapePlugin(const String& url, const String& serviceType);
 
     mutable RefPtr<SharedPersistent<v8::Object> > m_pluginWrapper;
     NPObject* m_NPObject;
     bool m_isCapturingMouseEvents;
     bool m_needsWidgetUpdate;
@@ skipping 11 matching lines @@
 inline bool isHTMLPlugInElement(const HTMLElement& element)
 {
     return element.isPluginElement();
 }
 
 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLPlugInElement);
 
 } // namespace blink
 
 #endif // HTMLPlugInElement_h