Diff
Modified: trunk/LayoutTests/ChangeLog (105883 => 105884)
--- trunk/LayoutTests/ChangeLog 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/LayoutTests/ChangeLog 2012-01-25 17:21:33 UTC (rev 105884)
@@ -1,3 +1,14 @@
+2012-01-25 Nándor Huszka <[email protected]>
+
+ [WK2] WebKitTestRunner needs layoutTestController.setPopupBlockingEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=63458
+
+ Reviewed by Adam Roben.
+
+ Unskip tests which do not fail now.
+
+ * platform/wk2/Skipped:
+
2012-01-25 Philippe Normand <[email protected]>
Unreviewed, GTK rebaseline and skipping 2 new test failures.
Modified: trunk/LayoutTests/platform/wk2/Skipped (105883 => 105884)
--- trunk/LayoutTests/platform/wk2/Skipped 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/LayoutTests/platform/wk2/Skipped 2012-01-25 17:21:33 UTC (rev 105884)
@@ -874,24 +874,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=71896
http/tests/security/contentSecurityPolicy/block-mixed-content-hides-warning.html
-# WebKitTestRunner needs layoutTestController.setPopupBlockingEnabled
-# https://bugs.webkit.org/show_bug.cgi?id=63458
-fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
-fast/events/popup-blocked-from-iframe-src.html
-fast/events/popup-allowed-from-gesture-initiated-event.html
-fast/events/popup-allowed-from-gesture-initiated-form-submit.html
-fast/events/popup-blocked-from-fake-button-click.html
-fast/events/popup-blocked-from-fake-focus.html
-fast/events/popup-blocked-from-fake-user-gesture.html
-fast/events/popup-blocked-from-history-reload.html
-fast/events/popup-blocked-from-iframe-script.html
-fast/events/popup-blocked-from-mousemove.html
-fast/events/popup-blocked-from-untrusted-mouse-click.html
-fast/events/popup-blocked-from-window-open.html
-fast/events/popup-blocked-to-post-blank.html
-fast/events/popup-blocking-timers.html
-plugins/plugin-initiate-popup-window.html
-
# WebKitTestRunner needs an implementation of allowRoundingHacks
# http://webkit.org/b/63477
platform/mac/fast/text/rounding-hacks.html
@@ -1241,6 +1223,7 @@
fast/dom/StyleSheet/detached-style.html
fast/dom/Window/window-appendages-cleared.html
fast/dom/tab-in-right-alignment.html
+fast/events/popup-blocked-from-fake-user-gesture.html
fast/frames/frame-element-name.html
fast/frames/iframe-onload-remove-self-no-crash.html
fast/frames/iframe-reparenting-adopt-node.html
@@ -1280,6 +1263,7 @@
media/controls-styling.html
platform/mac/fast/loader/non-html-load-event.html
plugins/embed-attributes-style.html
+plugins/plugin-initiate-popup-window.html
storage/open-database-while-transaction-in-progress.html
svg/custom/clip-path-referencing-use2.svg
svg/dom/fuzz-path-parser.html
Modified: trunk/Source/WebKit2/ChangeLog (105883 => 105884)
--- trunk/Source/WebKit2/ChangeLog 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-25 17:21:33 UTC (rev 105884)
@@ -1,3 +1,20 @@
+2012-01-25 Nándor Huszka <[email protected]>
+
+ [WK2] WebKitTestRunner needs layoutTestController.setPopupBlockingEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=63458
+
+ Reviewed by Adam Roben.
+
+ Implement the setPopupBlockingEnabled method.
+
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleSetPrivateBrowsingEnabled):
+ (WKBundleSetPopupBlockingEnabled):
+ * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setPopupBlockingEnabled):
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+
2012-01-25 Yael Aharon <[email protected]>
[Qt] Build fix when using force_static_libs_as_shared
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (105883 => 105884)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2012-01-25 17:21:33 UTC (rev 105884)
@@ -156,6 +156,11 @@
toImpl(bundleRef)->setPrivateBrowsingEnabled(toImpl(pageGroupRef), enabled);
}
+void WKBundleSetPopupBlockingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
+{
+ toImpl(bundleRef)->setPopupBlockingEnabled(toImpl(pageGroupRef), enabled);
+}
+
void WKBundleSwitchNetworkLoaderToNewTestingSession(WKBundleRef bundleRef)
{
toImpl(bundleRef)->switchNetworkLoaderToNewTestingSession();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (105883 => 105884)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2012-01-25 17:21:33 UTC (rev 105884)
@@ -70,6 +70,7 @@
WK_EXPORT void WKBundleSetFrameFlatteningEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
WK_EXPORT void WKBundleSetJavaScriptCanAccessClipboard(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
WK_EXPORT void WKBundleSetPrivateBrowsingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
+WK_EXPORT void WKBundleSetPopupBlockingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
WK_EXPORT void WKBundleSetAuthorAndUserStylesEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
WK_EXPORT void WKBundleClearAllDatabases(WKBundleRef bundle);
WK_EXPORT void WKBundleSetDatabaseQuota(WKBundleRef bundle, uint64_t);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (105883 => 105884)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-01-25 17:21:33 UTC (rev 105884)
@@ -159,6 +159,14 @@
(*iter)->settings()->setPrivateBrowsingEnabled(enabled);
}
+void InjectedBundle::setPopupBlockingEnabled(WebPageGroupProxy* pageGroup, bool enabled)
+{
+ const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
+ HashSet<Page*>::const_iterator end = pages.end();
+ for (HashSet<Page*>::const_iterator iter = pages.begin(); iter != end; ++iter)
+ (*iter)->settings()->setJavaScriptCanOpenWindowsAutomatically(!enabled);
+}
+
void InjectedBundle::switchNetworkLoaderToNewTestingSession()
{
#if USE(CFURLSTORAGESESSIONS)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (105883 => 105884)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-01-25 17:21:33 UTC (rev 105884)
@@ -103,6 +103,7 @@
void setFrameFlatteningEnabled(WebPageGroupProxy*, bool);
void setJavaScriptCanAccessClipboard(WebPageGroupProxy*, bool);
void setPrivateBrowsingEnabled(WebPageGroupProxy*, bool);
+ void setPopupBlockingEnabled(WebPageGroupProxy*, bool);
void switchNetworkLoaderToNewTestingSession();
void setAuthorAndUserStylesEnabled(WebPageGroupProxy*, bool);
void addOriginAccessWhitelistEntry(const String&, const String&, const String&, bool);
Modified: trunk/Tools/ChangeLog (105883 => 105884)
--- trunk/Tools/ChangeLog 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Tools/ChangeLog 2012-01-25 17:21:33 UTC (rev 105884)
@@ -1,3 +1,17 @@
+2012-01-25 Nándor Huszka <[email protected]>
+
+ [WK2] WebKitTestRunner needs layoutTestController.setPopupBlockingEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=63458
+
+ Reviewed by Adam Roben.
+
+ Implement the setPopupBlockingEnabled method.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+ (WTR::LayoutTestController::setPopupBlockingEnabled):
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+
2012-01-24 Balazs Kelemen <[email protected]>
[Qt] Cleanup testfonts handling
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl (105883 => 105884)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl 2012-01-25 17:21:33 UTC (rev 105884)
@@ -54,6 +54,7 @@
void setFrameFlatteningEnabled(in boolean value);
void setJavaScriptCanAccessClipboard(in boolean value);
void setPrivateBrowsingEnabled(in boolean value);
+ void setPopupBlockingEnabled(in boolean value);
void setAuthorAndUserStylesEnabled(in boolean value);
void addOriginAccessWhitelistEntry(in DOMString sourceOrigin, in DOMString destinationProtocol, in DOMString destinationHost, in boolean allowDestinationSubdomains);
void removeOriginAccessWhitelistEntry(in DOMString sourceOrigin, in DOMString destinationProtocol, in DOMString destinationHost, in boolean allowDestinationSubdomains);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp (105883 => 105884)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp 2012-01-25 17:21:33 UTC (rev 105884)
@@ -378,6 +378,11 @@
WKBundleSetPrivateBrowsingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
}
+void LayoutTestController::setPopupBlockingEnabled(bool enabled)
+{
+ WKBundleSetPopupBlockingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
+}
+
void LayoutTestController::setAuthorAndUserStylesEnabled(bool enabled)
{
WKBundleSetAuthorAndUserStylesEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h (105883 => 105884)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h 2012-01-25 17:18:29 UTC (rev 105883)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h 2012-01-25 17:21:33 UTC (rev 105884)
@@ -85,6 +85,7 @@
void setFrameFlatteningEnabled(bool);
void setJavaScriptCanAccessClipboard(bool);
void setPrivateBrowsingEnabled(bool);
+ void setPopupBlockingEnabled(bool);
void setAuthorAndUserStylesEnabled(bool);
void setCustomPolicyDelegate(bool enabled, bool permissive = false);
void addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains);
