[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:02:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 10fad573226e13bc09c0f8490323f11181c63895
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 6 06:50:21 2010 +0000
2010-09-05 Peter Kasting <pkasting at google.com>
Reviewed by Adam Barth.
Make Chromium/Mac generate continuous mousewheel events with the same wheelDelta values as Safari/Mac.
https://bugs.webkit.org/show_bug.cgi?id=45155
* fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt:
* fast/events/continuous-platform-wheelevent-in-scrolling-div.html:
* platform/chromium/fast/events: Removed.
* platform/chromium/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt: Removed.
2010-09-05 Peter Kasting <pkasting at google.com>
Reviewed by Adam Barth.
Make Chromium/Mac generate continuous mousewheel events with the same wheelDelta values as Safari/Mac.
https://bugs.webkit.org/show_bug.cgi?id=45155
* src/mac/WebInputEventFactory.mm:
(WebKit::WebInputEventFactory::mouseWheelEvent):
2010-09-05 Peter Kasting <pkasting at google.com>
Reviewed by Adam Barth.
Make Chromium/Mac generate continuous mousewheel events with the same wheelDelta values as Safari/Mac.
https://bugs.webkit.org/show_bug.cgi?id=45155
* DumpRenderTree/chromium/EventSender.cpp: Modify Chromium DRT mousewheel event generation to match new behavior on Mac.
(EventSender::handleMouseWheel):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66812 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 109fb47..c8c748f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-05 Peter Kasting <pkasting at google.com>
+
+ Reviewed by Adam Barth.
+
+ Make Chromium/Mac generate continuous mousewheel events with the same wheelDelta values as Safari/Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=45155
+
+ * fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt:
+ * fast/events/continuous-platform-wheelevent-in-scrolling-div.html:
+ * platform/chromium/fast/events: Removed.
+ * platform/chromium/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt: Removed.
+
2010-09-05 Kent Tamura <tkent at chromium.org>
Unreviewed, test expectation update.
diff --git a/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt b/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt
index 85d91cd..969ac56 100644
--- a/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt
+++ b/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt
@@ -1,6 +1,6 @@
-FAIL event.wheelDeltaY should be -24000. Was -600.
-FAIL event.wheelDeltaX should be -12000. Was -300.
-FAIL event.wheelDelta should be -24000. Was -600.
+PASS event.wheelDeltaY is window.expectedScrollTop*-3
+PASS event.wheelDeltaX is window.expectedScrollLeft*-3
+PASS event.wheelDelta is window.expectedScrollTop*-3
PASS div.scrollTop is window.expectedScrollTop
PASS div.scrollLeft is window.expectedScrollLeft
diff --git a/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div.html b/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div.html
index fec1041..7987560 100644
--- a/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div.html
+++ b/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div.html
@@ -39,13 +39,13 @@
function mousewheelHandler(e)
{
event = e;
- shouldBe("event.wheelDeltaY", "window.expectedScrollTop*-120");
- shouldBe("event.wheelDeltaX", "window.expectedScrollLeft*-120");
+ shouldBe("event.wheelDeltaY", "window.expectedScrollTop*-3");
+ shouldBe("event.wheelDeltaX", "window.expectedScrollLeft*-3");
if (e.wheelDeltaY)
- shouldBe("event.wheelDelta", "window.expectedScrollTop*-120");
+ shouldBe("event.wheelDelta", "window.expectedScrollTop*-3");
else
- shouldBe("event.wheelDelta", "window.expectedScrollLeft*-120");
+ shouldBe("event.wheelDelta", "window.expectedScrollLeft*-3");
}
</script>
</head>
diff --git a/LayoutTests/platform/chromium/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt b/LayoutTests/platform/chromium/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt
deleted file mode 100644
index 391dd6a..0000000
--- a/LayoutTests/platform/chromium/fast/events/continuous-platform-wheelevent-in-scrolling-div-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS event.wheelDeltaY is window.expectedScrollTop*-120
-PASS event.wheelDeltaX is window.expectedScrollLeft*-120
-PASS event.wheelDelta is window.expectedScrollTop*-120
-PASS div.scrollTop is window.expectedScrollTop
-PASS div.scrollLeft is window.expectedScrollLeft
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b0ac375..5cce799 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-05 Peter Kasting <pkasting at google.com>
+
+ Reviewed by Adam Barth.
+
+ Make Chromium/Mac generate continuous mousewheel events with the same wheelDelta values as Safari/Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=45155
+
+ * src/mac/WebInputEventFactory.mm:
+ (WebKit::WebInputEventFactory::mouseWheelEvent):
+
2010-09-05 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Joseph Pecoraro.
diff --git a/WebKit/chromium/src/mac/WebInputEventFactory.mm b/WebKit/chromium/src/mac/WebInputEventFactory.mm
index 694155f..b4e09c0 100644
--- a/WebKit/chromium/src/mac/WebInputEventFactory.mm
+++ b/WebKit/chromium/src/mac/WebInputEventFactory.mm
@@ -1178,22 +1178,19 @@ WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(NSEvent* event, NSView*
// the point delta data instead, since we cannot distinguish trackpad data
// from data from any other continuous device.
+ // Conversion between wheel delta amounts and number of pixels to scroll.
+ static const double scrollbarPixelsPerCocoaTick = 40.0;
+
if (CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventIsContinuous)) {
- result.wheelTicksY = result.deltaY =
- CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventPointDeltaAxis1);
- result.wheelTicksX = result.deltaX =
- CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventPointDeltaAxis2);
+ result.deltaX = CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventPointDeltaAxis2);
+ result.deltaY = CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventPointDeltaAxis1);
+ result.wheelTicksX = result.deltaX / scrollbarPixelsPerCocoaTick;
+ result.wheelTicksY = result.deltaY / scrollbarPixelsPerCocoaTick;
} else {
- result.wheelTicksY =
- CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventDeltaAxis1);
- result.wheelTicksX =
- CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventDeltaAxis2);
-
- // Convert wheel delta amount to a number of pixels to scroll.
- static const double scrollbarPixelsPerCocoaTick = 40.0;
-
result.deltaX = [event deltaX] * scrollbarPixelsPerCocoaTick;
result.deltaY = [event deltaY] * scrollbarPixelsPerCocoaTick;
+ result.wheelTicksY = CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventDeltaAxis1);
+ result.wheelTicksX = CGEventGetIntegerValueField(cgEvent, kCGScrollWheelEventDeltaAxis2);
}
result.timeStampSeconds = [event timestamp];
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bc9db82..50648b0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-05 Peter Kasting <pkasting at google.com>
+
+ Reviewed by Adam Barth.
+
+ Make Chromium/Mac generate continuous mousewheel events with the same wheelDelta values as Safari/Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=45155
+
+ * DumpRenderTree/chromium/EventSender.cpp: Modify Chromium DRT mousewheel event generation to match new behavior on Mac.
+ (EventSender::handleMouseWheel):
+
2010-09-05 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Joseph Pecoraro.
diff --git a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
index 243ec78..c2ba380 100644
--- a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
@@ -909,7 +909,10 @@ void EventSender::handleMouseWheel(const CppArgumentList& arguments, CppVariant*
event.wheelTicksY = static_cast<float>(vertical);
event.deltaX = event.wheelTicksX;
event.deltaY = event.wheelTicksY;
- if (!continuous) {
+ if (continuous) {
+ event.wheelTicksX /= scrollbarPixelsPerTick;
+ event.wheelTicksY /= scrollbarPixelsPerTick;
+ } else {
event.deltaX *= scrollbarPixelsPerTick;
event.deltaY *= scrollbarPixelsPerTick;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list