Rename platform/Widget to platform/FrameViewBase in core.

third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
index 123c914017966e492d5018e36d35f0001d9c6886..d8f485be9b20a87e607039a07353176e8b9ce195 100644
--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
@@ -46,8 +46,8 @@
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/plugins/PluginView.h"
+#include "platform/FrameViewBase.h"
 #include "platform/Histogram.h"
-#include "platform/Widget.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/mime/MIMETypeFromURL.h"
 #include "platform/network/mime/MIMETypeRegistry.h"
@@ -78,7 +78,7 @@ HTMLPlugInElement::HTMLPlugInElement(
     : HTMLFrameOwnerElement(tagName, doc),
       m_isDelayingLoadEvent(false),
       // m_needsWidgetUpdate(!createdByParser) allows HTMLObjectElement to delay
-      // widget updates until after all children are parsed. For
+      // FrameViewBase updates until after all children are parsed. For
       // HTMLEmbedElement this delay is unnecessary, but it is simpler to make
       // both classes share the same codepath in this class.
       m_needsWidgetUpdate(!createdByParser),
@@ -96,8 +96,8 @@ DEFINE_TRACE(HTMLPlugInElement) {
   HTMLFrameOwnerElement::trace(visitor);
 }
 
-void HTMLPlugInElement::setPersistedPluginWidget(Widget* widget) {
-  if (m_persistedPluginWidget == widget)
+void HTMLPlugInElement::setPersistedPluginWidget(FrameViewBase* frameViewBase) {
+  if (m_persistedPluginWidget == frameViewBase)
     return;
   if (m_persistedPluginWidget) {
     if (m_persistedPluginWidget->isPluginView()) {
@@ -108,7 +108,7 @@ void HTMLPlugInElement::setPersistedPluginWidget(Widget* widget) {
              m_persistedPluginWidget->isRemoteFrameView());
     }
   }
-  m_persistedPluginWidget = widget;
+  m_persistedPluginWidget = frameViewBase;
 }
 
 bool HTMLPlugInElement::requestObjectInternal(
@@ -131,8 +131,8 @@ bool HTMLPlugInElement::requestObjectInternal(
                        useFallback)) {
     // If the plugin element already contains a subframe,
     // loadOrRedirectSubframe will re-use it. Otherwise, it will create a
-    // new frame and set it as the LayoutPart's widget, causing what was
-    // previously in the widget to be torn down.
+    // new frame and set it as the LayoutPart's FrameViewBase, causing what was
+    // previously in the FrameViewBase to be torn down.
     return loadOrRedirectSubframe(completedURL, getNameAttribute(), true);
   }
 
@@ -159,8 +159,8 @@ bool HTMLPlugInElement::willRespondToMouseClickEvents() {
 void HTMLPlugInElement::removeAllEventListeners() {
   HTMLFrameOwnerElement::removeAllEventListeners();
   if (LayoutPart* layoutObject = existingLayoutPart()) {
-    if (Widget* widget = layoutObject->widget())
-      widget->eventListenersRemoved();
+    if (FrameViewBase* frameViewBase = layoutObject->widget())
+      frameViewBase->eventListenersRemoved();
   }
 }
 
@@ -252,13 +252,16 @@ void HTMLPlugInElement::createPluginWithoutLayoutObject() {
 }
 
 bool HTMLPlugInElement::shouldAccelerate() const {
-  if (Widget* widget = ownedWidget())
-    return widget->isPluginView() && toPluginView(widget)->platformLayer();
+  if (FrameViewBase* frameViewBase = ownedWidget()) {
+    return frameViewBase->isPluginView() &&
+           toPluginView(frameViewBase)->platformLayer();
+  }
   return false;
 }
 
 void HTMLPlugInElement::detachLayoutTree(const AttachContext& context) {
-  // Update the widget the next time we attach (detaching destroys the plugin).
+  // Update the FrameViewBase the next time we attach (detaching destroys the
+  // plugin).
   // FIXME: None of this "needsWidgetUpdate" related code looks right.
   if (layoutObject() && !useFallbackContent())
     setNeedsWidgetUpdate(true);
@@ -267,12 +270,12 @@ void HTMLPlugInElement::detachLayoutTree(const AttachContext& context) {
     document().decrementLoadEventDelayCount();
   }
 
-  // Only try to persist a plugin widget we actually own.
-  Widget* plugin = ownedWidget();
+  // Only try to persist a plugin FrameViewBase we actually own.
+  FrameViewBase* plugin = ownedWidget();
   if (plugin && context.performingReattach) {
     setPersistedPluginWidget(releaseWidget());
   } else {
-    // Clear the widget; will trigger disposal of it with Oilpan.
+    // Clear the FrameViewBase; will trigger disposal of it with Oilpan.
     setWidget(nullptr);
   }
 
@@ -322,7 +325,7 @@ SharedPersistent<v8::Object>* HTMLPlugInElement::pluginWrapper() {
   // return the cached allocated Bindings::Instance. Not supporting this
   // edge-case is OK.
   if (!m_pluginWrapper) {
-    Widget* plugin;
+    FrameViewBase* plugin;
 
     if (m_persistedPluginWidget)
       plugin = m_persistedPluginWidget.get();
@@ -335,7 +338,7 @@ SharedPersistent<v8::Object>* HTMLPlugInElement::pluginWrapper() {
   return m_pluginWrapper.get();
 }
 
-Widget* HTMLPlugInElement::pluginWidget() const {
+FrameViewBase* HTMLPlugInElement::pluginWidget() const {
   if (LayoutPart* layoutPart = layoutPartForJSBindings())
     return layoutPart->widget();
   return nullptr;
@@ -390,10 +393,10 @@ void HTMLPlugInElement::defaultEventHandler(Event* event) {
             .showsUnavailablePluginIndicator())
       return;
   }
-  Widget* widget = toLayoutPart(r)->widget();
-  if (!widget)
+  FrameViewBase* frameViewBase = toLayoutPart(r)->widget();
+  if (!frameViewBase)
     return;
-  widget->handleEvent(event);
+  frameViewBase->handleEvent(event);
   if (event->defaultHandled())
     return;
   HTMLFrameOwnerElement::defaultEventHandler(event);
@@ -528,9 +531,9 @@ bool HTMLPlugInElement::loadPlugin(const KURL& url,
     LocalFrameClient::DetachedPluginPolicy policy =
         requireLayoutObject ? LocalFrameClient::FailOnDetachedPlugin
                             : LocalFrameClient::AllowDetachedPlugin;
-    Widget* widget = frame->loader().client()->createPlugin(
+    FrameViewBase* frameViewBase = frame->loader().client()->createPlugin(
         this, url, paramNames, paramValues, mimeType, loadManually, policy);
-    if (!widget) {
+    if (!frameViewBase) {
       if (!layoutItem.isNull() &&
           !layoutItem.showsUnavailablePluginIndicator()) {
         m_pluginIsAvailable = false;
@@ -540,9 +543,9 @@ bool HTMLPlugInElement::loadPlugin(const KURL& url,
     }
 
     if (!layoutItem.isNull())
-      setWidget(widget);
+      setWidget(frameViewBase);
     else
-      setPersistedPluginWidget(widget);
+      setPersistedPluginWidget(frameViewBase);
   }
 
   document().setContainsPlugins();