Turn on threaded scrolling by default in the tests

https://bugs.webkit.org/show_bug.cgi?id=149377

Reviewed by Simon Fraser.

* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::updatePlatformSpecificTestOptionsForTest):
(WTR::shouldUseThreadedScrolling): Deleted.
Turn on threaded scrolling by default.

* compositing/geometry/fixed-position-flipped-writing-mode.html:
* compositing/layer-creation/no-compositing-for-sticky.html:
* compositing/overflow/automatically-opt-into-composited-scrolling.html:
* compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html:
* compositing/overflow/composited-scrolling-creates-a-stacking-container.html:
* compositing/overflow/composited-scrolling-paint-phases.html:
* compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html:
* compositing/overflow/dynamic-composited-scrolling-status.html:
* compositing/overflow/iframe-inside-overflow-clipping.html:
* compositing/overflow/nested-scrolling.html:
* compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html:
* compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer.html:
* compositing/overflow/scrolling-content-clip-to-viewport.html:
* compositing/overflow/scrolling-without-painting.html:
* compositing/overflow/textarea-scroll-touch.html:
* compositing/overflow/updating-scrolling-content.html:
* compositing/rtl/rtl-fixed-overflow-scrolled.html:
* compositing/rtl/rtl-overflow-scrolling.html:
* fast/block/positioning/rtl-fixed-positioning.html:
* fast/block/positioning/vertical-rl/fixed-positioning.html:
* fast/dom/horizontal-scrollbar-in-rtl.html:
* fast/dom/horizontal-scrollbar-when-dir-change.html:
* fast/dom/scroll-reveal-left-overflow.html:
* fast/dom/scroll-reveal-top-overflow.html:
* fast/dom/vertical-scrollbar-when-dir-change.html:
* fast/multicol/pagination/RightToLeft-rl-hittest.html:
* scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html:
* scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html:
* swipe/main-frame-pinning-requirement.html:
Turn off threaded scrolling in the cases where it sensibly affects the test result.
These cases are:
        - tests that use scrollTo or similar, and then depend on the
          scrolling happening synchronously

        - tests that use setAcceleratedCompositingForOverflowScrollEnabled,
          which asserts if combined with threaded scrolling

* fast/text/combining-character-sequence-vertical.html:
* fast/text/descent-clip-in-scaled-page.html:
* fast/text/descent-clip-in-scaled-page-expected.html:
* fast/text/vertical-quotation-marks.html:
Turn off threaded scrolling in three tests where it shouldn't affect the test result,
but for some reason does.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1937c8e..9ab7461 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,54 @@
+2015-09-21  Tim Horton  <timothy_horton@apple.com>
+
+        Turn on threaded scrolling by default in the tests
+        https://bugs.webkit.org/show_bug.cgi?id=149377
+
+        Reviewed by Simon Fraser.
+
+        * compositing/geometry/fixed-position-flipped-writing-mode.html:
+        * compositing/layer-creation/no-compositing-for-sticky.html:
+        * compositing/overflow/automatically-opt-into-composited-scrolling.html:
+        * compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html:
+        * compositing/overflow/composited-scrolling-creates-a-stacking-container.html:
+        * compositing/overflow/composited-scrolling-paint-phases.html:
+        * compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html:
+        * compositing/overflow/dynamic-composited-scrolling-status.html:
+        * compositing/overflow/iframe-inside-overflow-clipping.html:
+        * compositing/overflow/nested-scrolling.html:
+        * compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html:
+        * compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer.html:
+        * compositing/overflow/scrolling-content-clip-to-viewport.html:
+        * compositing/overflow/scrolling-without-painting.html:
+        * compositing/overflow/textarea-scroll-touch.html:
+        * compositing/overflow/updating-scrolling-content.html:
+        * compositing/rtl/rtl-fixed-overflow-scrolled.html:
+        * compositing/rtl/rtl-overflow-scrolling.html:
+        * fast/block/positioning/rtl-fixed-positioning.html:
+        * fast/block/positioning/vertical-rl/fixed-positioning.html:
+        * fast/dom/horizontal-scrollbar-in-rtl.html:
+        * fast/dom/horizontal-scrollbar-when-dir-change.html:
+        * fast/dom/scroll-reveal-left-overflow.html:
+        * fast/dom/scroll-reveal-top-overflow.html:
+        * fast/dom/vertical-scrollbar-when-dir-change.html:
+        * fast/multicol/pagination/RightToLeft-rl-hittest.html:
+        * scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html:
+        * scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html:
+        * swipe/main-frame-pinning-requirement.html:
+        Turn off threaded scrolling in the cases where it sensibly affects the test result.
+        These cases are:
+                - tests that use scrollTo or similar, and then depend on the
+                  scrolling happening synchronously
+
+                - tests that use setAcceleratedCompositingForOverflowScrollEnabled,
+                  which asserts if combined with threaded scrolling
+
+        * fast/text/combining-character-sequence-vertical.html:
+        * fast/text/descent-clip-in-scaled-page.html:
+        * fast/text/descent-clip-in-scaled-page-expected.html:
+        * fast/text/vertical-quotation-marks.html:
+        Turn off threaded scrolling in three tests where it shouldn't affect the test result,
+        but for some reason does.
+
 2015-09-21  ChangSeok Oh  <changseok.oh@collabora.com>
 
         [GTK] media controls does not show up when playing video finishes.

