Blink Plugins: Remove Shadow DOM Plugin Placeholder

Source/core/html/HTMLAppletElement.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, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 17 matching lines @@
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/HTMLParamElement.h"
 #include "core/layout/LayoutApplet.h"
 #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"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 HTMLAppletElement::HTMLAppletElement(Document& document, bool createdByParser)
     : HTMLPlugInElement(appletTag, document, createdByParser, ShouldNotPreferPlugInsForImages)
@@ skipping 39 matching lines @@
     if (!fastHasAttribute(codeAttr) && !openShadowRoot())
         return false;
     return HTMLPlugInElement::layoutObjectIsNeeded(style);
 }
 
 LayoutObject* HTMLAppletElement::createLayoutObject(const ComputedStyle& style)
 {
     if (!canEmbedJava() || openShadowRoot())
         return LayoutObject::createObject(this, style);
 
-    if (usePlaceholderContent())
-        return new LayoutBlockFlow(this);
-
     return new LayoutApplet(this);
 }
 
 LayoutPart* HTMLAppletElement::layoutPartForJSBindings() const
 {
     if (!canEmbedJava())
         return nullptr;
     return HTMLPlugInElement::layoutPartForJSBindings();
 }
 
@@ skipping 70 matching lines @@
     }
 
     for (HTMLParamElement* param = Traversal<HTMLParamElement>::firstChild(*this); param; param = Traversal<HTMLParamElement>::nextSibling(*param)) {
         if (param->name().isEmpty())
             continue;
 
         paramNames.append(param->name());
         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
 {
     if (document().isSandboxed(SandboxPlugins))
         return false;
 
     Settings* settings = document().settings();
     if (!settings)
         return false;
@@ skipping 13 matching lines @@
 
     if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
         || !document().contentSecurityPolicy()->allowPluginTypeForDocument(document(), m_serviceType, m_serviceType, url)) {
         layoutEmbeddedObject()->setPluginUnavailabilityReason(LayoutEmbeddedObject::PluginBlockedByContentSecurityPolicy);
         return false;
     }
     return true;
 }
 
 }