Changeset 205379 in webkit

Timestamp:

Sep 2, 2016 3:52:13 PM (8 years ago)

Author:

Jonathan Bedard

Message:

WebKitTestRunner needs layoutTestController.setDashboardCompatibilityMode
​https://bugs.webkit.org/show_bug.cgi?id=42547
Source/WebKit2:

Reviewed by Darin Adler.

Added access to setUseDashBoardCompatibilityMode for WebKit2.
Note: this bug mistakenly called this function setDashboardCompatibilityMode, it is actually setUseDashboardCompatibilityMode.

• WebProcess/InjectedBundle/API/c/WKBundle.cpp:

(WKBundleSetUseDashboardCompatibilityMode): Added dashboard compatiblity mode setter.

• WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: Ditto.
• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::setUseDashboardCompatibilityMode): Ditto.

• WebProcess/InjectedBundle/InjectedBundle.h: Ditto.

Tools:

Reviewed by Darin Adler.

Added JavaScript bindings and C++ implementation of setUseDashboardCompatibilityMode for the WebKit2 sTestRunner.
Note: this bug mistakenly called this function setDashboardCompatibilityMode, it is actually setUseDashboardCompatibilityMode.

• WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: Added dashboard compatiblity mode setter.
• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::beginTesting): Reset dashboard compatibility mode.

• WebKitTestRunner/InjectedBundle/TestRunner.cpp:

(WTR::TestRunner::setJavaScriptCanAccessClipboard): Code style changes.
(WTR::TestRunner::setPrivateBrowsingEnabled): Code style changes.
(WTR::TestRunner::setUseDashboardCompatibilityMode): Added dashboard compatiblity mode setter.
(WTR::TestRunner::setPopupBlockingEnabled): Code style changes.
(WTR::TestRunner::setAuthorAndUserStylesEnabled): Code style changes.
(WTR::TestRunner::addOriginAccessWhitelistEntry): Code style changes.

• WebKitTestRunner/InjectedBundle/TestRunner.h: Added dashboard compatiblity mode setter.

LayoutTests:

Reviewed by Darin Adler.

The addition of setUseDashboardCompatibilityMode to the WebKit2 TestRunner means the set of tests removed from the expected failures list now pass.
Note: this bug mistakenly called this function setDashboardCompatibilityMode, it is actually setUseDashboardCompatibilityMode.

