Backed out changeset 7141b7088a89 (bug 1161634)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 06 May 2015 17:06:46 +0200
changeset 273984 5eb58823f834f93f0dc3f857c0b1b39b8d01cedb
parent 273983 ffa79d70878f731b772ecf7a6d26e24eb8eaa5cb
child 273985 d4462013432aff6af7be3767b7437a08a99797b2
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1161634
milestone40.0a1
backs out7141b7088a8933bfaaefd9e46318ed4ebb2dd021
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 7141b7088a89 (bug 1161634)
gfx/layers/apz/test/apz_test_native_event_utils.js
gfx/layers/apz/test/mochitest.ini
gfx/layers/apz/test/test_wheel_scroll.html
--- a/gfx/layers/apz/test/apz_test_native_event_utils.js
+++ b/gfx/layers/apz/test/apz_test_native_event_utils.js
@@ -12,26 +12,24 @@ function getPlatform() {
   }
   return "unknown";
 }
 
 function nativeVerticalWheelEventMsg() {
   switch (getPlatform()) {
     case "windows": return 0x020A; // WM_MOUSEWHEEL
     case "mac": return 0; // value is unused, can be anything
-    case "linux": return 4; // value is unused, pass GDK_SCROLL_SMOOTH anyway
   }
   throw "Native wheel events not supported on platform " + getPlatform();
 }
 
 function nativeHorizontalWheelEventMsg() {
   switch (getPlatform()) {
     case "windows": return 0x020E; // WM_MOUSEHWHEEL
     case "mac": return 0; // value is unused, can be anything
-    case "linux": return 4; // value is unused, pass GDK_SCROLL_SMOOTH anyway
   }
   throw "Native wheel events not supported on platform " + getPlatform();
 }
 
 // Synthesizes a native mousewheel event and returns immediately. This does not
 // guarantee anything; you probably want to use one of the other functions below
 // which actually wait for results.
 // aX and aY are relative to |window|'s top-left. aDeltaX and aDeltaY
--- a/gfx/layers/apz/test/mochitest.ini
+++ b/gfx/layers/apz/test/mochitest.ini
@@ -5,9 +5,9 @@ support-files =
   helper_bug982141.html
   helper_bug1151663.html
 tags = apz
 [test_bug982141.html]
 skip-if = toolkit != 'gonk'  # bug 991198
 [test_bug1151663.html]
 skip-if = toolkit != 'gonk'  # bug 991198
 [test_wheel_scroll.html]
-skip-if = (os == 'android') || (os == 'b2g') # wheel events not supported
+skip-if = toolkit != 'windows' && toolkit != 'cocoa'
--- a/gfx/layers/apz/test/test_wheel_scroll.html
+++ b/gfx/layers/apz/test/test_wheel_scroll.html
@@ -94,23 +94,16 @@ function continueTest() {
   var ret = gTestContinuation.next();
   if (ret.done) {
     SimpleTest.finish();
   } else {
     is(ret.value, true, "Wheel event successfully synthesized");
   }
 }
 
-function startTest() {
-  // If we allow smooth scrolling the "smooth" scrolling may cause the page to
-  // glide past the scrollbox (which is supposed to stop the scrolling) and so
-  // we might end up at the bottom of the page.
-  SpecialPowers.pushPrefEnv({"set": [["general.smoothScroll", false]]}, continueTest);
-}
-
 SimpleTest.waitForExplicitFinish();
-SimpleTest.waitForFocus(startTest, window);
+SimpleTest.waitForFocus(continueTest, window);
 
 </script>
 </pre>
 
 </body>
 </html>