Deleted Widget/FrameViewBase

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 111f85c7058ed3f6101ca5d4c2524cc2f213c14b..83106d567bf7496e5df9cf7bd45f6981ba346248 100644
--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
@@ -46,7 +46,6 @@
 #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/bindings/V8PerIsolateData.h"
 #include "platform/loader/fetch/ResourceRequest.h"
@@ -78,8 +77,8 @@ HTMLPlugInElement::HTMLPlugInElement(
     PreferPlugInsForImagesOption prefer_plug_ins_for_images_option)
     : HTMLFrameOwnerElement(tag_name, doc),
       is_delaying_load_event_(false),
-      // m_needsPluginUpdate(!createdByParser) allows HTMLObjectElement to delay
-      // FrameViewBase updates until after all children are parsed. For
+      // needs_plugin_update(!createdByParser) allows HTMLObjectElement to delay

[dcheng, 2017/05/09 08:05:55]

Move these comment fixes to a separate CL? In git, it's pretty to separate
things like this with judicious use of git add -p.

[joelhockey, 2017/05/10 04:17:13]

reverted

+      // FrameOrPlugin 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.
       needs_plugin_update_(!created_by_parser),
@@ -133,9 +132,9 @@ bool HTMLPlugInElement::RequestObjectInternal(
   if (!ShouldUsePlugin(completed_url, mime_type, HasFallbackContent(),
                        use_fallback)) {
     // 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 FrameViewBase, causing what was
-    // previously in the FrameViewBase to be torn down.
+    // LoadOrRedirectSubframe will re-use it. Otherwise, it will create a
+    // new frame and set it as the LayoutPart's FrameOrPlugin, causing what was
+    // previously in the FrameOrPlugin to be torn down.
     return LoadOrRedirectSubframe(completed_url, GetNameAttribute(), true);
   }
 
@@ -266,9 +265,9 @@ bool HTMLPlugInElement::ShouldAccelerate() const {
 }
 
 void HTMLPlugInElement::DetachLayoutTree(const AttachContext& context) {
-  // Update the FrameViewBase the next time we attach (detaching destroys the
+  // Update the FrameOrPlugin the next time we attach (detaching destroys the
   // plugin).
-  // FIXME: None of this "needsPluginUpdate" related code looks right.
+  // FIXME: None of this "NeedsPluginUpdate" related code looks right.
   if (GetLayoutObject() && !UseFallbackContent())
     SetNeedsPluginUpdate(true);