Deleted Widget/FrameViewBase

third_party/WebKit/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/PluginDocument.h"
 #include "core/input/EventHandler.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/api/LayoutEmbeddedItem.h"
 #include "core/loader/MixedContentChecker.h"
 #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"
 #include "platform/network/mime/MIMETypeFromURL.h"
 #include "platform/network/mime/MIMETypeRegistry.h"
 #include "platform/plugins/PluginData.h"
 #include "public/platform/WebURLRequest.h"
 
 namespace blink {
 
@@ skipping 11 matching lines @@
 
 }  // anonymous namespace
 
 HTMLPlugInElement::HTMLPlugInElement(
     const QualifiedName& tag_name,
     Document& doc,
     bool created_by_parser,
     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),
       should_prefer_plug_ins_for_images_(prefer_plug_ins_for_images_option ==
                                          kShouldPreferPlugInsForImages) {}
 
 HTMLPlugInElement::~HTMLPlugInElement() {
   DCHECK(plugin_wrapper_.IsEmpty());  // cleared in detachLayoutTree()
   DCHECK(!is_delaying_load_event_);
 }
@@ skipping 33 matching lines @@
     return false;
 
   KURL completed_url = url.IsEmpty() ? KURL() : GetDocument().CompleteURL(url);
   if (!AllowedToLoadObject(completed_url, mime_type))
     return false;
 
   bool use_fallback;
   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);
   }
 
   return LoadPlugin(completed_url, mime_type, param_names, param_values,
                     use_fallback, true);
 }
 
 bool HTMLPlugInElement::CanProcessDrag() const {
   return PluginWidget() && PluginWidget()->CanProcessDrag();
 }
@@ skipping 110 matching lines @@
   LoadPlugin(url, service_type_, param_names, param_values, use_fallback,
              false);
 }
 
 bool HTMLPlugInElement::ShouldAccelerate() const {
   PluginView* plugin = OwnedPlugin();
   return plugin && plugin->PlatformLayer();
 }
 
 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);
 
   if (is_delaying_load_event_) {
     is_delaying_load_event_ = false;
     GetDocument().DecrementLoadEventDelayCount();
   }
 
   // Only try to persist a plugin we actually own.
   PluginView* plugin = OwnedPlugin();
@@ skipping 383 matching lines @@
 
 void HTMLPlugInElement::LazyReattachIfNeeded() {
   if (!UseFallbackContent() && NeedsPluginUpdate() && GetLayoutObject() &&
       !IsImageType()) {
     LazyReattachIfAttached();
     SetPersistedPlugin(nullptr);
   }
 }
 
 }  // namespace blink