69367 2011-10-04 13:32:05 -0700 Use const PlatformWheelEvent references where possible 2011-10-04 13:43:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 477879 0 andersca 2011-10-04 13:32:05 -0700 Use const PlatformWheelEvent references where possible 477882 1 109672 andersca 2011-10-04 13:33:23 -0700 Created attachment 109672 Patch 477893 2 andersca 2011-10-04 13:43:02 -0700 Committed r96639: <http://trac.webkit.org/changeset/96639> 109672 2011-10-04 13:33:23 -0700 2011-10-04 13:36:56 -0700 Patch bug-69367-20111004133323.patch text/plain 9480 andersca SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NjM2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMTAtMDQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50IHJlZmVyZW5jZXMgd2hlcmUgcG9zc2libGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MzY3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAg ICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxB bmltYXRvci5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsVmlldzo6d2hlZWxFdmVudCk6CisgICAgICAgICogcGxhdGZvcm0vU2Ny b2xsVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAg KiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1 bS9TY3JvbGxBbmltYXRvckNocm9taXVtTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs QW5pbWF0b3JDaHJvbWl1bU1hYzo6aGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgICogcGxhdGZv cm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9s bEFuaW1hdG9yTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6aXNTY3JvbGxpbmdMZWZ0QW5kU2hv dWxkTm90UnViYmVyQmFuZCk6CisgICAgICAgIChXZWJDb3JlOjppc1Njcm9sbGluZ1JpZ2h0QW5k U2hvdWxkTm90UnViYmVyQmFuZCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1h Yzo6aGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1h Yzo6c21vb3RoU2Nyb2xsV2l0aEV2ZW50KToKKwogMjAxMS0xMC0wNCAgQ2FyeSBDbGFyayAgPGNh cnljbGFya0Bnb29nbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBzdWIgcGl4ZWwgdGV4dCAoU2tp YSBvbiBNYWMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCShyZXZpc2lv biA5NjYzMykKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjE2Nyw2ICsyMTY3LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZVdo ZWVsRXZlbnQoUGxhdAogICAgICAgICBpc092ZXJXaWRnZXQgPSByZXN1bHQuaXNPdmVyV2lkZ2V0 KCk7CiAgICAgfQogCisgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIG5vdCBtdXRhdGUgdGhlIGV2 ZW50LgogICAgIGlmIChzaG91bGRUdXJuVmVydGljYWxUaWNrc0ludG9Ib3Jpem9udGFsKHJlc3Vs dCkpCiAgICAgICAgIGUudHVyblZlcnRpY2FsVGlja3NJbnRvSG9yaXpvbnRhbCgpOwogCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCShyZXZpc2lvbiA5 NjYzMykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAkod29y a2luZyBjb3B5KQpAQCAtODEsNyArODEsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yOjpzY3JvbGxU b09mZnNldFdpdGhvCiAgICAgfQogfQogCi1ib29sIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVl bEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYgZSkKK2Jvb2wgU2Nyb2xsQW5pbWF0b3I6OmhhbmRs ZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBlKQogewogICAgIFNjcm9sbGJh ciogaG9yaXpvbnRhbFNjcm9sbGJhciA9IG1fc2Nyb2xsYWJsZUFyZWEtPmhvcml6b250YWxTY3Jv bGxiYXIoKTsKICAgICBTY3JvbGxiYXIqIHZlcnRpY2FsU2Nyb2xsYmFyID0gbV9zY3JvbGxhYmxl QXJlYS0+dmVydGljYWxTY3JvbGxiYXIoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbEFuaW1hdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsQW5pbWF0b3IuaAkocmV2aXNpb24gOTY2MzIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxBbmltYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC02Myw3ICs2Myw3IEBAIHB1 YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRJc0FjdGl2ZSgpIHsgfQogCi0gICAgdmlydHVh bCBib29sIGhhbmRsZVdoZWVsRXZlbnQoUGxhdGZvcm1XaGVlbEV2ZW50Jik7CisgICAgdmlydHVh bCBib29sIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50Jik7CiAjaWYg RU5BQkxFKEdFU1RVUkVfRVZFTlRTKQogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVHZXN0dXJlRXZl bnQoY29uc3QgUGxhdGZvcm1HZXN0dXJlRXZlbnQmKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAJKHJldmlzaW9uIDk2NjMyKQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc5Nyw3ICs3 OTcsNyBAQCB2b2lkIFNjcm9sbFZpZXc6OnNldFNjcm9sbGJhck92ZXJsYXlTdHlsCiAgICAgcGxh dGZvcm1TZXRTY3JvbGxiYXJPdmVybGF5U3R5bGUob3ZlcmxheVN0eWxlKTsKIH0KIAotYm9vbCBT Y3JvbGxWaWV3Ojp3aGVlbEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYgZSkKK2Jvb2wgU2Nyb2xs Vmlldzo6d2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIGUpCiB7CiAgICAgLy8g V2UgZG9uJ3QgYWxsb3cgbW91c2Ugd2hlZWxpbmcgdG8gaGFwcGVuIGluIGEgU2Nyb2xsVmlldyB0 aGF0IGhhcyBoYWQgaXRzIHNjcm9sbGJhcnMgZXhwbGljaXRseSBkaXNhYmxlZC4KICNpZiBQTEFU Rk9STShXWCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHJldmlzaW9u IDk2NjMyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCSh3b3JraW5n IGNvcHkpCkBAIC0yMzQsNyArMjM0LDcgQEAgcHVibGljOgogICAgIC8vIFRoaXMgZnVuY3Rpb24g ZXhpc3RzIGZvciBzY3JvbGx2aWV3cyB0aGF0IG5lZWQgdG8gaGFuZGxlIHdoZWVsIGV2ZW50cyBt YW51YWxseS4KICAgICAvLyBPbiBNYWMgdGhlIHVuZGVybHlpbmcgTlNTY3JvbGxWaWV3IGp1c3Qg ZG9lcyB0aGUgc2Nyb2xsaW5nLCBidXQgb24gb3RoZXIgcGxhdGZvcm1zCiAgICAgLy8gKGxpa2Ug V2luZG93cyksIHdlIG5lZWQgdGhpcyBmdW5jdGlvbiBpbiBvcmRlciB0byBkbyB0aGUgc2Nyb2xs IG91cnNlbHZlcy4KLSAgICBib29sIHdoZWVsRXZlbnQoUGxhdGZvcm1XaGVlbEV2ZW50Jik7Cisg ICAgYm9vbCB3aGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpOwogI2lmIEVOQUJM RShHRVNUVVJFX0VWRU5UUykKICAgICB2b2lkIGdlc3R1cmVFdmVudChjb25zdCBQbGF0Zm9ybUdl c3R1cmVFdmVudCYpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxhYmxlQXJlYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsYWJsZUFyZWEuY3BwCShyZXZpc2lvbiA5NjYzMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbGFibGVBcmVhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIzLDcgKzEyMyw3IEBA IHZvaWQgU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFRvWU9mZnNldFdpdGgKICAgICBzY3JvbGxUb09m ZnNldFdpdGhvdXRBbmltYXRpb24oRmxvYXRQb2ludChzY3JvbGxBbmltYXRvcigpLT5jdXJyZW50 UG9zaXRpb24oKS54KCksIHkpKTsKIH0KIAotYm9vbCBTY3JvbGxhYmxlQXJlYTo6aGFuZGxlV2hl ZWxFdmVudChQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCitib29sIFNjcm9sbGFibGVB cmVhOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVu dCkKIHsKICAgICByZXR1cm4gc2Nyb2xsQW5pbWF0b3IoKS0+aGFuZGxlV2hlZWxFdmVudCh3aGVl bEV2ZW50KTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVh LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEu aAkocmV2aXNpb24gOTY2MzIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxl QXJlYS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNjcm9sbFRvWE9mZnNldFdpdGhvdXRBbmltYXRpb24oZmxvYXQgeCk7CiAgICAgdm9pZCBzY3Jv bGxUb1lPZmZzZXRXaXRob3V0QW5pbWF0aW9uKGZsb2F0IHgpOwogCi0gICAgYm9vbCBoYW5kbGVX aGVlbEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYpOworICAgIGJvb2wgaGFuZGxlV2hlZWxFdmVu dChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmKTsKICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMp CiAgICAgdm9pZCBoYW5kbGVHZXN0dXJlRXZlbnQoY29uc3QgUGxhdGZvcm1HZXN0dXJlRXZlbnQm KTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xs QW5pbWF0b3JDaHJvbWl1bU1hYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMuaAkocmV2aXNpb24gOTY2MzIp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxBbmltYXRvckNocm9t aXVtTWFjLmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgIHZp cnR1YWwgdm9pZCBzY3JvbGxUb09mZnNldFdpdGhvdXRBbmltYXRpb24oY29uc3QgRmxvYXRQb2lu dCYpOwogCiAjaWYgRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQotICAgIHZpcnR1YWwgYm9vbCBoYW5k bGVXaGVlbEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYpIE9WRVJSSURFOworICAgIHZpcnR1YWwg Ym9vbCBoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpIE9WRVJSSURF OwogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlR2Vz dHVyZUV2ZW50KGNvbnN0IFBsYXRmb3JtR2VzdHVyZUV2ZW50Jik7CiAjZW5kaWYKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xs QW5pbWF0b3JDaHJvbWl1bU1hYy5tbQkocmV2aXNpb24gOTY2MzMpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxBbmltYXRvckNocm9taXVtTWFjLm1tCSh3b3JraW5n IGNvcHkpCkBAIC03ODEsNyArNzgxLDcgQEAgc3RhdGljIGlubGluZSBib29sIGlzU2Nyb2xsaW5n UmlnaHRBbmRTaAogICAgIHJldHVybiB3aGVlbEV2ZW50LmRlbHRhWCgpIDwgMCAmJiAhc2Nyb2xs YWJsZUFyZWEtPnNob3VsZFJ1YmJlckJhbmRJbkRpcmVjdGlvbihTY3JvbGxSaWdodCk7CiB9CiAK LWJvb2wgU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYzo6aGFuZGxlV2hlZWxFdmVudChQbGF0Zm9y bVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCitib29sIFNjcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWM6 OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQog ewogICAgIG1faGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCA9IHRydWU7CiAKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCShyZXZpc2lv biA5NjYzMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1h Yy5oCSh3b3JraW5nIGNvcHkpCkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IHZvaWQgc2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKGNvbnN0IEZsb2F0UG9pbnQmKTsK IAogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKLSAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlV2hl ZWxFdmVudChQbGF0Zm9ybVdoZWVsRXZlbnQmKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wg aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmKSBPVkVSUklERTsKICNp ZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZUdlc3R1cmVF dmVudChjb25zdCBQbGF0Zm9ybUdlc3R1cmVFdmVudCYpOwogI2VuZGlmCkBAIC0xMzcsNyArMTM3 LDcgQEAgcHJpdmF0ZToKICAgICBib29sIHBpbm5lZEluRGlyZWN0aW9uKGZsb2F0IGRlbHRhWCwg ZmxvYXQgZGVsdGFZKTsKICAgICB2b2lkIHNuYXBSdWJiZXJCYW5kKCk7CiAgICAgdm9pZCBzbmFw UnViYmVyQmFuZFRpbWVyRmlyZWQoVGltZXI8U2Nyb2xsQW5pbWF0b3JNYWM+Kik7Ci0gICAgdm9p ZCBzbW9vdGhTY3JvbGxXaXRoRXZlbnQoUGxhdGZvcm1XaGVlbEV2ZW50Jik7CisgICAgdm9pZCBz bW9vdGhTY3JvbGxXaXRoRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50Jik7CiAgICAgdm9p ZCBiZWdpblNjcm9sbEdlc3R1cmUoKTsKICAgICB2b2lkIGVuZFNjcm9sbEdlc3R1cmUoKTsKIApJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1h Yy5tbQkocmV2aXNpb24gOTY2MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Ny b2xsQW5pbWF0b3JNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTc4MiwxNyArNzgyLDE3IEBAIHN0 YXRpYyBmbG9hdCBzY3JvbGxXaGVlbE11bHRpcGxpZXIoKQogICAgIHJldHVybiBtdWx0aXBsaWVy OwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgaXNTY3JvbGxpbmdMZWZ0QW5kU2hvdWxkTm90UnVi YmVyQmFuZChQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQsIFNjcm9sbGFibGVBcmVhKiBz Y3JvbGxhYmxlQXJlYSkKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc1Njcm9sbGluZ0xlZnRBbmRTaG91 bGROb3RSdWJiZXJCYW5kKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCwgU2Ny b2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhKQogewogICAgIHJldHVybiB3aGVlbEV2ZW50LmRl bHRhWCgpID4gMCAmJiAhc2Nyb2xsYWJsZUFyZWEtPnNob3VsZFJ1YmJlckJhbmRJbkRpcmVjdGlv bihTY3JvbGxMZWZ0KTsKIH0KIAotc3RhdGljIGlubGluZSBib29sIGlzU2Nyb2xsaW5nUmlnaHRB bmRTaG91bGROb3RSdWJiZXJCYW5kKFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCwgU2Ny b2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhKQorc3RhdGljIGlubGluZSBib29sIGlzU2Nyb2xs aW5nUmlnaHRBbmRTaG91bGROb3RSdWJiZXJCYW5kKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYg d2hlZWxFdmVudCwgU2Nyb2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhKQogewogICAgIHJldHVy biB3aGVlbEV2ZW50LmRlbHRhWCgpIDwgMCAmJiAhc2Nyb2xsYWJsZUFyZWEtPnNob3VsZFJ1YmJl ckJhbmRJbkRpcmVjdGlvbihTY3JvbGxSaWdodCk7CiB9CiAKLWJvb2wgU2Nyb2xsQW5pbWF0b3JN YWM6OmhhbmRsZVdoZWVsRXZlbnQoUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQorYm9v bCBTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVs RXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAgICAgbV9oYXZlU2Nyb2xsZWRTaW5jZVBhZ2VMb2FkID0g dHJ1ZTsKIApAQCAtOTIzLDcgKzkyMyw3IEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6OmFsbG93 c0hvcml6b250YWwKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgU2Nyb2xsQW5pbWF0b3JN YWM6OnNtb290aFNjcm9sbFdpdGhFdmVudChQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQp Cit2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbW9vdGhTY3JvbGxXaXRoRXZlbnQoY29uc3QgUGxh dGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewogICAgIG1faGF2ZVNjcm9sbGVkU2luY2VQ YWdlTG9hZCA9IHRydWU7CiAK