74209 2011-12-09 13:24:36 -0800 WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1. 2011-12-11 11:39:39 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 kling kling andersca oldest_to_newest 518447 0 kling 2011-12-09 13:24:36 -0800 <rdar://10438197> 518459 1 118625 kling 2011-12-09 13:36:33 -0800 Created attachment 118625 Patch 518462 2 118625 andersca 2011-12-09 13:39:20 -0800 Comment on attachment 118625 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118625&action=review I think you should be able to write a plug-in test for this. Maybe platform/mac/plugins/convert-point.html could be extended to also run the same tests when there's a scale factor applied. > Source/WebKit2/WebProcess/Plugins/PluginView.cpp:-709 > - // FIXME: Just passing a translation matrix isn't good enough. I think you can keep this comment, but change it to say that we don't get the right coordinates for transformed plug-ins. 518838 3 118698 kling 2011-12-10 16:31:01 -0800 Created attachment 118698 Patch v2 Same patch with the FIXME tweaked and a layout test. 518910 4 118698 kling 2011-12-11 11:39:19 -0800 Comment on attachment 118698 Patch v2 Clearing flags on attachment: 118698 Committed r102540: <http://trac.webkit.org/changeset/102540> 518911 5 kling 2011-12-11 11:39:39 -0800 All reviewed patches have been landed. Closing bug. 118625 2011-12-09 13:36:33 -0800 2011-12-10 16:31:01 -0800 Patch bug-74209.diff text/plain 6306 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzMDcwYTM5Li5mOTc3ZTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMTItMDkgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAg ICAgIFdLMi9OZXRzY2FwZVBsdWdpbjogSW5jb3JyZWN0IG1vdXNlIGV2ZW50IGNvb3JkaW5hdGVz IHdoZW4gZnJhbWVTY2FsZUZhY3RvciAhPSAxLgorICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcv Yi83NDIwOT4gYW5kIDxyZGFyOi8vMTA0MzgxOTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogRXhwb3J0IEFmZmluZVRy YW5zZm9ybWF0aW9uOjpzY2FsZShkb3VibGUpLgorCiAyMDExLTEyLTA5ICBKb29uZSBIdXIgIDxq b29uZS5odXJAY29sbGFib3JhLmNvLnVrPiwgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2 by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4gCiAKICAgICAgICAgW0dUS10gSW5pdGlhbCBpbXBs ZW1lbnRhdGlvbiBvZiBBY2NlbGVyYXRlZCBDb21wb3NpdGluZyB1c2luZyBDbHV0dGVyCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCmluZGV4IDBhNzAzOWQuLjdmZGNkNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CkBAIC00MDcsNiArNDA3LDcgQEAgX19aTjdXZWJDb3JlMTRTdG9yYWdlVHJhY2tlcjE4ZGlza1Vz YWdlRm9yT3JpZ2luRVBOU18xNFNlY3VyaXR5T3JpZ2luRQogX19aTjdXZWJDb3JlMTRTdG9yYWdl VHJhY2tlcjMyc3luY0ZpbGVTeXN0ZW1BbmRUcmFja2VyRGF0YWJhc2VFdgogX19aTjdXZWJDb3Jl MTRlbmRPZlBhcmFncmFwaEVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRU5TXzI3RWRpdGluZ0JvdW5k YXJ5Q3Jvc3NpbmdSdWxlRQogX19aTjdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm01ZmxpcFlFdgor X19aTjdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm01c2NhbGVFZAogX19aTjdXZWJDb3JlMTVBZmZp bmVUcmFuc2Zvcm04bXVsdGlwbHlFUktTMF8KIF9fWk43V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3Jt OXRyYW5zbGF0ZUVkZAogX19aTjdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm1DMUVkZGRkZGQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwppbmRleCA5NzE2YjVlLi41NGM4YzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTEtMTItMDkgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAg IFdLMi9OZXRzY2FwZVBsdWdpbjogSW5jb3JyZWN0IG1vdXNlIGV2ZW50IGNvb3JkaW5hdGVzIHdo ZW4gZnJhbWVTY2FsZUZhY3RvciAhPSAxLgorICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi83 NDIwOT4gYW5kIDxyZGFyOi8vMTA0MzgxOTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViRXZlbnQuaDoKKyAgICAgICAgKiBTaGFy ZWQvV2ViTW91c2VFdmVudC5jcHA6CisKKyAgICAgICAgICAgIFJlbW92ZSB0aGUgV2ViTW91c2VF dmVudCAiY29weSIgY29uc3RydWN0b3IgdGhhdCBhcHBsaWVkIGEgc2NhbGUgZmFjdG9yCisgICAg ICAgICAgICB0byB0aGUgY29vcmRpbmF0ZXMgb2YgYW4gZXhpc3RpbmcgZXZlbnQuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlBsdWdpblZpZXc6OmhhbmRsZUV2ZW50KToKKworICAgICAgICAgICAgUGFzcyB0aGUgV2ViTW91 c2VFdmVudCB0aHJvdWdoIHRvIHRoZSBwbHVnaW4gdW5tb2RpZmllZC4KKworICAgICAgICAoV2Vi S2l0OjpQbHVnaW5WaWV3Ojp2aWV3R2VvbWV0cnlEaWRDaGFuZ2UpOgorCisgICAgICAgICAgICBQ bHVtYiBhIGNvbXBsZXggdHJhbnNsYXRlK3NjYWxlIHRyYW5zZm9ybSB0aHJvdWdoIHRvIHRoZSBQ bHVnaW4sIHNvIGNvb3JkaW5hdGUKKyAgICAgICAgICAgIHNwYWNlIHRyYW5zZm9ybWF0aW9ucyBp biB3aWxsIGJlaGF2ZSBjb3JyZWN0bHkgd2l0aCBzY2FsZSBmYWN0b3JzIG90aGVyIHRoYW4gMS4K KwogMjAxMS0xMi0wOSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+ CiAKICAgICAgICAgW1F0XSBGaXggY29tcGlsYXRpb24gd2l0aCBuZXdseSBzZXBhcmF0ZWQgUXQg NSBRdFF1aWNrIG1vZHVsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkV2 ZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAppbmRleCAyN2FhMmY4Li5j MTgyMzY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaApAQCAtMTI1LDggKzEyNSw2IEBAIHB1 YmxpYzoKICNpZiBQTEFURk9STShXSU4pCiAgICAgV2ViTW91c2VFdmVudChUeXBlLCBCdXR0b24s IGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwgZmxvYXQgZGVs dGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzLCBkb3VibGUgdGltZXN0YW1wLCBib29sIGRp ZEFjdGl2YXRlV2ViVmlldyk7CiAjZW5kaWYKLSAgICAKLSAgICBXZWJNb3VzZUV2ZW50KGNvbnN0 IFdlYk1vdXNlRXZlbnQmLCBmbG9hdCBwYWdlU2NhbGVGYWN0b3IpOwogCiAgICAgQnV0dG9uIGJ1 dHRvbigpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEJ1dHRvbj4obV9idXR0b24pOyB9CiAg ICAgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9w b3NpdGlvbjsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk1vdXNlRXZl bnQuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk1vdXNlRXZlbnQuY3BwCmluZGV4IDEy MWNjODIuLjdhYTdkZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJNb3Vz ZUV2ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViTW91c2VFdmVudC5jcHAK QEAgLTc4LDIxICs3OCw2IEBAIFdlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQoVHlwZSB0eXBl LCBCdXR0b24gYnV0dG9uLCBjb25zdCBJbnRQb2ludCYgcG9zaXRpb24sCiB9CiAjZW5kaWYKIAot V2ViTW91c2VFdmVudDo6V2ViTW91c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCwg ZmxvYXQgcGFnZVNjYWxlRmFjdG9yKQotICAgIDogV2ViRXZlbnQoZXZlbnQudHlwZSgpLCBldmVu dC5tb2RpZmllcnMoKSwgZXZlbnQudGltZXN0YW1wKCkpCi0gICAgLCBtX2J1dHRvbihldmVudC5i dXR0b24oKSkKLSAgICAsIG1fcG9zaXRpb24oV2ViQ29yZTo6SW50UG9pbnQoZXZlbnQucG9zaXRp b24oKS54KCkgLyBwYWdlU2NhbGVGYWN0b3IsIGV2ZW50LnBvc2l0aW9uKCkueSgpIC8gcGFnZVNj YWxlRmFjdG9yKSkKLSAgICAsIG1fZ2xvYmFsUG9zaXRpb24obV9wb3NpdGlvbiArIChldmVudC5n bG9iYWxQb3NpdGlvbigpIC0gZXZlbnQucG9zaXRpb24oKSkpCi0gICAgLCBtX2RlbHRhWChldmVu dC5kZWx0YVgoKSkKLSAgICAsIG1fZGVsdGFZKGV2ZW50LmRlbHRhWSgpKQotICAgICwgbV9kZWx0 YVooZXZlbnQuZGVsdGFaKCkpCi0gICAgLCBtX2NsaWNrQ291bnQoZXZlbnQuY2xpY2tDb3VudCgp KQotI2lmIFBMQVRGT1JNKFdJTikKLSAgICAsIG1fZGlkQWN0aXZhdGVXZWJWaWV3KGZhbHNlKQot I2VuZGlmCi17Ci19Ci0KIHZvaWQgV2ViTW91c2VFdmVudDo6ZW5jb2RlKENvcmVJUEM6OkFyZ3Vt ZW50RW5jb2RlciogZW5jb2RlcikgY29uc3QKIHsKICAgICBXZWJFdmVudDo6ZW5jb2RlKGVuY29k ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwCmluZGV4IGE4NjE2MTAuLmI2MWQ4ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTYzMywxMCArNjMzLDggQEAgdm9pZCBQ bHVnaW5WaWV3OjpoYW5kbGVFdmVudChFdmVudCogZXZlbnQpCiAgICAgICAgIC8vIEZJWE1FOiBD bGlja2luZyBpbiBhIHNjcm9sbCBiYXIgc2hvdWxkIG5vdCBjaGFuZ2UgZm9jdXMuCiAgICAgICAg IGlmIChjdXJyZW50RXZlbnQtPnR5cGUoKSA9PSBXZWJFdmVudDo6TW91c2VEb3duKQogICAgICAg ICAgICAgZm9jdXNQbHVnaW5FbGVtZW50KCk7Ci0gICAgICAgIAotICAgICAgICAvLyBBZGp1c3Qg bW91c2UgY29vcmRpbmF0ZXMgdG8gYWNjb3VudCBmb3IgZnJhbWVTY2FsZUZhY3RvcgotICAgICAg ICBXZWJNb3VzZUV2ZW50IGV2ZW50V2l0aFNjYWxlZENvb3JkaW5hdGVzKCpzdGF0aWNfY2FzdDxj b25zdCBXZWJNb3VzZUV2ZW50Kj4oY3VycmVudEV2ZW50KSwgZnJhbWUoKS0+ZnJhbWVTY2FsZUZh Y3RvcigpKTsKLSAgICAgICAgZGlkSGFuZGxlRXZlbnQgPSBtX3BsdWdpbi0+aGFuZGxlTW91c2VF dmVudChldmVudFdpdGhTY2FsZWRDb29yZGluYXRlcyk7CisKKyAgICAgICAgZGlkSGFuZGxlRXZl bnQgPSBtX3BsdWdpbi0+aGFuZGxlTW91c2VFdmVudChzdGF0aWNfY2FzdDxjb25zdCBXZWJNb3Vz ZUV2ZW50Jj4oKmN1cnJlbnRFdmVudCkpOwogICAgIH0gZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9 PSBldmVudE5hbWVzKCkubW91c2V3aGVlbEV2ZW50ICYmIGN1cnJlbnRFdmVudC0+dHlwZSgpID09 IFdlYkV2ZW50OjpXaGVlbCkgewogICAgICAgICAvLyBXZSBoYXZlIGEgd2hlZWwgZXZlbnQuCiAg ICAgICAgIGRpZEhhbmRsZUV2ZW50ID0gbV9wbHVnaW4tPmhhbmRsZVdoZWVsRXZlbnQoc3RhdGlj X2Nhc3Q8Y29uc3QgV2ViV2hlZWxFdmVudCY+KCpjdXJyZW50RXZlbnQpKTsKQEAgLTcwNiw5ICs3 MDQsMTUgQEAgdm9pZCBQbHVnaW5WaWV3Ojp2aWV3R2VvbWV0cnlEaWRDaGFuZ2UoKQogICAgIGlm ICghbV9pc0luaXRpYWxpemVkIHx8ICFtX3BsdWdpbiB8fCAhcGFyZW50KCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIC8vIEZJWE1FOiBKdXN0IHBhc3NpbmcgYSB0cmFuc2xhdGlvbiBtYXRyaXgg aXNuJ3QgZ29vZCBlbm91Z2guCi0gICAgSW50UG9pbnQgbG9jYXRpb25JbldpbmRvd0Nvb3JkaW5h dGVzID0gcGFyZW50KCktPmNvbnRlbnRzVG9Sb290VmlldyhmcmFtZVJlY3QoKS5sb2NhdGlvbigp KTsKLSAgICBBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtID0gQWZmaW5lVHJhbnNmb3JtOjp0cmFu c2xhdGlvbihsb2NhdGlvbkluV2luZG93Q29vcmRpbmF0ZXMueCgpLCBsb2NhdGlvbkluV2luZG93 Q29vcmRpbmF0ZXMueSgpKTsKKyAgICBBU1NFUlQoZnJhbWUoKSk7CisgICAgZmxvYXQgZnJhbWVT Y2FsZUZhY3RvciA9IGZyYW1lKCktPmZyYW1lU2NhbGVGYWN0b3IoKTsKKworICAgIEludFBvaW50 IHNjYWxlZEZyYW1lUmVjdExvY2F0aW9uKGZyYW1lUmVjdCgpLmxvY2F0aW9uKCkueCgpICogZnJh bWVTY2FsZUZhY3RvciwgZnJhbWVSZWN0KCkubG9jYXRpb24oKS55KCkgKiBmcmFtZVNjYWxlRmFj dG9yKTsKKyAgICBJbnRQb2ludCBzY2FsZWRMb2NhdGlvbkluUm9vdFZpZXdDb29yZGluYXRlcyhw YXJlbnQoKS0+Y29udGVudHNUb1Jvb3RWaWV3KHNjYWxlZEZyYW1lUmVjdExvY2F0aW9uKSk7CisK KyAgICBBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtOworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUo c2NhbGVkTG9jYXRpb25JblJvb3RWaWV3Q29vcmRpbmF0ZXMueCgpLCBzY2FsZWRMb2NhdGlvbklu Um9vdFZpZXdDb29yZGluYXRlcy55KCkpOworICAgIHRyYW5zZm9ybS5zY2FsZShmcmFtZVNjYWxl RmFjdG9yKTsKIAogICAgIC8vIEZJWE1FOiBUaGUgY2xpcCByZWN0IGlzbid0IGNvcnJlY3QuCiAg ICAgSW50UmVjdCBjbGlwUmVjdCA9IGJvdW5kc1JlY3QoKTsK 118698 2011-12-10 16:31:01 -0800 2011-12-11 11:39:19 -0800 Patch v2 bug-74209-v2.diff text/plain 8908 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMDI2ZTg4Li40NzVhZDJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTIt MTAgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAgIFdLMi9OZXRz Y2FwZVBsdWdpbjogSW5jb3JyZWN0IG1vdXNlIGV2ZW50IGNvb3JkaW5hdGVzIHdoZW4gZnJhbWVT Y2FsZUZhY3RvciAhPSAxLgorICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi83NDIwOT4gYW5k IDxyZGFyOi8vcHJvYmxlbS8xMDQzODE5Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSB0ZXN0IHZlcmlmeWluZyB0aGF0IE5ldHNjYXBlUGx1 Z2lucyByZWNlaXZlIGNvcnJlY3RseSB0cmFuc2Zvcm1lZAorICAgICAgICBtb3VzZSBldmVudHMg d2l0aCBhIHBhZ2Ugc2NhbGUgZmFjdG9yIGFwcGxpZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMtd2syL3BsdWdpbnMvbW91c2UtZXZlbnRzLXNjYWxlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIHBsYXRmb3JtL21hYy13azIvcGx1Z2lucy9tb3VzZS1ldmVudHMtc2NhbGVkLmh0 bWw6IEFkZGVkLgorCiAyMDExLTEyLTA5ICAgQXJrbyBTYWhhICA8YXJrb0Btb3Rvcm9sYS5jb20+ CiAKICAgICAgICAgTmFtZU5vZGVMaXN0Q2FjaGUgc2hvdWxkIGJlIGludmFsaWRhdGVkIHdoZW4g bmFtZSBhdHRyaWJ1dGUgY2hhbmdlcy9tb2RpZmllZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL21hYy13azIvcGx1Z2lucy9tb3VzZS1ldmVudHMtc2NhbGVkLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvcGx1Z2lucy9tb3VzZS1ldmVudHMtc2Nh bGVkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42M2Yw NzgzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9wbHVn aW5zL21vdXNlLWV2ZW50cy1zY2FsZWQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorQ09O U09MRSBNRVNTQUdFOiBsaW5lIDA6IFBMVUdJTjogbW91c2VEb3duIGF0ICgzMDAsIDMwMCkKK0NP TlNPTEUgTUVTU0FHRTogbGluZSAwOiBQTFVHSU46IG1vdXNlVXAgYXQgKDMwMCwgMzAwKQorQ09O U09MRSBNRVNTQUdFOiBsaW5lIDA6IFBMVUdJTjogbW91c2VEb3duIGF0ICgyMDAsIDIwMCkKK0NP TlNPTEUgTUVTU0FHRTogbGluZSAwOiBQTFVHSU46IG1vdXNlVXAgYXQgKDIwMCwgMjAwKQorQ09O U09MRSBNRVNTQUdFOiBsaW5lIDA6IFBMVUdJTjogbW91c2VEb3duIGF0ICgxMzMsIDEzMykKK0NP TlNPTEUgTUVTU0FHRTogbGluZSAwOiBQTFVHSU46IG1vdXNlVXAgYXQgKDEzMywgMTMzKQorCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL3BsdWdpbnMvbW91c2UtZXZl bnRzLXNjYWxlZC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9wbHVnaW5zL21v dXNlLWV2ZW50cy1zY2FsZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li4zNmNlNmQ4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdr Mi9wbHVnaW5zL21vdXNlLWV2ZW50cy1zY2FsZWQuaHRtbApAQCAtMCwwICsxLDMxIEBACis8IURP Q1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8ZW1iZWQgc3R5bGU9InBvc2l0aW9uOiBhYnNv bHV0ZTsgbGVmdDogMDsgdG9wOiAwOyIgbmFtZT0icGxnIiB0eXBlPSJhcHBsaWNhdGlvbi94LXdl YmtpdC10ZXN0LW5ldHNjYXBlIiB3aW5kb3dlZFBsdWdpbj0iZmFsc2UiIHdpZHRoPSIxMDAwIiBo ZWlnaHQ9IjEwMDAiPjwvZW1iZWQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gZmFrZUNsaWNrKHgsIHkp IHsKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygzMDAsIDMwMCk7CisgICAgZXZlbnRTZW5k ZXIubW91c2VEb3duKCk7CisgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworfQorCitpZiAoIXdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICBkb2N1bWVudC53cml0ZSgiVGhpcyB0ZXN0 IGRvZXMgbm90IHdvcmsgaW4gbWFudWFsIG1vZGUuIik7CitlbHNlIHsKKyAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgCisgICAgcGxnLndpbmRvd2VkUGx1Z2luID0g ZmFsc2U7CisgICAgcGxnLmV2ZW50TG9nZ2luZ0VuYWJsZWQgPSB0cnVlOworCisgICAgZXZlbnRT ZW5kZXIuc2NhbGVQYWdlQnkoMSwgMTAwLCAxMDApOworICAgIGZha2VDbGljaygzMDAsIDMwMCk7 CisgICAgZXZlbnRTZW5kZXIuc2NhbGVQYWdlQnkoMiwgMTAwLCAxMDApOworICAgIGZha2VDbGlj aygzMDAsIDMwMCk7CisgICAgZXZlbnRTZW5kZXIuc2NhbGVQYWdlQnkoMywgMTAwLCAxMDApOwor ICAgIGZha2VDbGljaygzMDAsIDMwMCk7CisKKyAgICBwbGcuZXZlbnRMb2dnaW5nRW5hYmxlZCA9 IGZhbHNlOworfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFl MzQ1Ni4uZjg0M2Y4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTEyLTA5ICBB bmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KKworICAgICAgICBXSzIvTmV0c2NhcGVQ bHVnaW46IEluY29ycmVjdCBtb3VzZSBldmVudCBjb29yZGluYXRlcyB3aGVuIGZyYW1lU2NhbGVG YWN0b3IgIT0gMS4KKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvNzQyMDk+IGFuZCA8cmRh cjovL3Byb2JsZW0vMTA0MzgxOTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogRXhwb3J0IEFmZmluZVRyYW5zZm9ybTo6 c2NhbGUoZG91YmxlKS4KKwogMjAxMS0xMi0xMCAgSmFycmVkIE5pY2hvbGxzICA8amFycmVkQHNl bmNoYS5jb20+CiAKICAgICAgICAgW1Y4XSBSZW1vdmUgb2xkIEFycmF5QnVmZmVyIGd1YXJkcyBm cm9tIFY4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IDJk N2UwMmEuLmE0YjhiMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC00MDcsNiArNDA3LDcgQEAg X19aTjdXZWJDb3JlMTRTdG9yYWdlVHJhY2tlcjE4ZGlza1VzYWdlRm9yT3JpZ2luRVBOU18xNFNl Y3VyaXR5T3JpZ2luRQogX19aTjdXZWJDb3JlMTRTdG9yYWdlVHJhY2tlcjMyc3luY0ZpbGVTeXN0 ZW1BbmRUcmFja2VyRGF0YWJhc2VFdgogX19aTjdXZWJDb3JlMTRlbmRPZlBhcmFncmFwaEVSS05T XzE1VmlzaWJsZVBvc2l0aW9uRU5TXzI3RWRpdGluZ0JvdW5kYXJ5Q3Jvc3NpbmdSdWxlRQogX19a TjdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm01ZmxpcFlFdgorX19aTjdXZWJDb3JlMTVBZmZpbmVU cmFuc2Zvcm01c2NhbGVFZAogX19aTjdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm04bXVsdGlwbHlF UktTMF8KIF9fWk43V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3JtOXRyYW5zbGF0ZUVkZAogX19aTjdX ZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm1DMUVkZGRkZGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0ZGQxNTJiLi43 M2VmMDI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMTItMDkgIEFuZHJlYXMg S2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAgIFdLMi9OZXRzY2FwZVBsdWdpbjog SW5jb3JyZWN0IG1vdXNlIGV2ZW50IGNvb3JkaW5hdGVzIHdoZW4gZnJhbWVTY2FsZUZhY3RvciAh PSAxLgorICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi83NDIwOT4gYW5kIDxyZGFyOi8vcHJv YmxlbS8xMDQzODE5Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNoYXJlZC9XZWJFdmVudC5oOgorICAgICAgICAqIFNoYXJlZC9XZWJNb3VzZUV2 ZW50LmNwcDoKKworICAgICAgICAgICAgUmVtb3ZlIHRoZSBXZWJNb3VzZUV2ZW50ICJjb3B5IiBj b25zdHJ1Y3RvciB0aGF0IGFwcGxpZWQgYSBzY2FsZSBmYWN0b3IKKyAgICAgICAgICAgIHRvIHRo ZSBjb29yZGluYXRlcyBvZiBhbiBleGlzdGluZyBldmVudC4KKworICAgICAgICAqIFdlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6 aGFuZGxlRXZlbnQpOgorCisgICAgICAgICAgICBQYXNzIHRoZSBXZWJNb3VzZUV2ZW50IHRocm91 Z2ggdG8gdGhlIHBsdWdpbiB1bm1vZGlmaWVkLgorCisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZp ZXc6OnZpZXdHZW9tZXRyeURpZENoYW5nZSk6CisKKyAgICAgICAgICAgIFBsdW1iIGEgY29tcGxl eCB0cmFuc2xhdGUrc2NhbGUgdHJhbnNmb3JtIHRocm91Z2ggdG8gdGhlIHBsdWdpbiwgc28gY29v cmRpbmF0ZQorICAgICAgICAgICAgc3BhY2UgdHJhbnNmb3JtYXRpb25zIGluIHdpbGwgYmVoYXZl IGNvcnJlY3RseSB3aXRoIHNjYWxlIGZhY3RvcnMgb3RoZXIgdGhhbiAxLgorCiAyMDExLTEyLTEw ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBRdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJFdmVudC5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkV2ZW50LmgKaW5k ZXggMjdhYTJmOC4uYzE4MjM2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dl YkV2ZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkV2ZW50LmgKQEAgLTEyNSw4 ICsxMjUsNiBAQCBwdWJsaWM6CiAjaWYgUExBVEZPUk0oV0lOKQogICAgIFdlYk1vdXNlRXZlbnQo VHlwZSwgQnV0dG9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9zaXRpb24sIGNvbnN0IFdl YkNvcmU6OkludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgZmxvYXQgZGVsdGFYLCBmbG9hdCBkZWx0 YVksIGZsb2F0IGRlbHRhWiwgaW50IGNsaWNrQ291bnQsIE1vZGlmaWVycywgZG91YmxlIHRpbWVz dGFtcCwgYm9vbCBkaWRBY3RpdmF0ZVdlYlZpZXcpOwogI2VuZGlmCi0gICAgCi0gICAgV2ViTW91 c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yKTsKIAog ICAgIEJ1dHRvbiBidXR0b24oKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxCdXR0b24+KG1f YnV0dG9uKTsgfQogICAgIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbigpIGNvbnN0 IHsgcmV0dXJuIG1fcG9zaXRpb247IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJNb3VzZUV2ZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50 LmNwcAppbmRleCAxMjFjYzgyLi43YWE3ZGZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvV2ViTW91c2VFdmVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk1v dXNlRXZlbnQuY3BwCkBAIC03OCwyMSArNzgsNiBAQCBXZWJNb3VzZUV2ZW50OjpXZWJNb3VzZUV2 ZW50KFR5cGUgdHlwZSwgQnV0dG9uIGJ1dHRvbiwgY29uc3QgSW50UG9pbnQmIHBvc2l0aW9uLAog fQogI2VuZGlmCiAKLVdlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VF dmVudCYgZXZlbnQsIGZsb2F0IHBhZ2VTY2FsZUZhY3RvcikKLSAgICA6IFdlYkV2ZW50KGV2ZW50 LnR5cGUoKSwgZXZlbnQubW9kaWZpZXJzKCksIGV2ZW50LnRpbWVzdGFtcCgpKQotICAgICwgbV9i dXR0b24oZXZlbnQuYnV0dG9uKCkpCi0gICAgLCBtX3Bvc2l0aW9uKFdlYkNvcmU6OkludFBvaW50 KGV2ZW50LnBvc2l0aW9uKCkueCgpIC8gcGFnZVNjYWxlRmFjdG9yLCBldmVudC5wb3NpdGlvbigp LnkoKSAvIHBhZ2VTY2FsZUZhY3RvcikpCi0gICAgLCBtX2dsb2JhbFBvc2l0aW9uKG1fcG9zaXRp b24gKyAoZXZlbnQuZ2xvYmFsUG9zaXRpb24oKSAtIGV2ZW50LnBvc2l0aW9uKCkpKQotICAgICwg bV9kZWx0YVgoZXZlbnQuZGVsdGFYKCkpCi0gICAgLCBtX2RlbHRhWShldmVudC5kZWx0YVkoKSkK LSAgICAsIG1fZGVsdGFaKGV2ZW50LmRlbHRhWigpKQotICAgICwgbV9jbGlja0NvdW50KGV2ZW50 LmNsaWNrQ291bnQoKSkKLSNpZiBQTEFURk9STShXSU4pCi0gICAgLCBtX2RpZEFjdGl2YXRlV2Vi VmlldyhmYWxzZSkKLSNlbmRpZgotewotfQotCiB2b2lkIFdlYk1vdXNlRXZlbnQ6OmVuY29kZShD b3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgV2ViRXZlbnQ6 OmVuY29kZShlbmNvZGVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5WaWV3LmNwcAppbmRleCBhODYxNjEwLi43ZGUwZmQ2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC02MzMsMTAgKzYz Myw4IEBAIHZvaWQgUGx1Z2luVmlldzo6aGFuZGxlRXZlbnQoRXZlbnQqIGV2ZW50KQogICAgICAg ICAvLyBGSVhNRTogQ2xpY2tpbmcgaW4gYSBzY3JvbGwgYmFyIHNob3VsZCBub3QgY2hhbmdlIGZv Y3VzLgogICAgICAgICBpZiAoY3VycmVudEV2ZW50LT50eXBlKCkgPT0gV2ViRXZlbnQ6Ok1vdXNl RG93bikKICAgICAgICAgICAgIGZvY3VzUGx1Z2luRWxlbWVudCgpOwotICAgICAgICAKLSAgICAg ICAgLy8gQWRqdXN0IG1vdXNlIGNvb3JkaW5hdGVzIHRvIGFjY291bnQgZm9yIGZyYW1lU2NhbGVG YWN0b3IKLSAgICAgICAgV2ViTW91c2VFdmVudCBldmVudFdpdGhTY2FsZWRDb29yZGluYXRlcygq c3RhdGljX2Nhc3Q8Y29uc3QgV2ViTW91c2VFdmVudCo+KGN1cnJlbnRFdmVudCksIGZyYW1lKCkt PmZyYW1lU2NhbGVGYWN0b3IoKSk7Ci0gICAgICAgIGRpZEhhbmRsZUV2ZW50ID0gbV9wbHVnaW4t PmhhbmRsZU1vdXNlRXZlbnQoZXZlbnRXaXRoU2NhbGVkQ29vcmRpbmF0ZXMpOworCisgICAgICAg IGRpZEhhbmRsZUV2ZW50ID0gbV9wbHVnaW4tPmhhbmRsZU1vdXNlRXZlbnQoc3RhdGljX2Nhc3Q8 Y29uc3QgV2ViTW91c2VFdmVudCY+KCpjdXJyZW50RXZlbnQpKTsKICAgICB9IGVsc2UgaWYgKGV2 ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNld2hlZWxFdmVudCAmJiBjdXJyZW50RXZl bnQtPnR5cGUoKSA9PSBXZWJFdmVudDo6V2hlZWwpIHsKICAgICAgICAgLy8gV2UgaGF2ZSBhIHdo ZWVsIGV2ZW50LgogICAgICAgICBkaWRIYW5kbGVFdmVudCA9IG1fcGx1Z2luLT5oYW5kbGVXaGVl bEV2ZW50KHN0YXRpY19jYXN0PGNvbnN0IFdlYldoZWVsRXZlbnQmPigqY3VycmVudEV2ZW50KSk7 CkBAIC03MDYsOSArNzA0LDE2IEBAIHZvaWQgUGx1Z2luVmlldzo6dmlld0dlb21ldHJ5RGlkQ2hh bmdlKCkKICAgICBpZiAoIW1faXNJbml0aWFsaXplZCB8fCAhbV9wbHVnaW4gfHwgIXBhcmVudCgp KQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBGSVhNRTogSnVzdCBwYXNzaW5nIGEgdHJhbnNs YXRpb24gbWF0cml4IGlzbid0IGdvb2QgZW5vdWdoLgotICAgIEludFBvaW50IGxvY2F0aW9uSW5X aW5kb3dDb29yZGluYXRlcyA9IHBhcmVudCgpLT5jb250ZW50c1RvUm9vdFZpZXcoZnJhbWVSZWN0 KCkubG9jYXRpb24oKSk7Ci0gICAgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybSA9IEFmZmluZVRy YW5zZm9ybTo6dHJhbnNsYXRpb24obG9jYXRpb25JbldpbmRvd0Nvb3JkaW5hdGVzLngoKSwgbG9j YXRpb25JbldpbmRvd0Nvb3JkaW5hdGVzLnkoKSk7CisgICAgQVNTRVJUKGZyYW1lKCkpOworICAg IGZsb2F0IGZyYW1lU2NhbGVGYWN0b3IgPSBmcmFtZSgpLT5mcmFtZVNjYWxlRmFjdG9yKCk7CisK KyAgICBJbnRQb2ludCBzY2FsZWRGcmFtZVJlY3RMb2NhdGlvbihmcmFtZVJlY3QoKS5sb2NhdGlv bigpLngoKSAqIGZyYW1lU2NhbGVGYWN0b3IsIGZyYW1lUmVjdCgpLmxvY2F0aW9uKCkueSgpICog ZnJhbWVTY2FsZUZhY3Rvcik7CisgICAgSW50UG9pbnQgc2NhbGVkTG9jYXRpb25JblJvb3RWaWV3 Q29vcmRpbmF0ZXMocGFyZW50KCktPmNvbnRlbnRzVG9Sb290VmlldyhzY2FsZWRGcmFtZVJlY3RM b2NhdGlvbikpOworCisgICAgLy8gRklYTUU6IFdlIHN0aWxsIGRvbid0IGdldCB0aGUgcmlnaHQg Y29vcmRpbmF0ZXMgZm9yIHRyYW5zZm9ybWVkIHBsdWdpbnMuCisgICAgQWZmaW5lVHJhbnNmb3Jt IHRyYW5zZm9ybTsKKyAgICB0cmFuc2Zvcm0udHJhbnNsYXRlKHNjYWxlZExvY2F0aW9uSW5Sb290 Vmlld0Nvb3JkaW5hdGVzLngoKSwgc2NhbGVkTG9jYXRpb25JblJvb3RWaWV3Q29vcmRpbmF0ZXMu eSgpKTsKKyAgICB0cmFuc2Zvcm0uc2NhbGUoZnJhbWVTY2FsZUZhY3Rvcik7CiAKICAgICAvLyBG SVhNRTogVGhlIGNsaXAgcmVjdCBpc24ndCBjb3JyZWN0LgogICAgIEludFJlY3QgY2xpcFJlY3Qg PSBib3VuZHNSZWN0KCk7Cg==