24502 2009-03-10 16:20:00 -0700 REGRESSION: Horizontal scrolling reversed for tilt/ball wheels 2009-03-12 12:42:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows Vista RESOLVED FIXED P1 Normal --- 1 pkasting pkasting aroben fishd oldest_to_newest 113078 0 pkasting 2009-03-10 16:20:00 -0700 r25803 made horizontal scrolling direction be correct for shift + vertical wheel and wrong for horizontal wheel (previously, it was the opposite). This regressed rdar://4965715 . This has to do with the various coordinate systems for different kinds of horizontal scrolling: WM_MOUSEWHEEL is positive up, negative down. Thus shift + wheel is positive left, negative right. WM_MOUSEHWHEEL is positive right, negative left. WM_HSCROLL gives you a positive wheel delta along with SB_{LINE,PAGE}{RIGHT,LEFT}. WebKit expects positive left, negative right. So, WM_MOUSEHWHEEL needs its delta inverted, whereas shift + WM_MOUSEWHEEL does not, and WM_HSCROLL (if Safari handled it, which it doesn't) simply needs to be set correctly. I can patch this. It will involve a few modifications to the WebKit/win code. 113203 1 28485 pkasting 2009-03-11 11:36:42 -0700 Created attachment 28485 patch v1 113449 2 28485 fishd 2009-03-12 12:30:39 -0700 Comment on attachment 28485 patch v1 >Index: WebCore/platform/win/WheelEventWin.cpp ... >+ if (isMouseHWheel) >+ delta = -delta; // Windows is <-- -/+ -->, WebKit wants <-- +/- --> nit: indentation is wrong otherwise LGTM. 113452 3 pkasting 2009-03-12 12:42:16 -0700 Fixed in r41642. 28485 2009-03-11 11:36:42 -0700 2009-03-12 12:30:39 -0700 patch v1 patch text/plain 5358 pkasting SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MTU4OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDMtMTEgIFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDUwMgorICAgICAgICBN YWtlIGhvcml6b250YWwgc2Nyb2xsaW5nIGFvbiBXaW5kb3dzIGFsd2F5cyBnbyB0aGUgY29ycmVj dCBkaXJlY3Rpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9QbGF0Zm9ybVdoZWVsRXZlbnQuaDoK KyAgICAgICAgKiBwbGF0Zm9ybS93aW4vV2hlZWxFdmVudFdpbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVudCk6CisKIDIwMDktMDMt MTEgIEhpcm9ub3JpIEJvbm8gIDxoYm9ub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vUGxhdGZv cm1XaGVlbEV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybVdo ZWVsRXZlbnQuaAkocmV2aXNpb24gNDE1ODgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3Jt V2hlZWxFdmVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC05NCw3ICs5NCw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50KE5TRXZlbnQqKTsKICNlbmRpZgog I2lmIFBMQVRGT1JNKFdJTikKLSAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50KEhXTkQsIFdQQVJB TSwgTFBBUkFNLCBib29sIGlzSG9yaXpvbnRhbCk7CisgICAgICAgIFBsYXRmb3JtV2hlZWxFdmVu dChIV05ELCBXUEFSQU0sIExQQVJBTSwgYm9vbCBpc01vdXNlSFdoZWVsKTsKICNlbmRpZgogI2lm IFBMQVRGT1JNKEdUSykKICAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50KEdka0V2ZW50U2Nyb2xs Kik7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3dpbi9XaGVlbEV2ZW50V2luLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3dpbi9XaGVlbEV2ZW50V2luLmNwcAkocmV2aXNpb24g NDE1ODgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3dpbi9XaGVlbEV2ZW50V2luLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNjIsNyArNjIsNyBAQCBzdGF0aWMgaW50IHZlcnRpY2FsU2Nyb2xsTGluZXMo KQogICAgIHJldHVybiBzY3JvbGxMaW5lczsKIH0KIAotUGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0 Zm9ybVdoZWVsRXZlbnQoSFdORCBoV25kLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtLCBi b29sIGlzSG9yaXpvbnRhbCkKK1BsYXRmb3JtV2hlZWxFdmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50 KEhXTkQgaFduZCwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSwgYm9vbCBpc01vdXNlSFdo ZWVsKQogICAgIDogbV9wb3NpdGlvbihwb3NpdGlvbkZvckV2ZW50KGhXbmQsIGxQYXJhbSkpCiAg ICAgLCBtX2dsb2JhbFBvc2l0aW9uKGdsb2JhbFBvc2l0aW9uRm9yRXZlbnQoaFduZCwgbFBhcmFt KSkKICAgICAsIG1faXNBY2NlcHRlZChmYWxzZSkKQEAgLTgwLDcgKzgwLDkgQEAgUGxhdGZvcm1X aGVlbEV2ZW50OjpQbGF0Zm9ybVdoZWVsRXZlbnQoSAogICAgIC8vICh0aGUgZGVmYXVsdCBzY3Jv bGwgYW1vdW50IG9uIFdpbmRvd3MgaXMgdGhyZWUgbGluZXMgcGVyIHdoZWVsIHRpY2spLgogICAg IHN0YXRpYyBjb25zdCBmbG9hdCBjU2Nyb2xsYmFyUGl4ZWxzUGVyTGluZSA9IDEwMC4wZiAvIDMu MGY7CiAgICAgZmxvYXQgZGVsdGEgPSBHRVRfV0hFRUxfREVMVEFfV1BBUkFNKHdQYXJhbSkgLyBz dGF0aWNfY2FzdDxmbG9hdD4oV0hFRUxfREVMVEEpOwotICAgIGlmIChpc0hvcml6b250YWwpIHsK KyAgICBpZiAoaXNNb3VzZUhXaGVlbCkKKyAgICAgIGRlbHRhID0gLWRlbHRhOyAgLy8gV2luZG93 cyBpcyA8LS0gLS8rIC0tPiwgV2ViS2l0IHdhbnRzIDwtLSArLy0gLS0+CisgICAgaWYgKGlzTW91 c2VIV2hlZWwgfHwgbV9zaGlmdEtleSkgewogICAgICAgICBtX2RlbHRhWCA9IGRlbHRhICogc3Rh dGljX2Nhc3Q8ZmxvYXQ+KGhvcml6b250YWxTY3JvbGxDaGFycygpKSAqIGNTY3JvbGxiYXJQaXhl bHNQZXJMaW5lOwogICAgICAgICBtX2RlbHRhWSA9IDA7CiAgICAgICAgIG1fZ3JhbnVsYXJpdHkg PSBTY3JvbGxCeVBpeGVsV2hlZWxFdmVudDsKSW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiA0MTU4OSkKKysrIFdl YktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDkt MDMtMTEgIFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNDUwMgorICAgICAgICBNYWtlIGhvcml6b250YWwgc2Nyb2xs aW5nIG9uIFdpbmRvd3MgYWx3YXlzIGdvIHRoZSBjb3JyZWN0IGRpcmVjdGlvbi4KKworICAgICAg ICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6bW91c2VXaGVlbCk6CisgICAgICAg IChXZWJWaWV3V25kUHJvYyk6CisgICAgICAgICogV2ViVmlldy5oOgorCiAyMDA5LTAzLTEwICBT dGV2ZSBGYWxrZW5idXJnICA8c2ZhbGtlbkBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzY2NjIxNjc+IFdoZW4gY2xpY2tpbmcgaW4gVG9wIFNpdGVzIHNlYXJjaCBmaWVsZCwg V2ViSGlzdG9yeTo6ZmluZEluZGV4IGZhaWxzIGNhdXNpbmcgY3Jhc2ggaW4gQm9va21hcmtzU2Vh cmNoZXI6OmNvbGxlY3RIaXN0b3J5U2VhcmNoUmVzdWx0cwpJbmRleDogV2ViS2l0L3dpbi9XZWJW aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiA0 MTU4OCkKKysrIFdlYktpdC93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMTEs NyArMTMxMSw3IEBAIGJvb2wgV2ViVmlldzo6aGFuZGxlTW91c2VFdmVudChVSU5UIG1lc3MKICAg ICByZXR1cm4gaGFuZGxlZDsKIH0KIAotYm9vbCBXZWJWaWV3Ojptb3VzZVdoZWVsKFdQQVJBTSB3 UGFyYW0sIExQQVJBTSBsUGFyYW0sIGJvb2wgaXNIb3Jpem9udGFsKQorYm9vbCBXZWJWaWV3Ojpt b3VzZVdoZWVsKFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0sIGJvb2wgaXNNb3VzZUhXaGVl bCkKIHsKICAgICAvLyBDdHJsK01vdXNlIHdoZWVsIGRvZXNuJ3QgZXZlciBnbyBpbnRvIFdlYkNv cmUuICBJdCBpcyB1c2VkIHRvCiAgICAgLy8gem9vbSBpbnN0ZWFkIChNYWMgem9vbXMgdGhlIHdo b2xlIERlc2t0b3AsIGJ1dCBXaW5kb3dzIGJyb3dzZXJzIHRyaWdnZXIgdGhlaXIKQEAgLTEzMjUs NyArMTMyNSw3IEBAIGJvb2wgV2ViVmlldzo6bW91c2VXaGVlbChXUEFSQU0gd1BhcmFtLCAKICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgUGxhdGZvcm1XaGVlbEV2ZW50IHdoZWVs RXZlbnQobV92aWV3V2luZG93LCB3UGFyYW0sIGxQYXJhbSwgaXNIb3Jpem9udGFsKTsKKyAgICBQ bGF0Zm9ybVdoZWVsRXZlbnQgd2hlZWxFdmVudChtX3ZpZXdXaW5kb3csIHdQYXJhbSwgbFBhcmFt LCBpc01vdXNlSFdoZWVsKTsKICAgICBGcmFtZSogY29yZUZyYW1lID0gY29yZShtX21haW5GcmFt ZSk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE3MTQs NyArMTcxNCw3IEBAIHN0YXRpYyBMUkVTVUxUIENBTExCQUNLIFdlYlZpZXdXbmRQcm9jKEgKICAg ICAgICAgY2FzZSBXTV9WSVNUQV9NT1VTRUhXSEVFTDoKICAgICAgICAgICAgIGlmIChGcmFtZSog Y29yZUZyYW1lID0gY29yZShtYWluRnJhbWVJbXBsKSkKICAgICAgICAgICAgICAgICBpZiAoY29y ZUZyYW1lLT52aWV3KCktPmRpZEZpcnN0TGF5b3V0KCkpCi0gICAgICAgICAgICAgICAgICAgIGhh bmRsZWQgPSB3ZWJWaWV3LT5tb3VzZVdoZWVsKHdQYXJhbSwgbFBhcmFtLCAod1BhcmFtICYgTUtf U0hJRlQpIHx8IG1lc3NhZ2UgPT0gV01fVklTVEFfTU9VU0VIV0hFRUwpOworICAgICAgICAgICAg ICAgICAgICBoYW5kbGVkID0gd2ViVmlldy0+bW91c2VXaGVlbCh3UGFyYW0sIGxQYXJhbSwgbWVz c2FnZSA9PSBXTV9WSVNUQV9NT1VTRUhXSEVFTCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgY2FzZSBXTV9TWVNLRVlET1dOOgogICAgICAgICAgICAgaGFuZGxlZCA9IHdlYlZpZXctPmtl eURvd24od1BhcmFtLCBsUGFyYW0sIHRydWUpOwpJbmRleDogV2ViS2l0L3dpbi9XZWJWaWV3LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L3dpbi9XZWJWaWV3LmgJKHJldmlzaW9uIDQxNTg4KQorKysg V2ViS2l0L3dpbi9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTczOSw3ICs3MzksNyBAQCBw dWJsaWM6CiAgICAgYm9vbCBvbkluaXRNZW51UG9wdXAoV1BBUkFNLCBMUEFSQU0pOwogICAgIGJv b2wgb25VbmluaXRNZW51UG9wdXAoV1BBUkFNLCBMUEFSQU0pOwogICAgIHZvaWQgcGVyZm9ybUNv bnRleHRNZW51QWN0aW9uKFdQQVJBTSwgTFBBUkFNLCBib29sIGJ5UG9zaXRpb24pOwotICAgIGJv b2wgbW91c2VXaGVlbChXUEFSQU0sIExQQVJBTSwgYm9vbCBpc0hvcml6b250YWwpOworICAgIGJv b2wgbW91c2VXaGVlbChXUEFSQU0sIExQQVJBTSwgYm9vbCBpc01vdXNlSFdoZWVsKTsKICAgICBi b29sIGV4ZWNDb21tYW5kKFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pOwogICAgIGJvb2wg a2V5RG93bihXUEFSQU0sIExQQVJBTSwgYm9vbCBzeXN0ZW1LZXlEb3duID0gZmFsc2UpOwogICAg IGJvb2wga2V5VXAoV1BBUkFNLCBMUEFSQU0sIGJvb2wgc3lzdGVtS2V5RG93biA9IGZhbHNlKTsK