Blink Plugins: Remove Shadow DOM Plugin Placeholder

Source/core/html/HTMLAppletElement.cpp

Index: Source/core/html/HTMLAppletElement.cpp
diff --git a/Source/core/html/HTMLAppletElement.cpp b/Source/core/html/HTMLAppletElement.cpp
index af9de0c88e87fca22ffd82d0d6118bbd4bc7fb16..3aa6727f065ae452178cbab7216130f4a4ac5220 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"
@@ -95,9 +94,6 @@ LayoutObject* HTMLAppletElement::createLayoutObject(const ComputedStyle& style)
     if (!canEmbedJava() || openShadowRoot())
         return LayoutObject::createObject(this, style);
 
-    if (usePlaceholderContent())
-        return new LayoutBlockFlow(this);
-
     return new LayoutApplet(this);
 }
 
@@ -188,25 +184,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::canEmbedJava() const