diff --git a/LayoutTests/compositing/geometry/fixed-position-flipped-writing-mode.html b/LayoutTests/compositing/geometry/fixed-position-flipped-writing-mode.html
index 7ef795d..a06a689 100644 (file)
--- a/LayoutTests/compositing/geometry/fixed-position-flipped-writing-mode.html
+++ b/LayoutTests/compositing/geometry/fixed-position-flipped-writing-mode.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 
 <html>

diff --git a/LayoutTests/compositing/layer-creation/no-compositing-for-sticky.html b/LayoutTests/compositing/layer-creation/no-compositing-for-sticky.html
index af58b4b..44f46a4 100644 (file)
--- a/LayoutTests/compositing/layer-creation/no-compositing-for-sticky.html
+++ b/LayoutTests/compositing/layer-creation/no-compositing-for-sticky.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 
 <html>

diff --git a/LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html b/LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html
index 1e67b5d..c6d4c33 100644 (file)
--- a/LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html
+++ b/LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
    "http://www.w3.org/TR/html4/loose.dtd">
 

diff --git a/LayoutTests/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html b/LayoutTests/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html
index f235fc5..230bb8b 100644 (file)
--- a/LayoutTests/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html
+++ b/LayoutTests/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/compositing/overflow/composited-scrolling-creates-a-stacking-container.html b/LayoutTests/compositing/overflow/composited-scrolling-creates-a-stacking-container.html
index b7f8eb9..54037a3 100644 (file)
--- a/LayoutTests/compositing/overflow/composited-scrolling-creates-a-stacking-container.html
+++ b/LayoutTests/compositing/overflow/composited-scrolling-creates-a-stacking-container.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
    "http://www.w3.org/TR/html4/loose.dtd">
 

diff --git a/LayoutTests/compositing/overflow/composited-scrolling-paint-phases.html b/LayoutTests/compositing/overflow/composited-scrolling-paint-phases.html
index e5d4725..03522c2 100644 (file)
--- a/LayoutTests/compositing/overflow/composited-scrolling-paint-phases.html
+++ b/LayoutTests/compositing/overflow/composited-scrolling-paint-phases.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html lang="en">
 <head>

diff --git a/LayoutTests/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html b/LayoutTests/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html
index a412eab..492ed05 100644 (file)
--- a/LayoutTests/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html
+++ b/LayoutTests/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html lang="en">
 <head>

diff --git a/LayoutTests/compositing/overflow/dynamic-composited-scrolling-status.html b/LayoutTests/compositing/overflow/dynamic-composited-scrolling-status.html
index 4724160..318eba0 100644 (file)
--- a/LayoutTests/compositing/overflow/dynamic-composited-scrolling-status.html
+++ b/LayoutTests/compositing/overflow/dynamic-composited-scrolling-status.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/compositing/overflow/iframe-inside-overflow-clipping.html b/LayoutTests/compositing/overflow/iframe-inside-overflow-clipping.html
index 5dd29fc..5e2576e 100644 (file)
--- a/LayoutTests/compositing/overflow/iframe-inside-overflow-clipping.html
+++ b/LayoutTests/compositing/overflow/iframe-inside-overflow-clipping.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/compositing/overflow/nested-scrolling.html b/LayoutTests/compositing/overflow/nested-scrolling.html
index d1fb972..a3a6d69 100644 (file)
--- a/LayoutTests/compositing/overflow/nested-scrolling.html
+++ b/LayoutTests/compositing/overflow/nested-scrolling.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 
 <html>

diff --git a/LayoutTests/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html b/LayoutTests/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html
index 969ae04..5d3df1e 100644 (file)
--- a/LayoutTests/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html
+++ b/LayoutTests/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer.html b/LayoutTests/compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer.html
index a6611bb..3fed03c 100644 (file)
--- a/LayoutTests/compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer.html
+++ b/LayoutTests/compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html lang="en">
 <head>

diff --git a/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport.html b/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport.html
index 2c9b638..cc8c657 100644 (file)
--- a/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport.html
+++ b/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/compositing/overflow/scrolling-without-painting.html b/LayoutTests/compositing/overflow/scrolling-without-painting.html
index f8016fa..0a5d7b0 100644 (file)
--- a/LayoutTests/compositing/overflow/scrolling-without-painting.html
+++ b/LayoutTests/compositing/overflow/scrolling-without-painting.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 
 <!--

diff --git a/LayoutTests/compositing/overflow/textarea-scroll-touch.html b/LayoutTests/compositing/overflow/textarea-scroll-touch.html
index dfd2b34..8aea0a6 100644 (file)
--- a/LayoutTests/compositing/overflow/textarea-scroll-touch.html
+++ b/LayoutTests/compositing/overflow/textarea-scroll-touch.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/compositing/overflow/updating-scrolling-content.html b/LayoutTests/compositing/overflow/updating-scrolling-content.html
index e9e3bdb..8598766 100644 (file)
--- a/LayoutTests/compositing/overflow/updating-scrolling-content.html
+++ b/LayoutTests/compositing/overflow/updating-scrolling-content.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 
 <!--

diff --git a/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html b/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html
index 84d2d00..0607e44 100644 (file)
--- a/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html
+++ b/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <html>
 <head>
 <style>

diff --git a/LayoutTests/compositing/rtl/rtl-overflow-scrolling.html b/LayoutTests/compositing/rtl/rtl-overflow-scrolling.html
index 6fe6519..fd13d4a 100644 (file)
--- a/LayoutTests/compositing/rtl/rtl-overflow-scrolling.html
+++ b/LayoutTests/compositing/rtl/rtl-overflow-scrolling.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <html>
 <head>
 <script type="text/javascript">

diff --git a/LayoutTests/fast/block/positioning/rtl-fixed-positioning.html b/LayoutTests/fast/block/positioning/rtl-fixed-positioning.html
index 9eac74d..74352d2 100644 (file)
--- a/LayoutTests/fast/block/positioning/rtl-fixed-positioning.html
+++ b/LayoutTests/fast/block/positioning/rtl-fixed-positioning.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!doctype html>
 <html dir='rtl'>
 <head>

diff --git a/LayoutTests/fast/block/positioning/vertical-rl/fixed-positioning.html b/LayoutTests/fast/block/positioning/vertical-rl/fixed-positioning.html
index 2e28a7c..22eadf7 100644 (file)
--- a/LayoutTests/fast/block/positioning/vertical-rl/fixed-positioning.html
+++ b/LayoutTests/fast/block/positioning/vertical-rl/fixed-positioning.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!doctype html>
 <html dir="rtl">
 <head>

diff --git a/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html b/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html
index 8c75f87..de0ad1b 100644 (file)
--- a/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html
+++ b/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <html dir=rtl>
     <head>
         <script language="javascript">

diff --git a/LayoutTests/fast/dom/horizontal-scrollbar-when-dir-change.html b/LayoutTests/fast/dom/horizontal-scrollbar-when-dir-change.html
index 6816e8c..5ef1e47 100644 (file)
--- a/LayoutTests/fast/dom/horizontal-scrollbar-when-dir-change.html
+++ b/LayoutTests/fast/dom/horizontal-scrollbar-when-dir-change.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <html>
 <head>
 <script>

diff --git a/LayoutTests/fast/dom/scroll-reveal-left-overflow.html b/LayoutTests/fast/dom/scroll-reveal-left-overflow.html
index 4701712..19875d6 100644 (file)
--- a/LayoutTests/fast/dom/scroll-reveal-left-overflow.html
+++ b/LayoutTests/fast/dom/scroll-reveal-left-overflow.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <html>
     <head>
         <script>

diff --git a/LayoutTests/fast/dom/scroll-reveal-top-overflow.html b/LayoutTests/fast/dom/scroll-reveal-top-overflow.html
index 3078158..482bbea 100644 (file)
--- a/LayoutTests/fast/dom/scroll-reveal-top-overflow.html
+++ b/LayoutTests/fast/dom/scroll-reveal-top-overflow.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <html dir=rtl style="-webkit-writing-mode:vertical-lr">
     <head>
         <script>

diff --git a/LayoutTests/fast/dom/vertical-scrollbar-when-dir-change.html b/LayoutTests/fast/dom/vertical-scrollbar-when-dir-change.html
index db3ba9a..72b05f3 100644 (file)
--- a/LayoutTests/fast/dom/vertical-scrollbar-when-dir-change.html
+++ b/LayoutTests/fast/dom/vertical-scrollbar-when-dir-change.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <html>
 <head>
 <script>

diff --git a/LayoutTests/fast/multicol/pagination/RightToLeft-rl-hittest.html b/LayoutTests/fast/multicol/pagination/RightToLeft-rl-hittest.html
index fb36c8a..06ccda5 100644 (file)
--- a/LayoutTests/fast/multicol/pagination/RightToLeft-rl-hittest.html
+++ b/LayoutTests/fast/multicol/pagination/RightToLeft-rl-hittest.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 
 <html>

