Backed out changeset 7141b7088a89 (bug 1161634)

This commit is contained in:
Carsten "Tomcat" Book 2015-05-06 17:06:46 +02:00
parent 00a9ca978f
commit 93ef20689e
3 changed files with 2 additions and 11 deletions

View File

@ -17,7 +17,6 @@ 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();
}
@ -26,7 +25,6 @@ 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();
}

View File

@ -10,4 +10,4 @@ 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'

View File

@ -99,15 +99,8 @@ function continueTest() {
}
}
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>