11807 2006-12-11 11:49:43 -0800 Merge EventHandler::m_bMousePressed and EventHandler::m_mousePressed 2006-12-11 12:27:06 -0800 1 1 1 Unclassified WebKit WebCore Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 11784 1 ap ap oldest_to_newest 42614 0 ap 2006-12-11 11:49:43 -0800 First part of bug 11784 - making baby steps to simplify future regression testing :) Merging these variables uncovered an issue with event handling in DRT. Mouse clicks in native widgets would turn [NSApp currentEvent] from nil to NSLeftMouseUp forever, so lastEventIsMouseUp() started to misbehave and caused m_mouseDown to be reset to false in handleMousePressed(). I couldn't find any way to work around this issue in DRT, so I had to change WebCore (added a check to event timestamps). Luckily, the impact seems to be minor. 42618 1 11804 ap 2006-12-11 11:59:10 -0800 Created attachment 11804 proposed patch 42620 2 11804 aroben 2006-12-11 12:01:44 -0800 Comment on attachment 11804 proposed patch r=me 42625 3 ap 2006-12-11 12:27:06 -0800 Committed revision 18158. 11804 2006-12-11 11:59:10 -0800 2006-12-11 12:01:44 -0800 proposed patch 11807r1_patch.txt text/plain 5120 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxODE1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMDYtMTItMTEgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODA3CisgICAgICAgIE1l cmdlIEV2ZW50SGFuZGxlcjo6bV9iTW91c2VQcmVzc2VkIGFuZCBFdmVudEhhbmRsZXI6Om1fbW91 c2VQcmVzc2VkCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpFdmVudEhhbmRsZXI6OkV2ZW50SGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUHJlc3NFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlTW92ZUV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkV2 ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6 RXZlbnRIYW5kbGVyOjphdXRvc2Nyb2xsVGltZXJGaXJlZCk6CisgICAgICAgICogcGFnZS9FdmVu dEhhbmRsZXIuaDoKKyAgICAgICAgKiBwYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW06CisgICAg ICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZURyYWcpOgorICAgICAgICAoV2ViQ29y ZTo6RXZlbnRIYW5kbGVyOjptb3VzZU1vdmVkKToKKyAgICAgICAgTWVyZ2UgRXZlbnRIYW5kbGVy OjptX2JNb3VzZVByZXNzZWQgYW5kIEV2ZW50SGFuZGxlcjo6bV9tb3VzZVByZXNzZWQKKworICAg ICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpsYXN0RXZlbnRJc01vdXNlVXApOgorICAgICAg ICBDaGVjayB0aGF0IHRoZSAibmV3IiBldmVudCBpcyBuZXdlciB0aGFuIHRoZSAib2xkIiBvbmUg LSB0aGF0J3Mgbm90IGFsd2F5cyB0aGUgY2FzZSAKKyAgICAgICAgd2hlbiBydW5uaW5nIGluIERS VCwgYXMgW05TQXBwIGN1cnJlbnRFdmVudF0gaXNuJ3QgdXBkYXRlZCBieSBldmVudFNlbmRlci4K KwogMjAwNi0xMi0xMSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8emltbWVybWFubkBrZGUub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJDb3JlL3BhZ2UvRXZl bnRIYW5kbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNw cAkocmV2aXNpb24gMTgxMzIpCisrKyBXZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtODEsNyArODEsNiBAQCBzdGF0aWMgRnJhbWUqIHN1YmZyYW1lRm9yVGFy Z2V0Tm9kZShOb2RlCiAKIEV2ZW50SGFuZGxlcjo6RXZlbnRIYW5kbGVyKEZyYW1lKiBmcmFtZSkK ICAgICA6IG1fZnJhbWUoZnJhbWUpCi0gICAgLCBtX2JNb3VzZVByZXNzZWQoZmFsc2UpCiAgICAg LCBtX21vdXNlUHJlc3NlZChmYWxzZSkKICAgICAsIG1fYmVnYW5TZWxlY3RpbmdUZXh0KGZhbHNl KQogICAgICwgbV9ob3ZlclRpbWVyKHRoaXMsICZFdmVudEhhbmRsZXI6OmhvdmVyVGltZXJGaXJl ZCkKQEAgLTI3Myw3ICsyNzIsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQcmVz c0V2ZW50CiAgICAgYm9vbCBzd2FsbG93RXZlbnQgPSBmYWxzZTsKICAgICBpZiAoZXZlbnQuZXZl bnQoKS5idXR0b24oKSA9PSBMZWZ0QnV0dG9uIHx8IGV2ZW50LmV2ZW50KCkuYnV0dG9uKCkgPT0g TWlkZGxlQnV0dG9uKSB7CiAgICAgICAgIG1fZnJhbWUtPnNlbGVjdGlvbkNvbnRyb2xsZXIoKS0+ c2V0Q2FyZXRCbGlua2luZ1N1c3BlbmRlZCh0cnVlKTsKLSAgICAgICAgbV9iTW91c2VQcmVzc2Vk ID0gdHJ1ZTsKKyAgICAgICAgbV9tb3VzZVByZXNzZWQgPSB0cnVlOwogICAgICAgICBtX2JlZ2Fu U2VsZWN0aW5nVGV4dCA9IGZhbHNlOwogCiAgICAgICAgIGlmIChldmVudC5ldmVudCgpLmNsaWNr Q291bnQoKSA9PSAyKQpAQCAtMjk1LDcgKzI5NCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5k bGVNb3VzZU1vdmVFdmVudCgKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAvLyBNb3VzZSBu b3QgcHJlc3NlZC4gRG8gbm90aGluZy4KLSAgICBpZiAoIW1fYk1vdXNlUHJlc3NlZCkKKyAgICBp ZiAoIW1fbW91c2VQcmVzc2VkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBOb2RlKiBp bm5lck5vZGUgPSBldmVudC50YXJnZXROb2RlKCk7CkBAIC0zNjYsNyArMzY1LDcgQEAgYm9vbCBF dmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUmVsZWFzZUV2ZQogICAgIC8vIFVzZWQgdG8gcHJldmVu dCBtb3VzZU1vdmVFdmVudCBmcm9tIGluaXRpYXRpbmcgYSBkcmFnIGJlZm9yZQogICAgIC8vIHRo ZSBtb3VzZSBpcyBwcmVzc2VkIGFnYWluLgogICAgIG1fZnJhbWUtPnNlbGVjdGlvbkNvbnRyb2xs ZXIoKS0+c2V0Q2FyZXRCbGlua2luZ1N1c3BlbmRlZChmYWxzZSk7Ci0gICAgbV9iTW91c2VQcmVz c2VkID0gZmFsc2U7CisgICAgbV9tb3VzZVByZXNzZWQgPSBmYWxzZTsKICAgCiAgICAgYm9vbCBo YW5kbGVkID0gZmFsc2U7CiAKQEAgLTQwNiw3ICs0MDUsNyBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6 aGFuZGxlQXV0b3Njcm9sbChSZW5kCiAKIHZvaWQgRXZlbnRIYW5kbGVyOjphdXRvc2Nyb2xsVGlt ZXJGaXJlZChUaW1lcjxFdmVudEhhbmRsZXI+KikKIHsKLSAgICBpZiAoIW1fYk1vdXNlUHJlc3Nl ZCkgeworICAgIGlmICghbV9tb3VzZVByZXNzZWQpIHsKICAgICAgICAgc3RvcEF1dG9zY3JvbGxU aW1lcigpOwogICAgICAgICByZXR1cm47CiAgICAgfQpJbmRleDogV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaAkocmV2 aXNpb24gMTgxMzIpCisrKyBXZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTIyNiw3ICsyMjYsNiBAQCBwcml2YXRlOgogCiAgICAgRnJhbWUqIG1fZnJhbWU7CiAK LSAgICBib29sIG1fYk1vdXNlUHJlc3NlZDsKICAgICBib29sIG1fbW91c2VQcmVzc2VkOwogICAg IFJlZlB0cjxOb2RlPiBtX21vdXNlUHJlc3NOb2RlOwogCkluZGV4OiBXZWJDb3JlL3BhZ2UvbWFj L0V2ZW50SGFuZGxlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvbWFjL0V2ZW50 SGFuZGxlck1hYy5tbQkocmV2aXNpb24gMTgxMzIpCisrKyBXZWJDb3JlL3BhZ2UvbWFjL0V2ZW50 SGFuZGxlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDQ5LDEwICs0NDksMTAgQEAgYm9vbCBF dmVudEhhbmRsZXI6Omxhc3RFdmVudElzTW91c2VVcCgpIAogCiAgICAgQkVHSU5fQkxPQ0tfT0JK Q19FWENFUFRJT05TOwogICAgIE5TRXZlbnQgKmN1cnJlbnRFdmVudEFmdGVySGFuZGxpbmdNb3Vz ZURvd24gPSBbTlNBcHAgY3VycmVudEV2ZW50XTsKLSAgICBpZiAoY3VycmVudEV2ZW50ICE9IGN1 cnJlbnRFdmVudEFmdGVySGFuZGxpbmdNb3VzZURvd24pIHsKLSAgICAgICAgaWYgKFtjdXJyZW50 RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duIHR5cGVdID09IE5TTGVmdE1vdXNlVXApCisgICAg aWYgKGN1cnJlbnRFdmVudCAhPSBjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duICYm CisgICAgICAgIFtjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duIHR5cGVdID09IE5T TGVmdE1vdXNlVXAgJiYKKyAgICAgICAgW2N1cnJlbnRFdmVudEFmdGVySGFuZGxpbmdNb3VzZURv d24gdGltZXN0YW1wXSA+PSBbY3VycmVudEV2ZW50IHRpbWVzdGFtcF0pCiAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICB9CiAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIAogICAg IHJldHVybiBmYWxzZTsKQEAgLTY3OCwxMCArNjc4LDEwIEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpo YW5kbGVEcmFnKGNvbnN0IE1vdXMKICAgICAgICAgICAgIAogICAgIH0gZWxzZSB7CiAgICAgICAg IC8vIElmIHdlIGFsbG93ZWQgdGhlIG90aGVyIHNpZGUgb2YgdGhlIGJyaWRnZSB0byBoYW5kbGUg YSBkcmFnCi0gICAgICAgIC8vIGxhc3QgdGltZSwgdGhlbiBtX2JNb3VzZVByZXNzZWQgbWlnaHQg c3RpbGwgYmUgc2V0LiBTbyB3ZQorICAgICAgICAvLyBsYXN0IHRpbWUsIHRoZW4gbV9tb3VzZVBy ZXNzZWQgbWlnaHQgc3RpbGwgYmUgc2V0LiBTbyB3ZQogICAgICAgICAvLyBjbGVhciBpdCBub3cg dG8gbWFrZSBzdXJlIHRoZSBuZXh0IG1vdmUgYWZ0ZXIgYSBkcmFnCiAgICAgICAgIC8vIGRvZXNu J3QgbG9vayBsaWtlIGEgZHJhZy4KLSAgICAgICAgbV9iTW91c2VQcmVzc2VkID0gZmFsc2U7Cisg ICAgICAgIG1fbW91c2VQcmVzc2VkID0gZmFsc2U7CiAgICAgfQogCiAgICAgRU5EX0JMT0NLX09C SkNfRVhDRVBUSU9OUzsKQEAgLTk0Miw3ICs5NDIsNyBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6bW91 c2VNb3ZlZChOU0V2ZW50ICplCiB7CiAgICAgLy8gUmVqZWN0IGEgbW91c2UgbW92ZWQgaWYgdGhl IGJ1dHRvbiBpcyBkb3duIC0gc2NyZXdzIHVwIHRyYWNraW5nIGR1cmluZyBhdXRvc2Nyb2xsCiAg ICAgLy8gVGhlc2UgaGFwcGVuIGJlY2F1c2UgV2ViS2l0IHNvbWV0aW1lcyBoYXMgdG8gZmFrZSB1 cCBtb3ZlZCBldmVudHMuCi0gICAgaWYgKCFtX2ZyYW1lLT52aWV3KCkgfHwgbV9iTW91c2VQcmVz c2VkIHx8IG1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3KQorICAgIGlmICghbV9mcmFtZS0+dmlldygp IHx8IG1fbW91c2VQcmVzc2VkIHx8IG1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3KQogICAgICAgICBy ZXR1cm47CiAgICAgCiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOwo=