Commit 4a2e50c1 authored by dcheng@chromium.org's avatar dcheng@chromium.org

Remove javaEnabled setting.

As of M45, NPAPI support is (almost) completely gone, so Java will never
be supported anyway.

BUG=none

Review URL: https://codereview.chromium.org/1306403003

git-svn-id: svn://svn.chromium.org/blink/trunk@201211 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a75851a7
......@@ -18,8 +18,6 @@ applet, embed, object { display: block; margin: 10px; }
</template>
<script>
internals.settings.setJavaEnabled(true);
var templateContent = document.getElementById('placeholder-template').content;
Array.prototype.forEach.call(document.querySelectorAll("applet, embed, object"), function(plugin) {
internals.forcePluginPlaceholder(plugin, templateContent);
......
......@@ -18,8 +18,6 @@ applet, embed, object { display: block; margin: 10px; }
</template>
<script>
internals.settings.setJavaEnabled(true);
var templateContent = document.getElementById('placeholder-template').content;
Array.prototype.forEach.call(document.querySelectorAll("applet, embed, object"), function(plugin) {
internals.forcePluginPlaceholder(plugin, templateContent);
......
......@@ -266,7 +266,6 @@ backgroundHtmlParserPendingTokenLimit type=unsigned, initial=0
# be loaded later.
doHtmlPreloadScanning initial=true
javaEnabled initial=false
pluginsEnabled initial=false
viewportEnabled initial=false, invalidate=ViewportDescription
......
......@@ -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)) {
......
......@@ -50,7 +50,6 @@ private:
LayoutPart* existingLayoutPart() const override;
void updateWidgetInternal() override;
bool canEmbedJava() const;
bool canEmbedURL(const KURL&) const;
bool shouldRegisterAsNamedItem() const override { return true; }
......
......@@ -619,7 +619,7 @@ bool HTMLPlugInElement::pluginIsLoadable(const KURL& url, const String& mimeType
if (!settings)
return false;
if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType) && !settings->javaEnabled())
if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType))
return false;
if (document().isSandboxed(SandboxPlugins))
......
......@@ -60,7 +60,7 @@ DOMMimeTypeArray* NavigatorPlugins::mimeTypes(Navigator& navigator)
// static
bool NavigatorPlugins::javaEnabled(Navigator& navigator)
{
return NavigatorPlugins::from(navigator).javaEnabled(navigator.frame());
return false;
}
DOMPluginArray* NavigatorPlugins::plugins(LocalFrame* frame) const
......@@ -77,14 +77,6 @@ DOMMimeTypeArray* NavigatorPlugins::mimeTypes(LocalFrame* frame) const
return m_mimeTypes.get();
}
bool NavigatorPlugins::javaEnabled(LocalFrame* frame) const
{
if (!frame || !frame->settings())
return false;
return frame->settings()->javaEnabled();
}
DEFINE_TRACE(NavigatorPlugins)
{
visitor->trace(m_plugins);
......
......@@ -36,7 +36,6 @@ private:
DOMPluginArray* plugins(LocalFrame*) const;
DOMMimeTypeArray* mimeTypes(LocalFrame*) const;
bool javaEnabled(LocalFrame*) const;
mutable Member<DOMPluginArray> m_plugins;
mutable Member<DOMMimeTypeArray> m_mimeTypes;
......
......@@ -344,11 +344,6 @@ void WebSettingsImpl::setTextAreasAreResizable(bool areResizable)
m_settings->setTextAreasAreResizable(areResizable);
}
void WebSettingsImpl::setJavaEnabled(bool enabled)
{
m_settings->setJavaEnabled(enabled);
}
void WebSettingsImpl::setAllowScriptsToCloseWindows(bool allow)
{
m_settings->setAllowScriptsToCloseWindows(allow);
......
......@@ -106,7 +106,6 @@ public:
void setImagesEnabled(bool) override;
void setInlineTextBoxAccessibilityEnabled(bool) override;
void setInvertViewportScrollOrder(bool) override;
void setJavaEnabled(bool) override;
void setJavaScriptCanAccessClipboard(bool) override;
void setJavaScriptCanOpenWindowsAutomatically(bool) override;
void setJavaScriptEnabled(bool) override;
......
......@@ -181,7 +181,6 @@ public:
virtual void setImagesEnabled(bool) = 0;
virtual void setInlineTextBoxAccessibilityEnabled(bool) = 0;
virtual void setInvertViewportScrollOrder(bool) = 0;
virtual void setJavaEnabled(bool) = 0;
virtual void setJavaScriptCanAccessClipboard(bool) = 0;
virtual void setJavaScriptCanOpenWindowsAutomatically(bool) = 0;
virtual void setJavaScriptEnabled(bool) = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment