60916 2011-05-16 13:32:21 -0700 Plug-in hit testing is broken after zooming 2011-05-16 15:32:42 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cmarrin cmarrin oldest_to_newest 404679 0 cmarrin 2011-05-16 13:32:21 -0700 After zooming, events on plug-ins have the wrong coordinates, which means that plug-ins don't hit-test correctly. You can see this on the video on nytimes.com 404688 1 93688 cmarrin 2011-05-16 13:50:42 -0700 Created attachment 93688 Patch 404700 2 93688 simon.fraser 2011-05-16 14:04:53 -0700 Comment on attachment 93688 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93688&action=review Would be nice to have a testcase, which should be possible with the test plugin and CSS transforms if the code were more general. What about WebKit1? > Source/WebKit2/WebProcess/Plugins/PluginView.cpp:579 > + float scaleFactor = frame()->pageScaleFactor(); > + WebMouseEvent webMouseEvent(static_cast<const WebMouseEvent*>(currentEvent), scaleFactor); It would be nice to make this work in more general way which worked with CSS transforms. > Source/WebKit2/WebProcess/Plugins/PluginView.cpp:648 > + // Adjust bounds to account for pageScaleFactor > + float scaleFactor = frame()->pageScaleFactor(); > + frameRectInWindowCoordinates.setX(frameRectInWindowCoordinates.x() / scaleFactor); > + frameRectInWindowCoordinates.setY(frameRectInWindowCoordinates.y() / scaleFactor); Ditto. 404702 3 93688 darin 2011-05-16 14:05:16 -0700 Comment on attachment 93688 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93688&action=review r=me > Source/WebKit2/Shared/WebMouseEvent.cpp:81 > +WebMouseEvent::WebMouseEvent(const WebMouseEvent* event, float pageScaleFactor) I suggest using a reference rather than a pointer for the event type. > Source/WebKit2/Shared/WebMouseEvent.cpp:85 > + , m_globalPosition(m_position) I believe you can write: , m_globalPosition(m_position + (event->globalPosition() - event->position())) And then avoid the code below that calls the move function. > Source/WebKit2/WebProcess/Plugins/PluginView.cpp:579 > + WebMouseEvent webMouseEvent(static_cast<const WebMouseEvent*>(currentEvent), scaleFactor); I think this local needs a better name. The current event is also a web mouse event. How about eventWithScaledCoordinates? 404776 4 cmarrin 2011-05-16 15:32:42 -0700 Committed r86615: <http://trac.webkit.org/changeset/86615> 93688 2011-05-16 13:50:42 -0700 2011-05-16 14:05:16 -0700 Patch bug-60916-20110516135040.patch text/plain 5271 cmarrin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NjAzKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDUtMTYgIENocmlzIE1h cnJpbiAgPGNtYXJyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFBsdWctaW4gaGl0IHRlc3RpbmcgaXMgYnJva2VuIGFmdGVyIHpv b21pbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYw OTE2CisKKyAgICAgICAgQ29uc3RydWN0IGEgV2ViTW91c2VFdmVudCB0byBzZW5kIHRvIHBsdWdp biwgYWRqdXN0aW5nIHZhbHVlcyB0byB0YWtlIHBhZ2VTY2FsZUZhY3RvcgorICAgICAgICBpbnRv IGFjY291bnQuIEFsc28gYWRqdXN0ZWQgYm91bmRzIHNlbnQgdG8gdmlld0dlb21ldHJ5RGlkQ2hh bmdlIHRvIHRha2UgcGFnZVNjYWxlRmFjdG9yCisgICAgICAgIGludG8gYWNjb3VudC4gQm90aCBh cmUgbmVlZGVkIG9yIHRoZSBwbHVnaW4gd2lsbCB0aGluayB0aGUgbW91c2UgcG9zaXRpb25zIGFy ZSBvdXRzaWRlCisgICAgICAgIGl0cyBib3VuZHMuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViRXZl bnQuaDoKKyAgICAgICAgKiBTaGFyZWQvV2ViTW91c2VFdmVudC5jcHA6QWRkIGN0b3IgdG8gY2xv bmUgYSBXZWJNb3VzZUV2ZW50IGFuZCBhZGQgYSBzY2FsZUZhY3RvciB0byB2YWx1ZXMKKyAgICAg ICAgKFdlYktpdDo6V2ViTW91c2VFdmVudDo6V2ViTW91c2VFdmVudCk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5W aWV3OjpoYW5kbGVFdmVudCk6QWRqdXN0IG1vdXNlIGNvb3JkcyB0byB0YWtlIHBhZ2VTY2FsZUZh Y3RvciBpbnRvIGFjY291bnQKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6dmlld0dlb21l dHJ5RGlkQ2hhbmdlKTpBZGp1c3QgYm91bmRzIHRvIHRha2UgcGFnZVNjYWxlRmFjdG9yIGludG8g YWNjb3VudAorCiAyMDExLTA1LTE2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+ CiAKICAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvNjA5MTM+IEMrKyBleGNlcHRpb25zIHNo b3VsZCBub3QgYmUgZW5hYmxlZCB3aGVuIGJ1aWxkaW5nIHdpdGggbGx2bS1nY2MtNC4yCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAkocmV2aXNpb24gODY0NDgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTI0LDYgKzEyNCw4IEBA IHB1YmxpYzoKICNpZiBQTEFURk9STShXSU4pCiAgICAgV2ViTW91c2VFdmVudChUeXBlLCBCdXR0 b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6SW50 UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwgZmxvYXQg ZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzLCBkb3VibGUgdGltZXN0YW1wLCBib29s IGRpZEFjdGl2YXRlV2ViVmlldyk7CiAjZW5kaWYKKyAgICAKKyAgICBXZWJNb3VzZUV2ZW50KGNv bnN0IFdlYk1vdXNlRXZlbnQqLCBmbG9hdCBwYWdlU2NhbGVGYWN0b3IpOwogCiAgICAgQnV0dG9u IGJ1dHRvbigpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEJ1dHRvbj4obV9idXR0b24pOyB9 CiAgICAgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4g bV9wb3NpdGlvbjsgfQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk1vdXNlRXZlbnQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNw cAkocmV2aXNpb24gODY0NDgpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViTW91c2VFdmVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc4LDYgKzc4LDI0IEBAIFdlYk1vdXNlRXZlbnQ6Oldl Yk1vdXNlRXZlbnQoVHlwZSB0eXBlLCAKIH0KICNlbmRpZgogCitXZWJNb3VzZUV2ZW50OjpXZWJN b3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQqIGV2ZW50LCBmbG9hdCBwYWdlU2NhbGVGYWN0 b3IpCisgICAgOiBXZWJFdmVudChldmVudC0+dHlwZSgpLCBldmVudC0+bW9kaWZpZXJzKCksIGV2 ZW50LT50aW1lc3RhbXAoKSkKKyAgICAsIG1fYnV0dG9uKGV2ZW50LT5idXR0b24oKSkKKyAgICAs IG1fcG9zaXRpb24oV2ViQ29yZTo6SW50UG9pbnQoZXZlbnQtPnBvc2l0aW9uKCkueCgpIC8gcGFn ZVNjYWxlRmFjdG9yLCBldmVudC0+cG9zaXRpb24oKS55KCkgLyBwYWdlU2NhbGVGYWN0b3IpKQor ICAgICwgbV9nbG9iYWxQb3NpdGlvbihtX3Bvc2l0aW9uKQorICAgICwgbV9kZWx0YVgoZXZlbnQt PmRlbHRhWCgpKQorICAgICwgbV9kZWx0YVkoZXZlbnQtPmRlbHRhWSgpKQorICAgICwgbV9kZWx0 YVooZXZlbnQtPmRlbHRhWigpKQorICAgICwgbV9jbGlja0NvdW50KGV2ZW50LT5jbGlja0NvdW50 KCkpCisjaWYgUExBVEZPUk0oV0lOKQorICAgICwgbV9kaWRBY3RpdmF0ZVdlYlZpZXcoZmFsc2Up CisjZW5kaWYKK3sKKyAgICAvLyBUaGUgZ2xvYmFsUG9zaXRpb24gaXMgb25seSBzY2FsZWQgZnJv bSB0aGUgdXBwZXIgbGVmdCBjb3JuZXIgb2YgdGhlIGJveAorICAgIEludFNpemUgb2Zmc2V0KGV2 ZW50LT5nbG9iYWxQb3NpdGlvbigpLngoKSAtIGV2ZW50LT5wb3NpdGlvbigpLngoKSwgZXZlbnQt Pmdsb2JhbFBvc2l0aW9uKCkueSgpIC0gZXZlbnQtPnBvc2l0aW9uKCkueSgpKTsKKyAgICBtX2ds b2JhbFBvc2l0aW9uLm1vdmUob2Zmc2V0KTsKK30KKwogdm9pZCBXZWJNb3VzZUV2ZW50OjplbmNv ZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyKSBjb25zdAogewogICAgIFdlYkV2 ZW50OjplbmNvZGUoZW5jb2Rlcik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCShyZXZpc2lvbiA4NjQ0OCkKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzgsNyArMzgsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ3JlZGVudGlhbC5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvQ3JlZGVudGlhbFN0b3JhZ2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0RvY3Vt ZW50TG9hZGVyLmg+Ci0jaW5jbHVkZSA8V2ViQ29yZS9FdmVudC5oPgorI2luY2x1ZGUgPFdlYkNv cmUvTW91c2VFdmVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRm9jdXNDb250cm9sbGVyLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9GcmFtZUxvYWRSZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9G cmFtZUxvYWRlckNsaWVudC5oPgpAQCAtNTczLDggKzU3MywxMSBAQCB2b2lkIFBsdWdpblZpZXc6 OmhhbmRsZUV2ZW50KEV2ZW50KiBldmVuCiAgICAgICAgIC8vIFdlIGhhdmUgYSBtb3VzZSBldmVu dC4KICAgICAgICAgaWYgKGN1cnJlbnRFdmVudC0+dHlwZSgpID09IFdlYkV2ZW50OjpNb3VzZURv d24pCiAgICAgICAgICAgICBmb2N1c1BsdWdpbkVsZW1lbnQoKTsKLQotICAgICAgICBkaWRIYW5k bGVFdmVudCA9IG1fcGx1Z2luLT5oYW5kbGVNb3VzZUV2ZW50KHN0YXRpY19jYXN0PGNvbnN0IFdl Yk1vdXNlRXZlbnQmPigqY3VycmVudEV2ZW50KSk7CisgICAgICAgIAorICAgICAgICAvLyBBZGp1 c3QgbW91c2UgY29vcmRpbmF0ZXMgdG8gYWNjb3VudCBmb3IgcGFnZVNjYWxlRmFjdG9yCisgICAg ICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gZnJhbWUoKS0+cGFnZVNjYWxlRmFjdG9yKCk7CisgICAg ICAgIFdlYk1vdXNlRXZlbnQgd2ViTW91c2VFdmVudChzdGF0aWNfY2FzdDxjb25zdCBXZWJNb3Vz ZUV2ZW50Kj4oY3VycmVudEV2ZW50KSwgc2NhbGVGYWN0b3IpOworICAgICAgICBkaWRIYW5kbGVF dmVudCA9IG1fcGx1Z2luLT5oYW5kbGVNb3VzZUV2ZW50KHdlYk1vdXNlRXZlbnQpOwogICAgIH0g ZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2V3aGVlbEV2ZW50ICYm IGN1cnJlbnRFdmVudC0+dHlwZSgpID09IFdlYkV2ZW50OjpXaGVlbCkgewogICAgICAgICAvLyBX ZSBoYXZlIGEgd2hlZWwgZXZlbnQuCiAgICAgICAgIGRpZEhhbmRsZUV2ZW50ID0gbV9wbHVnaW4t PmhhbmRsZVdoZWVsRXZlbnQoc3RhdGljX2Nhc3Q8Y29uc3QgV2ViV2hlZWxFdmVudCY+KCpjdXJy ZW50RXZlbnQpKTsKQEAgLTYzOCw2ICs2NDEsMTEgQEAgdm9pZCBQbHVnaW5WaWV3Ojp2aWV3R2Vv bWV0cnlEaWRDaGFuZ2UoKQogCiAgICAgLy8gR2V0IHRoZSBmcmFtZSByZWN0IGluIHdpbmRvdyBj b29yZGluYXRlcy4KICAgICBJbnRSZWN0IGZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBw YXJlbnQoKS0+Y29udGVudHNUb1dpbmRvdyhmcmFtZVJlY3QoKSk7CisgICAgCisgICAgLy8gQWRq dXN0IGJvdW5kcyB0byBhY2NvdW50IGZvciBwYWdlU2NhbGVGYWN0b3IKKyAgICBmbG9hdCBzY2Fs ZUZhY3RvciA9IGZyYW1lKCktPnBhZ2VTY2FsZUZhY3RvcigpOworICAgIGZyYW1lUmVjdEluV2lu ZG93Q29vcmRpbmF0ZXMuc2V0WChmcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLngoKSAvIHNj YWxlRmFjdG9yKTsKKyAgICBmcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLnNldFkoZnJhbWVS ZWN0SW5XaW5kb3dDb29yZGluYXRlcy55KCkgLyBzY2FsZUZhY3Rvcik7CiAgICAgZnJhbWVSZWN0 SW5XaW5kb3dDb29yZGluYXRlcy5zZXRTaXplKG1fYm91bmRzU2l6ZSk7CiAgICAgbV9wbHVnaW4t Pmdlb21ldHJ5RGlkQ2hhbmdlKGZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMsIGNsaXBSZWN0 SW5XaW5kb3dDb29yZGluYXRlcygpKTsKIH0K