Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1027)

Unified Diff: Source/core/html/HTMLAppletElement.cpp

Issue 1306403003: Remove javaEnabled setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/html/HTMLAppletElement.cpp
diff --git a/Source/core/html/HTMLAppletElement.cpp b/Source/core/html/HTMLAppletElement.cpp
index af9de0c88e87fca22ffd82d0d6118bbd4bc7fb16..7d63cb481e1399544cc7281ab0f3b4d452369053 100644
--- a/Source/core/html/HTMLAppletElement.cpp
+++ b/Source/core/html/HTMLAppletElement.cpp
@@ -92,20 +92,12 @@ bool HTMLAppletElement::layoutObjectIsNeeded(const ComputedStyle& 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);
+ return LayoutObject::createObject(this, style);
}
LayoutPart* HTMLAppletElement::layoutPartForJSBindings() const
{
- if (!canEmbedJava())
- return nullptr;
- return HTMLPlugInElement::layoutPartForJSBindings();
+ return nullptr;
}
LayoutPart* HTMLAppletElement::existingLayoutPart() const
@@ -209,21 +201,6 @@ void HTMLAppletElement::updateWidgetInternal()
}
}
-bool HTMLAppletElement::canEmbedJava() const
-{
- if (document().isSandboxed(SandboxPlugins))
- return false;
-
- Settings* settings = document().settings();
- if (!settings)
- return false;
-
- if (!settings->javaEnabled())
- return false;
-
- return true;
-}
-
bool HTMLAppletElement::canEmbedURL(const KURL& url) const
{
if (!document().securityOrigin()->canDisplay(url)) {

Powered by Google App Engine
This is Rietveld 408576698