| 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 07bb30e8fc741869003497fed38e8614da0f4403..bf46c6ed66084f6e2bea7638b16cea3353cae790 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/loader/fetch/ResourceRequest.h"
|
| #include "platform/network/mime/MIMETypeFromURL.h"
|
| @@ -77,8 +76,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
|
| + // 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),
|
| @@ -132,9 +131,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);
|
| }
|
|
|
| @@ -265,9 +264,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);
|
|
|
|
|