Changeset 209073 in webkit

Timestamp:

Nov 29, 2016 9:16:08 AM (7 years ago)

Author:

Simon Fraser

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (1 diff)
• WebKitTestRunner/ios/PlatformWebViewIOS.mm (modified) (1 diff)
• WebKitTestRunner/mac/PlatformWebViewMac.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-11-29  Simon Fraser  <simon.fraser@apple.com>
+
+        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  <ryanhaddad@apple.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -648 +648 @@
     WKPreferencesSetTabToLinksEnabled(preferences, false);
     WKPreferencesSetInteractiveFormValidationEnabled(preferences, true);
+
     WKPreferencesSetMockScrollbarsEnabled(preferences, options.useMockScrollbars);
     WKPreferencesSetNeedsSiteSpecificQuirks(preferences, options.needsSiteSpecificQuirks);

trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm

@@ -279 +279 @@
 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;
 

trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm

@@ -274 +274 @@
 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;