[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 14:56:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 29b38a271e7f9fa5710871c2a684d698be1a0709
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 17:58:25 2010 +0000
Java applets don't display on the page
https://bugs.webkit.org/show_bug.cgi?id=48251
<rdar://problem/8483759>
Reviewed by Dan Bernstein.
Add WKPreferencesSetJavaEnabled and initialize it to true by default, matching old WebKit.
* Shared/WebPreferencesStore.cpp:
(WebKit::WebPreferencesStore::WebPreferencesStore):
Initialize javaEnabled.
(WebKit::WebPreferencesStore::encode):
Encode javaEnabled.
(WebKit::WebPreferencesStore::decode):
Decode javaEnabled.
* Shared/WebPreferencesStore.h:
Add javaEnabled.
* UIProcess/API/C/WKPreferences.cpp:
(WKPReferencesSetJavaEnabled):
(WKPReferencesGetJavaEnabled):
Call the WebPreferences functions.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::createJavaAppletWidget):
Just call createPlugin.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Call Settings::setJavaEnabled.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70464 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1e0434a..7fd84ca 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,39 @@
+2010-10-25 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ Java applets don't display on the page
+ https://bugs.webkit.org/show_bug.cgi?id=48251
+ <rdar://problem/8483759>
+
+ Add WKPreferencesSetJavaEnabled and initialize it to true by default, matching old WebKit.
+
+ * Shared/WebPreferencesStore.cpp:
+ (WebKit::WebPreferencesStore::WebPreferencesStore):
+ Initialize javaEnabled.
+
+ (WebKit::WebPreferencesStore::encode):
+ Encode javaEnabled.
+
+ (WebKit::WebPreferencesStore::decode):
+ Decode javaEnabled.
+
+ * Shared/WebPreferencesStore.h:
+ Add javaEnabled.
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPReferencesSetJavaEnabled):
+ (WKPReferencesGetJavaEnabled):
+ Call the WebPreferences functions.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::createJavaAppletWidget):
+ Just call createPlugin.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ Call Settings::setJavaEnabled.
+
2010-10-25 Patrick Gansterer <paroga at webkit.org>
Reviewed by David Kilzer.
diff --git a/WebKit2/Shared/WebPreferencesStore.cpp b/WebKit2/Shared/WebPreferencesStore.cpp
index b0b2ab7..14f083c 100644
--- a/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/WebKit2/Shared/WebPreferencesStore.cpp
@@ -36,6 +36,7 @@ WebPreferencesStore::WebPreferencesStore()
: javaScriptEnabled(true)
, loadsImagesAutomatically(true)
, pluginsEnabled(true)
+ , javaEnabled(true)
, offlineWebApplicationCacheEnabled(false)
, localStorageEnabled(true)
, xssAuditorEnabled(true)
@@ -72,6 +73,7 @@ void WebPreferencesStore::encode(CoreIPC::ArgumentEncoder* encoder) const
encoder->encode(javaScriptEnabled);
encoder->encode(loadsImagesAutomatically);
encoder->encode(pluginsEnabled);
+ encoder->encode(javaEnabled);
encoder->encode(offlineWebApplicationCacheEnabled);
encoder->encode(localStorageEnabled);
encoder->encode(xssAuditorEnabled);
@@ -101,6 +103,8 @@ bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder* decoder, WebPreferenc
return false;
if (!decoder->decode(s.pluginsEnabled))
return false;
+ if (!decoder->decode(s.javaEnabled))
+ return false;
if (!decoder->decode(s.offlineWebApplicationCacheEnabled))
return false;
if (!decoder->decode(s.localStorageEnabled))
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index 578c695..f3adb35 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -45,6 +45,7 @@ struct WebPreferencesStore {
bool javaScriptEnabled;
bool loadsImagesAutomatically;
bool pluginsEnabled;
+ bool javaEnabled;
bool offlineWebApplicationCacheEnabled;
bool localStorageEnabled;
bool xssAuditorEnabled;
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index c89ecba..97a0668 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -119,6 +119,16 @@ bool WKPreferencesGetPluginsEnabled(WKPreferencesRef preferencesRef)
return toImpl(preferencesRef)->pluginsEnabled();
}
+void WKPReferencesSetJavaEnabled(WKPreferencesRef preferencesRef, bool javaEnabled)
+{
+ toImpl(preferencesRef)->setJavaEnabled(javaEnabled);
+}
+
+bool WKPReferencesGetJavaEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->javaEnabled();
+}
+
void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStringRef family)
{
toImpl(preferencesRef)->setStandardFontFamily(toWTFString(family));
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.h b/WebKit2/UIProcess/API/C/WKPreferences.h
index f728473..197afc9 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -65,10 +65,14 @@ WK_EXPORT bool WKPreferencesGetXSSAuditorEnabled(WKPreferencesRef preferences);
WK_EXPORT void WKPreferencesSetFrameFlatteningEnabled(WKPreferencesRef preferences, bool frameFlatteningEnabled);
WK_EXPORT bool WKPreferencesGetFrameFlatteningEnabled(WKPreferencesRef preferences);
-// Default to true.
+// Defaults to true.
WK_EXPORT void WKPreferencesSetPluginsEnabled(WKPreferencesRef preferences, bool pluginsEnabled);
WK_EXPORT bool WKPreferencesGetPluginsEnabled(WKPreferencesRef preferences);
+// Defaults to true.
+WK_EXPORT void WKPReferencesSetJavaEnabled(WKPreferencesRef preferences, bool javaEnabled);
+WK_EXPORT bool WKPReferencesGetJavaEnabled(WKPreferencesRef preferences);
+
WK_EXPORT void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
WK_EXPORT WKStringRef WKPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef);
diff --git a/WebKit2/UIProcess/WebPreferences.cpp b/WebKit2/UIProcess/WebPreferences.cpp
index e8169e3..91df90e 100644
--- a/WebKit2/UIProcess/WebPreferences.cpp
+++ b/WebKit2/UIProcess/WebPreferences.cpp
@@ -152,6 +152,17 @@ bool WebPreferences::pluginsEnabled() const
return m_store.pluginsEnabled;
}
+void WebPreferences::setJavaEnabled(bool b)
+{
+ m_store.javaEnabled = b;
+ update();
+}
+
+bool WebPreferences::javaEnabled() const
+{
+ return m_store.javaEnabled;
+}
+
void WebPreferences::setFontSmoothingLevel(FontSmoothingLevel level)
{
m_store.fontSmoothingLevel = level;
diff --git a/WebKit2/UIProcess/WebPreferences.h b/WebKit2/UIProcess/WebPreferences.h
index 85f4929..4ec413a 100644
--- a/WebKit2/UIProcess/WebPreferences.h
+++ b/WebKit2/UIProcess/WebPreferences.h
@@ -79,6 +79,9 @@ public:
void setPluginsEnabled(bool);
bool pluginsEnabled() const;
+ void setJavaEnabled(bool);
+ bool javaEnabled() const;
+
void setFontSmoothingLevel(FontSmoothingLevel);
FontSmoothingLevel fontSmoothingLevel() const;
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 8b8892f..da3a73b 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -51,6 +51,7 @@
#include <WebCore/Frame.h>
#include <WebCore/FrameLoadRequest.h>
#include <WebCore/FrameView.h>
+#include <WebCore/HTMLAppletElement.h>
#include <WebCore/HTMLFormElement.h>
#include <WebCore/MIMETypeRegistry.h>
#include <WebCore/MouseEvent.h>
@@ -1009,10 +1010,9 @@ void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
m_pluginView = static_cast<PluginView*>(pluginWidget);
}
-PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues)
+PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* appletElement, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues)
{
- notImplemented();
- return 0;
+ return createPlugin(pluginSize, appletElement, KURL(), paramNames, paramValues, "application/x-java-applet", false);
}
ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeTypeIn)
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index f5ebf75..1e7a90d 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -717,6 +717,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
settings->setJavaScriptEnabled(store.javaScriptEnabled);
settings->setLoadsImagesAutomatically(store.loadsImagesAutomatically);
settings->setPluginsEnabled(store.pluginsEnabled);
+ settings->setJavaEnabled(store.javaEnabled);
settings->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled);
settings->setLocalStorageEnabled(store.localStorageEnabled);
settings->setXSSAuditorEnabled(store.xssAuditorEnabled);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list