diff --git a/LayoutTests/fast/text/combining-character-sequence-vertical.html b/LayoutTests/fast/text/combining-character-sequence-vertical.html
index bf3d5a3..7822a61 100644 (file)
--- a/LayoutTests/fast/text/combining-character-sequence-vertical.html
+++ b/LayoutTests/fast/text/combining-character-sequence-vertical.html
@@ -1,3 +1,5 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
+<!-- FIXME: It's not clear why threaded scrolling causes this test to fail. -->
 <div style="width: 100px; font-family: 'geeza pro'; font-size: 48px; -webkit-writing-mode: vertical-rl;">
     &#x0628;&#x062d;&#x0653;
 </div>

diff --git a/LayoutTests/fast/text/descent-clip-in-scaled-page-expected.html b/LayoutTests/fast/text/descent-clip-in-scaled-page-expected.html
index 90bbe50..c8bce7e 100644 (file)
--- a/LayoutTests/fast/text/descent-clip-in-scaled-page-expected.html
+++ b/LayoutTests/fast/text/descent-clip-in-scaled-page-expected.html
@@ -1,3 +1,5 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
+<!-- FIXME: It's not clear why threaded scrolling causes this test to fail. -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/fast/text/descent-clip-in-scaled-page.html b/LayoutTests/fast/text/descent-clip-in-scaled-page.html
index b2c86ef..fd85628 100644 (file)
--- a/LayoutTests/fast/text/descent-clip-in-scaled-page.html
+++ b/LayoutTests/fast/text/descent-clip-in-scaled-page.html
@@ -1,3 +1,6 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
+<!-- FIXME: It's not clear why threaded scrolling causes this test to fail. -->
+<!-- Please note that the expected file also has threaded scrolling turned off. -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/fast/text/vertical-quotation-marks.html b/LayoutTests/fast/text/vertical-quotation-marks.html
index 0366350..5bf2445 100644 (file)
--- a/LayoutTests/fast/text/vertical-quotation-marks.html
+++ b/LayoutTests/fast/text/vertical-quotation-marks.html
@@ -1,3 +1,5 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
+<!-- FIXME: It's not clear why threaded scrolling causes this test to fail. -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html b/LayoutTests/scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html
index b70bdcc..b6c73ec 100644 (file)
--- a/LayoutTests/scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html
+++ b/LayoutTests/scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html b/LayoutTests/scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html
index 79ca12f..498e3e9 100644 (file)
--- a/LayoutTests/scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html
+++ b/LayoutTests/scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ useThreadedScrolling=false ] -->
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/LayoutTests/swipe/main-frame-pinning-requirement.html b/LayoutTests/swipe/main-frame-pinning-requirement.html
index 9aa7afb..6215544 100644 (file)
--- a/LayoutTests/swipe/main-frame-pinning-requirement.html
+++ b/LayoutTests/swipe/main-frame-pinning-requirement.html
@@ -1,7 +1,3 @@
-<!-- webkit-test-runner [ useThreadedScrolling=true ] -->
-<!-- This test has to use threaded scrolling because we don't
-properly support swipe pinning with the antique scrolling path. -->
-
 <head>
 <style>
 html {

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 076692c..93e1f93 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2015-09-21  Tim Horton  <timothy_horton@apple.com>
+
+        Turn on threaded scrolling by default in the tests
+        https://bugs.webkit.org/show_bug.cgi?id=149377
+
+        Reviewed by Simon Fraser.
+
+        * WebKitTestRunner/mac/TestControllerMac.mm:
+        (WTR::TestController::updatePlatformSpecificTestOptionsForTest):
+        (WTR::shouldUseThreadedScrolling): Deleted.
+        Turn on threaded scrolling by default.
+
 2015-09-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] run-gtk-tests doesn't provide feedback about crashing google tests

diff --git a/Tools/WebKitTestRunner/mac/TestControllerMac.mm b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
index af393b2..11c5e85 100644 (file)
--- a/Tools/WebKitTestRunner/mac/TestControllerMac.mm
+++ b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
@@ -77,11 +77,6 @@ void TestController::initializeTestPluginDirectory()
     m_testPluginDirectory.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath]));
 }
 
-static bool shouldUseThreadedScrolling(const TestInvocation& test)
-{
-    return test.urlContains("tiled-drawing/");
-}
-
 void TestController::platformResetPreferencesToConsistentValues()
 {
 }
@@ -97,7 +92,7 @@ void TestController::platformResetStateToConsistentValues()
 
 void TestController::updatePlatformSpecificTestOptionsForTest(TestOptions& options, const TestInvocation& test) const
 {
-    options.useThreadedScrolling = shouldUseThreadedScrolling(test);
+    options.useThreadedScrolling = true;
     options.useRemoteLayerTree = shouldUseRemoteLayerTree();
     options.shouldShowWebView = shouldShowWebView();
 }