[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
weinig at apple.com
weinig at apple.com
Wed Dec 22 17:55:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b65397430396f3af1555de1b35f73d750cf54e5f
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 20:55:19 2010 +0000
WebKit2 needs API to turn on popup blocking
https://bugs.webkit.org/show_bug.cgi?id=50407
Reviewed by Anders Carlsson.
WebKit2:
Pipe-through a preference for javascript being able to open
windows without user gesture.
* Shared/WebPreferencesStore.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetJavaScriptCanOpenWindowsAutomatically):
(WKPreferencesGetJavaScriptCanOpenWindowsAutomatically):
* UIProcess/API/C/WKPreferences.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
WebKitTools:
* TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
(TestWebKitAPI::TEST):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73187 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5b1e2f5..76d306e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2010-12-02 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ WebKit2 needs API to turn on popup blocking
+ https://bugs.webkit.org/show_bug.cgi?id=50407
+
+ Pipe-through a preference for javascript being able to open
+ windows without user gesture.
+
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetJavaScriptCanOpenWindowsAutomatically):
+ (WKPreferencesGetJavaScriptCanOpenWindowsAutomatically):
+ * UIProcess/API/C/WKPreferences.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2010-12-02 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index a562d9d..10adedf 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -48,6 +48,7 @@ namespace WebKit {
macro(DeveloperExtrasEnabled, developerExtrasEnabled, Bool, bool, false) \
macro(PrivateBrowsingEnabled, privateBrowsingEnabled, Bool, bool, false) \
macro(TextAreasAreResizable, textAreasAreResizable, Bool, bool, true) \
+ macro(JavaScriptCanOpenWindowsAutomatically, javaScriptCanOpenWindowsAutomatically, Bool, bool, true) \
macro(NeedsSiteSpecificQuirks, needsSiteSpecificQuirks, Bool, bool, false) \
macro(AcceleratedCompositingEnabled, acceleratedCompositingEnabled, Bool, bool, true) \
macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index c89a3e4..1553664 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -130,6 +130,16 @@ bool WKPreferencesGetJavaEnabled(WKPreferencesRef preferencesRef)
return toImpl(preferencesRef)->javaEnabled();
}
+void WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferencesRef, bool javaScriptCanOpenWindowsAutomatically)
+{
+ toImpl(preferencesRef)->setJavaScriptCanOpenWindowsAutomatically(javaScriptCanOpenWindowsAutomatically);
+}
+
+bool WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->javaScriptCanOpenWindowsAutomatically();
+}
+
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 7acd05f..00478b1 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -72,7 +72,11 @@ WK_EXPORT bool WKPreferencesGetPluginsEnabled(WKPreferencesRef preferences);
// Defaults to true.
WK_EXPORT void WKPreferencesSetJavaEnabled(WKPreferencesRef preferences, bool javaEnabled);
WK_EXPORT bool WKPreferencesGetJavaEnabled(WKPreferencesRef preferences);
-
+
+// Defaults to true.
+WK_EXPORT void WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferences, bool javaScriptCanOpenWindowsAutomatically);
+WK_EXPORT bool WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferences);
+
WK_EXPORT void WKPreferencesSetStandardFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
WK_EXPORT WKStringRef WKPreferencesCopyStandardFontFamily(WKPreferencesRef preferencesRef);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 1434174..d5468cb 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -902,11 +902,11 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
settings->setDeveloperExtrasEnabled(store.getBoolValueForKey(WebPreferencesKey::developerExtrasEnabledKey()));
settings->setTextAreasAreResizable(store.getBoolValueForKey(WebPreferencesKey::textAreasAreResizableKey()));
settings->setNeedsSiteSpecificQuirks(store.getBoolValueForKey(WebPreferencesKey::needsSiteSpecificQuirksKey()));
+ settings->setJavaScriptCanOpenWindowsAutomatically(store.getBoolValueForKey(WebPreferencesKey::javaScriptCanOpenWindowsAutomaticallyKey()));
settings->setMinimumFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumFontSizeKey()));
settings->setMinimumLogicalFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumLogicalFontSizeKey()));
settings->setDefaultFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFontSizeKey()));
settings->setDefaultFixedFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
- settings->setJavaScriptCanOpenWindowsAutomatically(true);
#if PLATFORM(WIN)
// Temporarily turn off accelerated compositing until we have a good solution for rendering it.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 525594a..7b95f63 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-02 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ WebKit2 needs API to turn on popup blocking
+ https://bugs.webkit.org/show_bug.cgi?id=50407
+
+ * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+ (TestWebKitAPI::TEST):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+
2010-12-01 Tony Chang <tony at chromium.org>
Reviewed by Ojan Vafai.
diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp
index d4cd4b7..4c9d3cc 100644
--- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp
+++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp
@@ -70,6 +70,7 @@ TEST(WebKit2, WKPreferencesDefaults)
TEST_ASSERT(WKPreferencesGetFrameFlatteningEnabled(preference) == false);
TEST_ASSERT(WKPreferencesGetPluginsEnabled(preference) == true);
TEST_ASSERT(WKPreferencesGetJavaEnabled(preference) == true);
+ TEST_ASSERT(WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(preference) == true);
WKRetainPtr<WKStringRef> standardFontFamily(AdoptWK, WKPreferencesCopyStandardFontFamily(preference));
TEST_ASSERT(WKStringIsEqualToUTF8CString(standardFontFamily.get(), expectedStandardFontFamily));
WKRetainPtr<WKStringRef> fixedFontFamily(AdoptWK, WKPreferencesCopyFixedFontFamily(preference));
diff --git a/WebKitTools/WebKitTestRunner/TestController.cpp b/WebKitTools/WebKitTestRunner/TestController.cpp
index f182377..3ac97e2 100644
--- a/WebKitTools/WebKitTestRunner/TestController.cpp
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp
@@ -277,6 +277,7 @@ bool TestController::resetStateToConsistentValues()
WKPreferencesSetFontSmoothingLevel(preferences, kWKFontSmoothingLevelNoSubpixelAntiAliasing);
WKPreferencesSetXSSAuditorEnabled(preferences, false);
WKPreferencesSetDeveloperExtrasEnabled(preferences, true);
+ WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(preferences, true);
static WKStringRef standardFontFamily = WKStringCreateWithUTF8CString("Times");
static WKStringRef cursiveFontFamily = WKStringCreateWithUTF8CString("Apple Chancery");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list