Title: [209073] trunk/Tools
Revision
209073
Author
[email protected]
Date
2016-11-29 09:16:08 -0800 (Tue, 29 Nov 2016)

Log Message

intersection-observer-entry-interface.html test fails on the bots
https://bugs.webkit.org/show_bug.cgi?id=165133

Reviewed by Darin Adler.

Tests that enabled Intersection Observer via <!-- webkit-test-runner [ enableIntersectionObserver=true ] -->
would fail sometimes, because TestController::ensureViewSupportsOptionsForTest() failed to check
to see if this option required creating a new web view, so would just use the old view without
even resetting preferences.

In general, TestController doesn't distinguish properly between options that require the creation
of a new view (like mock scrollbars), and those that can be simply reset as resetPreferencesToConsistentValues()
does.

Do the easy fix of having viewSupportsOptions() check options.enableIntersectionObserver. We should probably
just call resetPreferencesToConsistentValues() even when re-use the same view.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetPreferencesToConsistentValues):
* WebKitTestRunner/ios/PlatformWebViewIOS.mm:
(WTR::PlatformWebView::viewSupportsOptions):
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
(WTR::PlatformWebView::viewSupportsOptions):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (209072 => 209073)


--- trunk/Tools/ChangeLog	2016-11-29 17:14:45 UTC (rev 209072)
+++ trunk/Tools/ChangeLog	2016-11-29 17:16:08 UTC (rev 209073)
@@ -1,3 +1,29 @@
+2016-11-29  Simon Fraser  <[email protected]>
+
+        intersection-observer-entry-interface.html test fails on the bots
+        https://bugs.webkit.org/show_bug.cgi?id=165133
+
+        Reviewed by Darin Adler.
+        
+        Tests that enabled Intersection Observer via <!-- webkit-test-runner [ enableIntersectionObserver=true ] -->
+        would fail sometimes, because TestController::ensureViewSupportsOptionsForTest() failed to check
+        to see if this option required creating a new web view, so would just use the old view without
+        even resetting preferences.
+        
+        In general, TestController doesn't distinguish properly between options that require the creation
+        of a new view (like mock scrollbars), and those that can be simply reset as resetPreferencesToConsistentValues()
+        does.
+        
+        Do the easy fix of having viewSupportsOptions() check options.enableIntersectionObserver. We should probably
+        just call resetPreferencesToConsistentValues() even when re-use the same view.
+        
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetPreferencesToConsistentValues):
+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+        (WTR::PlatformWebView::viewSupportsOptions):
+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+        (WTR::PlatformWebView::viewSupportsOptions):
+
 2016-11-28  Ryan Haddad  <[email protected]>
 
         Unreviewed, rolling out r209008.

Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (209072 => 209073)


--- trunk/Tools/WebKitTestRunner/TestController.cpp	2016-11-29 17:14:45 UTC (rev 209072)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2016-11-29 17:16:08 UTC (rev 209073)
@@ -647,6 +647,7 @@
     WKPreferencesSetArtificialPluginInitializationDelayEnabled(preferences, false);
     WKPreferencesSetTabToLinksEnabled(preferences, false);
     WKPreferencesSetInteractiveFormValidationEnabled(preferences, true);
+
     WKPreferencesSetMockScrollbarsEnabled(preferences, options.useMockScrollbars);
     WKPreferencesSetNeedsSiteSpecificQuirks(preferences, options.needsSiteSpecificQuirks);
     WKPreferencesSetIntersectionObserverEnabled(preferences, options.enableIntersectionObserver);

Modified: trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (209072 => 209073)


--- trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm	2016-11-29 17:14:45 UTC (rev 209072)
+++ trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm	2016-11-29 17:16:08 UTC (rev 209073)
@@ -278,7 +278,10 @@
 
 bool PlatformWebView::viewSupportsOptions(const TestOptions& options) const
 {
-    if (m_options.overrideLanguages != options.overrideLanguages || m_options.needsSiteSpecificQuirks != options.needsSiteSpecificQuirks || m_options.useCharacterSelectionGranularity != options.useCharacterSelectionGranularity)
+    if (m_options.overrideLanguages != options.overrideLanguages
+        || m_options.needsSiteSpecificQuirks != options.needsSiteSpecificQuirks
+        || m_options.useCharacterSelectionGranularity != options.useCharacterSelectionGranularity
+        || m_options.enableIntersectionObserver != options.enableIntersectionObserver)
         return false;
 
     return true;

Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (209072 => 209073)


--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm	2016-11-29 17:14:45 UTC (rev 209072)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm	2016-11-29 17:16:08 UTC (rev 209073)
@@ -273,7 +273,11 @@
 
 bool PlatformWebView::viewSupportsOptions(const TestOptions& options) const
 {
-    if (m_options.useThreadedScrolling != options.useThreadedScrolling || m_options.overrideLanguages != options.overrideLanguages || m_options.useMockScrollbars != options.useMockScrollbars || m_options.needsSiteSpecificQuirks != options.needsSiteSpecificQuirks)
+    if (m_options.useThreadedScrolling != options.useThreadedScrolling
+        || m_options.overrideLanguages != options.overrideLanguages
+        || m_options.useMockScrollbars != options.useMockScrollbars
+        || m_options.needsSiteSpecificQuirks != options.needsSiteSpecificQuirks
+        || m_options.enableIntersectionObserver != options.enableIntersectionObserver)
         return false;
 
     return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to