Index: Source/core/html/HTMLAppletElement.cpp |
diff --git a/Source/core/html/HTMLAppletElement.cpp b/Source/core/html/HTMLAppletElement.cpp |
index 7d63cb481e1399544cc7281ab0f3b4d452369053..b2d9a4dbba21e00cd0f382af6e7accb6dde6ee15 100644 |
--- a/Source/core/html/HTMLAppletElement.cpp |
+++ b/Source/core/html/HTMLAppletElement.cpp |
@@ -35,7 +35,6 @@ |
#include "core/layout/LayoutBlockFlow.h" |
#include "core/loader/FrameLoader.h" |
#include "core/loader/FrameLoaderClient.h" |
-#include "core/plugins/PluginPlaceholder.h" |
#include "platform/Widget.h" |
#include "platform/weborigin/KURL.h" |
#include "platform/weborigin/SecurityOrigin.h" |
@@ -180,25 +179,17 @@ void HTMLAppletElement::updateWidgetInternal() |
paramValues.append(param->value()); |
} |
- OwnPtrWillBeRawPtr<PluginPlaceholder> placeholder = nullptr; |
RefPtrWillBeRawPtr<Widget> widget = nullptr; |
- if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) { |
- placeholder = frame->loader().client()->createPluginPlaceholder(document(), KURL(), paramNames, paramValues, m_serviceType, false); |
- if (!placeholder) |
- widget = frame->loader().client()->createJavaAppletWidget(this, baseURL, paramNames, paramValues); |
- } |
+ if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) |
+ widget = frame->loader().client()->createJavaAppletWidget(this, baseURL, paramNames, paramValues); |
- if (!placeholder && !widget) { |
+ if (!widget) { |
if (!layoutObject->showsUnavailablePluginIndicator()) |
layoutObject->setPluginUnavailabilityReason(LayoutEmbeddedObject::PluginMissing); |
- setPlaceholder(nullptr); |
- } else if (placeholder) { |
- setPlaceholder(placeholder.release()); |
- } else if (widget) { |
- document().setContainsPlugins(); |
- setWidget(widget); |
- setPlaceholder(nullptr); |
+ return; |
} |
+ document().setContainsPlugins(); |
+ setWidget(widget); |
} |
bool HTMLAppletElement::canEmbedURL(const KURL& url) const |