• platform/ios-simulator-wk2/TestExpectations: Changed reason test was excluded.
• platform/wk2/TestExpectations: Remove tests which use setUseDashboardCompatibilityMode from expected failures.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-simulator-wk2/TestExpectations (modified) (5 diffs)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• LayoutTests/platform/wk2/TestExpectations (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (modified) (3 diffs)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-02  Jonathan Bedard  <jbedard@apple.com>
+
+        WebKitTestRunner needs layoutTestController.setDashboardCompatibilityMode
+        https://bugs.webkit.org/show_bug.cgi?id=42547
+
+        Reviewed by Darin Adler.
+
+        The addition of setUseDashboardCompatibilityMode to the WebKit2 TestRunner means the set of tests removed from the expected failures list now pass.
+        Note: this bug mistakenly called this function setDashboardCompatibilityMode, it is actually setUseDashboardCompatibilityMode.
+
+        * platform/ios-simulator-wk2/TestExpectations:  Changed reason test was excluded.
+        * platform/wk2/TestExpectations: Remove tests which use setUseDashboardCompatibilityMode from expected failures.
+
 2016-09-02  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations

@@ -91 +91 @@
 scrollbars/scrollbars-on-positioned-content.html [ Failure ]
 
-# WebKitTestRunner needs testRunner.setUseDashboardCompatibilityMode
-mathml/mathml-in-dashboard.html [ Skip ]
+# iOS doesn’t support dashboard.
+mathml/mathml-in-dashboard.html [ Failure ]
+svg/custom/embedded-svg-allowed-in-dashboard.xml [ Failure ]
+svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html [ Failure ]
+svg/custom/manually-parsed-svg-allowed-in-dashboard.html [ Failure ]
+svg/custom/svg-allowed-in-dashboard-object.html [ Failure ]
+http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard.html [ Failure ]
 
 # SVG tests that time out (these require EventSender)
@@ -265 +270 @@
 imported/mozilla/svg/text/text-shadow.svg [ ImageOnlyFailure ]
 svg/animations/mozilla/animateMotion-mpath-targetChange-1.svg [ ImageOnlyFailure ]
-svg/custom/embedded-svg-allowed-in-dashboard.xml [ Failure ]
 svg/custom/focus-event-handling-keyboard.xhtml [ Failure ]
 svg/custom/focus-event-handling.xhtml [ Failure ]
@@ -275 +279 @@
 svg/custom/image-clipped-hit.svg [ Failure ]
 svg/custom/invisible-text-after-scrolling.xhtml [ Failure ]
-svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html [ Failure ]
-svg/custom/manually-parsed-svg-allowed-in-dashboard.html [ Failure ]
 svg/custom/marker-changes.svg [ Failure ]
 svg/custom/non-scaling-stroke-update.svg [ ImageOnlyFailure ]
@@ -286 +288 @@
 svg/custom/polyline-hittest.svg [ Failure ]
 svg/custom/stroke-width-click.svg [ Failure ]
-svg/custom/svg-allowed-in-dashboard-object.html [ Failure ]
 svg/custom/svg-fonts-fallback.xhtml [ Failure ]
 svg/custom/text-hit-test.svg [ Failure ]
@@ -377 +378 @@
 http/tests/security/setDomainRelaxationForbiddenForURLScheme.html [ Failure ]
 http/tests/uri/css-href.php [ Failure ]
-http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard.html [ Failure ]
 
 # HTTP tests that assert:

trunk/LayoutTests/platform/win/TestExpectations

@@ -106 +106 @@
 http/tests/xmlhttprequest/cross-origin-cookie-storage.html [ Skip ]
 
-# TODO No Dashboard compatibility mode on Windows
+# No Dashboard compatibility mode on Windows.
 http/tests/xmlhttprequest/default-content-type-dashboard.html [ Skip ]
 http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard.html [ Skip ]

trunk/LayoutTests/platform/wk2/TestExpectations

@@ -114 +114 @@
 platform/mac/fast/text/justified-text-rect.html
 
-# WebKitTestRunner needs testRunner.setDashboardCompatibilityMode
-# <https://bugs.webkit.org/show_bug.cgi?id=42547>
-fast/canvas/canvas-gradient-addStop-error.html
-http/tests/xmlhttprequest/default-content-type-dashboard.html
-http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard.html
-svg/custom/embedded-svg-allowed-in-dashboard.xml
-svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html
-svg/custom/manually-parsed-svg-allowed-in-dashboard.html
-svg/custom/svg-allowed-in-dashboard-object.html
-
 # WebKitTestRunner needs testRunner.setMainFrameIsFirstResponder
 # <https://bugs.webkit.org/show_bug.cgi?id=42685>
@@ -302 +292 @@
 fast/frames/location-redirect-user-gesture.html
 fast/frames/meta-refresh-user-gesture.html
-
-# WebKitTestRunner needs testRunner.setUseDashboardCompatibilityMode
-platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk.html [ Skip ]
-mathml/mathml-in-dashboard.html [ Skip ]
 
 # WebKitTestRunner needs testRunner.addURLToRedirect

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-02  Jonathan Bedard  <jbedard@apple.com>
+
+        WebKitTestRunner needs layoutTestController.setDashboardCompatibilityMode
+        https://bugs.webkit.org/show_bug.cgi?id=42547
+
+        Reviewed by Darin Adler.
+
+        Added access to setUseDashBoardCompatibilityMode for WebKit2.
+        Note: this bug mistakenly called this function setDashboardCompatibilityMode, it is actually setUseDashboardCompatibilityMode.
+
+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+        (WKBundleSetUseDashboardCompatibilityMode): Added dashboard compatiblity mode setter.
+        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: Ditto.
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::setUseDashboardCompatibilityMode): Ditto.
+        * WebProcess/InjectedBundle/InjectedBundle.h: Ditto.
+
 2016-09-02  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

@@ -166 +166 @@
 }
 
+void WKBundleSetUseDashboardCompatibilityMode(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
+{
+    toImpl(bundleRef)->setUseDashboardCompatibilityMode(toImpl(pageGroupRef), enabled);
+}
+
 void WKBundleSetPopupBlockingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

@@ -52 +52 @@
 WK_EXPORT void WKBundleSetAutomaticLinkDetectionEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled);
 WK_EXPORT void WKBundleSetPrivateBrowsingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
+WK_EXPORT void WKBundleSetUseDashboardCompatibilityMode(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);

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -328 +328 @@
 }
 
+void InjectedBundle::setUseDashboardCompatibilityMode(WebPageGroupProxy* pageGroup, bool enabled)
+{
+#if ENABLE(DASHBOARD_SUPPORT)
+    for (auto& page : PageGroup::pageGroup(pageGroup->identifier())->pages())
+        page->settings().setUsesDashboardBackwardCompatibilityMode(enabled);
+#endif
+}
+
 void InjectedBundle::setPopupBlockingEnabled(WebPageGroupProxy* pageGroup, bool enabled)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

@@ -109 +109 @@
     void setAutomaticLinkDetectionEnabled(WebPageGroupProxy*, bool enabled);
     void setPrivateBrowsingEnabled(WebPageGroupProxy*, bool);
+    void setUseDashboardCompatibilityMode(WebPageGroupProxy*, bool);
     void setPopupBlockingEnabled(WebPageGroupProxy*, bool);
     void setAuthorAndUserStylesEnabled(WebPageGroupProxy*, bool);

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-02  Jonathan Bedard  <jbedard@apple.com>
+
+        WebKitTestRunner needs layoutTestController.setDashboardCompatibilityMode
+        https://bugs.webkit.org/show_bug.cgi?id=42547
+ 
+        Reviewed by Darin Adler.
+
+        Added JavaScript bindings and C++ implementation of setUseDashboardCompatibilityMode for the WebKit2 sTestRunner.
+        Note: this bug mistakenly called this function setDashboardCompatibilityMode, it is actually setUseDashboardCompatibilityMode.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: Added dashboard compatiblity mode setter.
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::beginTesting): Reset dashboard compatibility mode.
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::setJavaScriptCanAccessClipboard): Code style changes.
+        (WTR::TestRunner::setPrivateBrowsingEnabled): Code style changes.
+        (WTR::TestRunner::setUseDashboardCompatibilityMode): Added dashboard compatiblity mode setter.
+        (WTR::TestRunner::setPopupBlockingEnabled): Code style changes.
+        (WTR::TestRunner::setAuthorAndUserStylesEnabled): Code style changes.
+        (WTR::TestRunner::addOriginAccessWhitelistEntry): Code style changes.
+        * WebKitTestRunner/InjectedBundle/TestRunner.h: Added dashboard compatiblity mode setter.
+
 2016-09-02  Jer Noble  <jer.noble@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

@@ -65 +65 @@
     void setAutomaticLinkDetectionEnabled(boolean value);
     void setPrivateBrowsingEnabled(boolean value);
+    void setUseDashboardCompatibilityMode(boolean value);
     void setPopupBlockingEnabled(boolean value);
     void setAuthorAndUserStylesEnabled(boolean value);

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

@@ -297 +297 @@
     WKBundleSetAutomaticLinkDetectionEnabled(m_bundle, m_pageGroup, false);
     WKBundleSetPrivateBrowsingEnabled(m_bundle, m_pageGroup, false);
+    WKBundleSetUseDashboardCompatibilityMode(m_bundle, m_pageGroup, false);
     WKBundleSetAuthorAndUserStylesEnabled(m_bundle, m_pageGroup, true);
     WKBundleSetFrameFlatteningEnabled(m_bundle, m_pageGroup, false);

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

@@ -409 +409 @@
 {
     auto& injectedBundle = InjectedBundle::singleton();
-     WKBundleSetJavaScriptCanAccessClipboard(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
+    WKBundleSetJavaScriptCanAccessClipboard(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
 }
 
@@ -421 +421 @@
 {
     auto& injectedBundle = InjectedBundle::singleton();
-     WKBundleSetPrivateBrowsingEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
-}
-
+    WKBundleSetPrivateBrowsingEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
+}
+
+void TestRunner::setUseDashboardCompatibilityMode(bool enabled)
+{
+#if ENABLE(DASHBOARD_SUPPORT)
+    auto& injectedBundle = InjectedBundle::singleton();
+    WKBundleSetUseDashboardCompatibilityMode(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
+#endif
+}
+    
 void TestRunner::setPopupBlockingEnabled(bool enabled)
 {
     auto& injectedBundle = InjectedBundle::singleton();
-     WKBundleSetPopupBlockingEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
+    WKBundleSetPopupBlockingEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
 }
 
@@ -433 +441 @@
 {
     auto& injectedBundle = InjectedBundle::singleton();
-     WKBundleSetAuthorAndUserStylesEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
+    WKBundleSetAuthorAndUserStylesEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
 }
 

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

@@ -112 +112 @@
     void setAutomaticLinkDetectionEnabled(bool);
     void setPrivateBrowsingEnabled(bool);
+    void setUseDashboardCompatibilityMode(bool);
     void setPopupBlockingEnabled(bool);
     void setAuthorAndUserStylesEnabled(bool);