50583 2010-12-06 12:44:23 -0800 Add a shim for GetCurrentEventButtonState 2010-12-06 12:59:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 317803 0 andersca 2010-12-06 12:44:23 -0800 Add a shim for GetCurrentEventButtonState 317804 1 75732 andersca 2010-12-06 12:46:08 -0800 Created attachment 75732 Patch 317806 2 75732 aroben 2010-12-06 12:47:47 -0800 Comment on attachment 75732 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75732&action=review > WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:431 > EventRecord event = initializeEventRecord(eventKind); > + event.modifiers = modifiersForEvent(mouseEvent); > event.where.h = mouseEvent.globalPosition().x(); > event.where.v = mouseEvent.globalPosition().y(); > + > return NPP_HandleEvent(&event); This seems unrelated to the rest of your patch. Your ChangeLog doesn't mention it either. Is it possible to add a test that shows this was missing before? 317808 3 andersca 2010-12-06 12:59:35 -0800 Committed r73391: <http://trac.webkit.org/changeset/73391> 75732 2010-12-06 12:46:08 -0800 2010-12-06 12:47:47 -0800 Patch bug-50583-20101206124606.patch text/plain 6341 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg M2U0MTk2YzE0NzJkMGE1ZDI4Mjg5ZjRlNzYzYWVjYjQwNGYxNTFlNS4uZjU3NTUwNzFmNmEyNjk0 OThlYTBlNGQ5OWVjMmUxMzc0YjUxMGNjNiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMiBAQAogMjAxMC0xMi0wNiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHNoaW0gZm9yIEdldEN1cnJlbnRFdmVu dEJ1dHRvblN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01MDU4MworCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01h Yy5tbToKKyAgICAgICAgKFdlYktpdDo6Z2V0Q3VycmVudEV2ZW50QnV0dG9uU3RhdGUpOgorICAg ICAgICBHZXQgdGhlIGV2ZW50IGJ1dHRvbiBzdGF0ZSBmcm9tIHRoZSBwbHVnLWluLgorCisgICAg ICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3M6OmluaXRpYWxpemVTaGltKToKKyAgICAgICAgQWRk IG5ldyBzaGltIGNhbGxiYWNrLgorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2lu UHJvY2Vzc1NoaW0uY3BwOgorICAgICAgICAoV2ViS2l0OjpzaGltR2V0Q3VycmVudEV2ZW50QnV0 dG9uU3RhdGUpOgorICAgICAgICBBZGQgc2hpbS4KKworICAgICAgICAqIFBsdWdpblByb2Nlc3Mv bWFjL1BsdWdpblByb2Nlc3NTaGltLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL05ldHNjYXBlUGx1Z2luLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0c2Nh cGVQbHVnaW46OmJ1dHRvblN0YXRlKToKKyAgICAgICAgUmV0dXJuIHRoZSBidXR0b24gc3RhdGUu CisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlTW91c2VF dmVudCk6CisgICAgICAgIFVwZGF0ZSB0aGUgYnV0dG9uIHN0YXRlLgorCisyMDEwLTEyLTA2ICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQg YnkgQWRhbSBSb2Jlbi4KIAogICAgICAgICBBZGQgYSBzaGltIGZvciBJc1dpbmRvd0FjdGl2ZQpk aWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNzTWFjLm1t IGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNzTWFjLm1tCmluZGV4IDAx ZjBmZDQ3MzRmMDExOGIwMTM5ZTRhMDE1NTg4M2Y4YjA1ZjBiOTguLmNjZjQ0NGMxZmVlYjdkMzYz ZjA2Njg3YjY5NGI5OTBkMDY3MzQxZDcgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vz cy9tYWMvUGx1Z2luUHJvY2Vzc01hYy5tbQorKysgYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFj L1BsdWdpblByb2Nlc3NNYWMubW0KQEAgLTYyLDExICs2MiwyMiBAQCBzdGF0aWMgYm9vbCBpc1dp bmRvd0FjdGl2ZShXaW5kb3dSZWYgd2luZG93UmVmLCBib29sJiByZXN1bHQpCiAgICAgcmV0dXJu IGZhbHNlOwogfQogCitzdGF0aWMgVUludDMyIGdldEN1cnJlbnRFdmVudEJ1dHRvblN0YXRlKCkK K3sKKyNpZm5kZWYgTlBfTk9fQ0FSQk9OCisgICAgcmV0dXJuIE5ldHNjYXBlUGx1Z2luOjpidXR0 b25TdGF0ZSgpOworI2Vsc2UKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4g MDsKKyNlbmRpZgorfQorICAgIAogdm9pZCBQbHVnaW5Qcm9jZXNzOjppbml0aWFsaXplU2hpbSgp CiB7CiAgICAgY29uc3QgUGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MgY2FsbGJhY2tzID0gewog ICAgICAgICBzaG91bGRDYWxsUmVhbERlYnVnZ2VyLAogICAgICAgICBpc1dpbmRvd0FjdGl2ZSwK KyAgICAgICAgZ2V0Q3VycmVudEV2ZW50QnV0dG9uU3RhdGUKICAgICB9OwogCiAgICAgUGx1Z2lu UHJvY2Vzc1NoaW1Jbml0aWFsaXplRnVuYyBpbml0RnVuYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8UGx1 Z2luUHJvY2Vzc1NoaW1Jbml0aWFsaXplRnVuYz4oZGxzeW0oUlRMRF9ERUZBVUxULCAiV2ViS2l0 UGx1Z2luUHJvY2Vzc1NoaW1Jbml0aWFsaXplIikpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbHVn aW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNzU2hpbS5jcHAgYi9XZWJLaXQyL1BsdWdpblByb2Nl c3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLmNwcAppbmRleCAxM2ZiN2NlZTM2YWU5MzI5ZjNhMWZm YWQ1ZWY5M2ZkMzBhOWU4NTJlLi4zNDZlYWQ5MTg1Y2ZjODQ4MWNkMDEyMGQ5NjBkNzg4NDUwNjhm ZmE1IDEwMDY0NAotLS0gYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NT aGltLmNwcAorKysgYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGlt LmNwcApAQCAtNTMsNiArNTMsMTEgQEAgc3RhdGljIHZvaWQgc2hpbURlYnVnZ2VyKHZvaWQpCiAg ICAgRGVidWdnZXIoKTsKIH0KIAorc3RhdGljIFVJbnQzMiBzaGltR2V0Q3VycmVudEV2ZW50QnV0 dG9uU3RhdGUoKQoreworICAgIHJldHVybiBwbHVnaW5Qcm9jZXNzU2hpbUNhbGxiYWNrcy5nZXRD dXJyZW50RXZlbnRCdXR0b25TdGF0ZSgpOworfQorCiBzdGF0aWMgQm9vbGVhbiBzaGltSXNXaW5k b3dBY3RpdmUoV2luZG93UmVmIHdpbmRvdykKIHsKICAgICBib29sIHJlc3VsdDsKQEAgLTYxLDgg KzY2LDkgQEAgc3RhdGljIEJvb2xlYW4gc2hpbUlzV2luZG93QWN0aXZlKFdpbmRvd1JlZiB3aW5k b3cpCiAgICAgCiAgICAgcmV0dXJuIElzV2luZG93QWN0aXZlKHdpbmRvdyk7CiB9Ci0gICAgCisK IERZTERfSU5URVJQT1NFKHNoaW1EZWJ1Z2dlciwgRGVidWdnZXIpOworRFlMRF9JTlRFUlBPU0Uo c2hpbUdldEN1cnJlbnRFdmVudEJ1dHRvblN0YXRlLCBHZXRDdXJyZW50RXZlbnRCdXR0b25TdGF0 ZSk7CiBEWUxEX0lOVEVSUE9TRShzaGltSXNXaW5kb3dBY3RpdmUsIElzV2luZG93QWN0aXZlKTsK ICAgICAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVn aW5Qcm9jZXNzU2hpbS5oIGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNz U2hpbS5oCmluZGV4IDMzYWQ0NDM3NGM5YjYzMDY1MGUwYzk5NDdlZDFiZjdlNjNiZjY1NDAuLjBm YmVlMjNlMmZkYWU1NDkxOWUwYmJkNDg1NjQ2ODA0N2VjN2FhYTkgMTAwNjQ0Ci0tLSBhL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc1NoaW0uaAorKysgYi9XZWJLaXQyL1Bs dWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLmgKQEAgLTMzLDYgKzMzLDcgQEAgbmFt ZXNwYWNlIFdlYktpdCB7CiBzdHJ1Y3QgUGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MgewogICAg IGJvb2wgKCpzaG91bGRDYWxsUmVhbERlYnVnZ2VyKSgpOwogICAgIGJvb2wgKCppc1dpbmRvd0Fj dGl2ZSkoV2luZG93UmVmLCBib29sJiByZXN1bHQpOworICAgIFVJbnQzMiAoKmdldEN1cnJlbnRF dmVudEJ1dHRvblN0YXRlKSgpOwogfTsKIAogdHlwZWRlZiB2b2lkICgqUGx1Z2luUHJvY2Vzc1No aW1Jbml0aWFsaXplRnVuYykoY29uc3QgUGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MmKTsKZGlm ZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1 Z2luLmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdp bi5oCmluZGV4IGU4NTY2MGQxZDRkM2UzMDQwMjk4NzQ3OGUxOWVlY2I2NmVmZDNiYjMuLmU2ZDQ5 NzIxZDNiNjZmOGY3NzBlZjJiYmY1ZWQwYjZkNjIxYTlmYWYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKKysrIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaApAQCAtNjEsNyAr NjEsOSBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1dpbmRvd0FjdGl2ZSgpIGNvbnN0IHsgcmV0dXJu IG1faXNXaW5kb3dBY3RpdmU7IH0KIAogICAgIHN0YXRpYyBOZXRzY2FwZVBsdWdpbiogbmV0c2Nh cGVQbHVnaW5Gcm9tV2luZG93KFdpbmRvd1JlZik7CisgICAgc3RhdGljIHVuc2lnbmVkIGJ1dHRv blN0YXRlKCk7CiAjZW5kaWYKKwogI2VsaWYgUExBVEZPUk0oV0lOKQogICAgIEhXTkQgY29udGFp bmluZ1dpbmRvdygpIGNvbnN0OwogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMubW0gYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMubW0KaW5kZXgg OGNhZjc3YjMzOWJiMGExNDBiMzY1NTdjOGI5MzQ3MzVlNDU1YTM4NS4uZGFmMWQxZmQ1ODc3OTNh NzhlNThiN2Q4OGFhMjY0ODU2NjgxMWY0YyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLm1tCisrKyBiL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5tbQpAQCAt MzUsNiArMzUsOSBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICNpZm5kZWYgTlBfTk9fQ0FSQk9OCiBz dGF0aWMgY29uc3QgZG91YmxlIG51bGxFdmVudEludGVydmFsQWN0aXZlID0gMC4wMjsKIHN0YXRp YyBjb25zdCBkb3VibGUgbnVsbEV2ZW50SW50ZXJ2YWxOb3RBY3RpdmUgPSAwLjI1OworCitzdGF0 aWMgdW5zaWduZWQgYnV0dG9uU3RhdGVGcm9tTGFzdE1vdXNlRXZlbnQ7CisKICNlbmRpZgogCiBO UEVycm9yIE5ldHNjYXBlUGx1Z2luOjpzZXREcmF3aW5nTW9kZWwoTlBEcmF3aW5nTW9kZWwgZHJh d2luZ01vZGVsKQpAQCAtMjA5LDYgKzIxMiwxMSBAQCBXaW5kb3dSZWYgTmV0c2NhcGVQbHVnaW46 OndpbmRvd1JlZigpIGNvbnN0CiAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8V2luZG93UmVm PihtX25wQ0dDb250ZXh0LndpbmRvdyk7CiB9CiAKK3Vuc2lnbmVkIE5ldHNjYXBlUGx1Z2luOjpi dXR0b25TdGF0ZSgpCit7CisgICAgcmV0dXJuIGJ1dHRvblN0YXRlRnJvbUxhc3RNb3VzZUV2ZW50 OworfQorCiBzdGF0aWMgaW5saW5lIEV2ZW50UmVjb3JkIGluaXRpYWxpemVFdmVudFJlY29yZChF dmVudEtpbmQgZXZlbnRLaW5kKQogewogICAgIEV2ZW50UmVjb3JkIGV2ZW50UmVjb3JkOwpAQCAt NDAyLDkgKzQxMCwxMSBAQCBib29sIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNl RXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkKICAgICAgICAgICAgIHN3aXRj aCAobW91c2VFdmVudC50eXBlKCkpIHsKICAgICAgICAgICAgIGNhc2UgV2ViRXZlbnQ6Ok1vdXNl RG93bjoKICAgICAgICAgICAgICAgICBldmVudEtpbmQgPSBtb3VzZURvd247CisgICAgICAgICAg ICAgICAgYnV0dG9uU3RhdGVGcm9tTGFzdE1vdXNlRXZlbnQgfD0gKDEgPDwgYnV0dG9uTnVtYmVy KG1vdXNlRXZlbnQuYnV0dG9uKCkpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIGNhc2UgV2ViRXZlbnQ6Ok1vdXNlVXA6CiAgICAgICAgICAgICAgICAgZXZlbnRLaW5kID0g bW91c2VVcDsKKyAgICAgICAgICAgICAgICBidXR0b25TdGF0ZUZyb21MYXN0TW91c2VFdmVudCAm PSB+KDEgPDwgYnV0dG9uTnVtYmVyKG1vdXNlRXZlbnQuYnV0dG9uKCkpKTsKICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2ViRXZlbnQ6Ok1vdXNlTW92ZToKICAgICAg ICAgICAgICAgICBldmVudEtpbmQgPSBudWxsRXZlbnQ7CkBAIC00MTQsOCArNDI0LDEwIEBAIGJv b2wgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlTW91c2VFdmVudChjb25zdCBXZWJNb3Vz ZUV2ZW50JiBtb3VzZUV2ZW50KQogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBFdmVudFJl Y29yZCBldmVudCA9IGluaXRpYWxpemVFdmVudFJlY29yZChldmVudEtpbmQpOworICAgICAgICAg ICAgZXZlbnQubW9kaWZpZXJzID0gbW9kaWZpZXJzRm9yRXZlbnQobW91c2VFdmVudCk7CiAgICAg ICAgICAgICBldmVudC53aGVyZS5oID0gbW91c2VFdmVudC5nbG9iYWxQb3NpdGlvbigpLngoKTsK ICAgICAgICAgICAgIGV2ZW50LndoZXJlLnYgPSBtb3VzZUV2ZW50Lmdsb2JhbFBvc2l0aW9uKCku eSgpOworCiAgICAgICAgICAgICByZXR1cm4gTlBQX0hhbmRsZUV2ZW50KCZldmVudCk7CiAgICAg ICAgIH0KICNlbmRpZgo=