69306 2011-10-03 16:41:03 -0700 Work towards making PlatformWheelEvent immutable 2011-10-04 14:17:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca gavinp rniwa webkit.review.bot oldest_to_newest 477338 0 andersca 2011-10-03 16:41:03 -0700 Work towards making PlatformWheelEvent immutable 477347 1 109552 andersca 2011-10-03 16:54:36 -0700 Created attachment 109552 Patch 477372 2 andersca 2011-10-03 17:28:11 -0700 Committed r96561: <http://trac.webkit.org/changeset/96561> 477431 3 rniwa 2011-10-03 21:14:26 -0700 This patch broke release builds: http://build.webkit.org/builders/SnowLeopard%20Intel%20Release%20%28Build%29/builds/34412/steps/compile-webkit/logs/stdio 477433 4 rniwa 2011-10-03 21:15:53 -0700 Build fix attempt landed in http://trac.webkit.org/changeset/96571 477937 5 gavinp 2011-10-04 14:15:56 -0700 This patch broke the gtk build. http://build.webkit.org/builders/GTK%20Linux%2032-bit%20Release/builds/17973/steps/compile-webkit/logs/stdio 477939 6 gavinp 2011-10-04 14:17:27 -0700 Wait, no, n/m. 109552 2011-10-03 16:54:36 -0700 2011-10-03 17:01:47 -0700 Patch bug-69306-20111003165438.patch text/plain 14627 andersca SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NTU2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTUgQEAKKzIwMTEtMTAtMDMgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBXb3JrIHRvd2FyZHMgbWFr aW5nIFBsYXRmb3JtV2hlZWxFdmVudCBpbW11dGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MzA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCBQbGF0Zm9ybVdoZWVsRXZlbnQgaGFz IGFuIG1faXNBY2NlcHRlZCBmbGFnIHRoYXQgdHJhY2tzIHdoZXRoZXIKKyAgICAgICAgdGhlIGV2 ZW50IGhhcyBiZWVuIGhhbmRsZWQgb3Igbm90LiBGb3IgYWxsIG90aGVyIGV2ZW50IHR5cGVzLCB0 aGF0IHN0YXRlIGlzIGluc3RlYWQKKyAgICAgICAgdHJhY2tlZCBieSB0aGUgcmV0dXJuIHZhbHVl IG9mIHRoZSB2YXJpb3VzIGV2ZW50IGhhbmRsZXJzLgorCisgICAgICAgIEFzIGEgZmlyc3Qgc3Rl cCwgYWRkIHJldHVybiB2YWx1ZXMgdG8gdGhlIHZhcmlvdXMgaGFuZGxlV2hlZWxFdmVudCBmdW5j dGlvbnMgYW5kCisgICAgICAgIGFkZCBhbiBhc3NlcnRpb24gaW4gRXZlbnRIYW5kbGVyOjp3aGVl bEV2ZW50IHRoYXQgdGhlIHJldHVybiB2YWx1ZSBpcyB0aGUgc2FtZSBhcworICAgICAgICB0aGUg c3RhdGUgb2YgUGxhdGZvcm1XaGVlbEV2ZW50Ojppc0FjY2VwdGVkLgorCisgICAgICAgICogQ29u ZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZzoKKyAgICAgICAgRG9uJ3Qgd2FybiB3aGVuIHVzaW5n IEMrKzExIGV4dGVuc2lvbnMuCisKKyAgICAgICAgKiBwYWdlL21hYy9FdmVudEhhbmRsZXJNYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OndoZWVsRXZlbnQpOgorICAgICAg ICBBc3NlcnQgdGhhdCBpc0FjY2VwdGVkIG1hdGNoZXMgdGhlIHJldHVybiB2YWx1ZS4KKworICAg ICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgUmV0dXJuIGlzQWNjZXB0 ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oOgorICAgICAgICBIYW5k bGVXaGVlbEV2ZW50IG5vdyByZXR1cm5zIGEgYm9vbGVhbi4KKworICAgICAgICAqIHBsYXRmb3Jt L1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6d2hlZWxFdmVu dCk6CisgICAgICAgIFJldHVybiB3aGV0aGVyIHRoZSBldmVudCB3YXMgaGFuZGxlZCBvciBub3Qu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6CisgICAgICAgIFNjcm9sbFZpZXc6 OndoZWVsRXZlbnQgbm93IHJldHVybnMgYSBib29sLgorCisgICAgICAgICogcGxhdGZvcm0vU2Ny b2xsYWJsZUFyZWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OmhhbmRs ZVdoZWVsRXZlbnQpOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAg ICAgIFNjcm9sbGFibGVBcmVhOjpoYW5kbGVXaGVlbEV2ZW50IG5vdyByZXR1cm5zIGEgYm9vbC4K KworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxBbmltYXRvckNocm9taXVtTWFj Lm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYzo6aGFuZGxl V2hlZWxFdmVudCk6CisgICAgICAgIEFkZCByZXR1cm4gdmFsdWVzLCBiYXNlZCBvbiBlaXRoZXIg dGhlIGJhc2UgY2xhc3MgY2FsbHMgb3IgdGhlIHN0YXRlIG9mCisgICAgICAgIFBsYXRmb3JtV2hl ZWxFdmVudDo6aXNBY2NlcHRlZCgpLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFu aW1hdG9yTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQp OgorICAgICAgICBEaXR0by4KKwogMjAxMS0xMC0wMyAgTWljaGFlbCBOb3JkbWFuICA8bWljaGFl bG5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBBIGxpdHRsZSBtb3JlIFdlYlNRTERhdGFiYXNlIHRo cmVhZCBzYWZldHkuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Db25maWd1cmF0aW9ucy9CYXNlLnhj Y29uZmlnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NvbmZpZ3VyYXRpb25zL0Jhc2Uu eGNjb25maWcJKHJldmlzaW9uIDk2NTQ4KQorKysgU291cmNlL1dlYkNvcmUvQ29uZmlndXJhdGlv bnMvQmFzZS54Y2NvbmZpZwkod29ya2luZyBjb3B5KQpAQCAtMjMsNiArMjMsNyBAQAogCiAjaW5j bHVkZSAiQ29tcGlsZXJWZXJzaW9uLnhjY29uZmlnIgogCitDTEFOR19XQVJOX0NYWDBYX0VYVEVO U0lPTlMgPSBOTzsKIERFQlVHX0lORk9STUFUSU9OX0ZPUk1BVCA9IGR3YXJmOwogR0NDX0NfTEFO R1VBR0VfU1RBTkRBUkQgPSBnbnU5OTsKIEdDQ19ERUJVR0dJTkdfU1lNQk9MUyA9IGRlZmF1bHQ7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCShyZXZp c2lvbiA5NjU0OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5t bQkod29ya2luZyBjb3B5KQpAQCAtMTA2LDggKzEwNiw5IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjp3 aGVlbEV2ZW50KE5TRXZlbnQgKmUKICAgICBDdXJyZW50RXZlbnRTY29wZSBzY29wZShldmVudCk7 CiAKICAgICBQbGF0Zm9ybVdoZWVsRXZlbnQgd2hlZWxFdmVudChldmVudCwgcGFnZS0+Y2hyb21l KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpKTsKLSAgICBoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZl bnQpOworICAgIGJvb2wgaGFuZGxlZCA9IGhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7CiAK KyAgICBBU1NFUlQoaGFuZGxlZCA9PSB3aGVlbEV2ZW50LmlzQWNjZXB0ZWQoKSk7CiAgICAgcmV0 dXJuIHdoZWVsRXZlbnQuaXNBY2NlcHRlZCgpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCShyZXZpc2lvbiA5NjU0OCkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEs NyArODEsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yOjpzY3JvbGxUb09mZnNldFdpdGhvCiAgICAg fQogfQogCi12b2lkIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KFBsYXRmb3JtV2hl ZWxFdmVudCYgZSkKK2Jvb2wgU2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQoUGxhdGZv cm1XaGVlbEV2ZW50JiBlKQogewogICAgIFNjcm9sbGJhciogaG9yaXpvbnRhbFNjcm9sbGJhciA9 IG1fc2Nyb2xsYWJsZUFyZWEtPmhvcml6b250YWxTY3JvbGxiYXIoKTsKICAgICBTY3JvbGxiYXIq IHZlcnRpY2FsU2Nyb2xsYmFyID0gbV9zY3JvbGxhYmxlQXJlYS0+dmVydGljYWxTY3JvbGxiYXIo KTsKQEAgLTExMSw2ICsxMTEsOCBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2 ZW50KFBsCiAgICAgICAgIGlmIChkZWx0YVgpCiAgICAgICAgICAgICBzY3JvbGwoSG9yaXpvbnRh bFNjcm9sbGJhciwgU2Nyb2xsQnlQaXhlbCwgaG9yaXpvbnRhbFNjcm9sbGJhci0+cGl4ZWxTdGVw KCksIC1kZWx0YVgpOwogICAgIH0KKworICAgIHJldHVybiBlLmlzQWNjZXB0ZWQoKTsKIH0KIAog I2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbEFuaW1hdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsQW5pbWF0b3IuaAkocmV2aXNpb24gOTY1NDgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxBbmltYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC02Myw3ICs2Myw3IEBAIHB1 YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRJc0FjdGl2ZSgpIHsgfQogCi0gICAgdmlydHVh bCB2b2lkIGhhbmRsZVdoZWVsRXZlbnQoUGxhdGZvcm1XaGVlbEV2ZW50Jik7CisgICAgdmlydHVh bCBib29sIGhhbmRsZVdoZWVsRXZlbnQoUGxhdGZvcm1XaGVlbEV2ZW50Jik7CiAjaWYgRU5BQkxF KEdFU1RVUkVfRVZFTlRTKQogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVHZXN0dXJlRXZlbnQoY29u c3QgUGxhdGZvcm1HZXN0dXJlRXZlbnQmKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsVmlldy5jcHAJKHJldmlzaW9uIDk2NTQ4KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc5Nyw3ICs3OTcsNyBA QCB2b2lkIFNjcm9sbFZpZXc6OnNldFNjcm9sbGJhck92ZXJsYXlTdHlsCiAgICAgcGxhdGZvcm1T ZXRTY3JvbGxiYXJPdmVybGF5U3R5bGUob3ZlcmxheVN0eWxlKTsKIH0KIAotdm9pZCBTY3JvbGxW aWV3Ojp3aGVlbEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYgZSkKK2Jvb2wgU2Nyb2xsVmlldzo6 d2hlZWxFdmVudChQbGF0Zm9ybVdoZWVsRXZlbnQmIGUpCiB7CiAgICAgLy8gV2UgZG9uJ3QgYWxs b3cgbW91c2Ugd2hlZWxpbmcgdG8gaGFwcGVuIGluIGEgU2Nyb2xsVmlldyB0aGF0IGhhcyBoYWQg aXRzIHNjcm9sbGJhcnMgZXhwbGljaXRseSBkaXNhYmxlZC4KICNpZiBQTEFURk9STShXWCkKQEAg LTgwNSwxMCArODA1LDEwIEBAIHZvaWQgU2Nyb2xsVmlldzo6d2hlZWxFdmVudChQbGF0Zm9ybVdo ZWUKICNlbHNlCiAgICAgaWYgKCFjYW5IYXZlU2Nyb2xsYmFycygpIHx8IHBsYXRmb3JtV2lkZ2V0 KCkpIHsKICNlbmRpZgotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICB9CiAKLSAgICBTY3JvbGxhYmxlQXJlYTo6aGFuZGxlV2hlZWxFdmVudChlKTsKKyAgICByZXR1 cm4gU2Nyb2xsYWJsZUFyZWE6OmhhbmRsZVdoZWVsRXZlbnQoZSk7CiB9CiAKICNpZiBFTkFCTEUo R0VTVFVSRV9FVkVOVFMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCShy ZXZpc2lvbiA5NjU0OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtMjM0LDcgKzIzNCw3IEBAIHB1YmxpYzoKICAgICAvLyBUaGlzIGZ1 bmN0aW9uIGV4aXN0cyBmb3Igc2Nyb2xsdmlld3MgdGhhdCBuZWVkIHRvIGhhbmRsZSB3aGVlbCBl dmVudHMgbWFudWFsbHkuCiAgICAgLy8gT24gTWFjIHRoZSB1bmRlcmx5aW5nIE5TU2Nyb2xsVmll dyBqdXN0IGRvZXMgdGhlIHNjcm9sbGluZywgYnV0IG9uIG90aGVyIHBsYXRmb3JtcwogICAgIC8v IChsaWtlIFdpbmRvd3MpLCB3ZSBuZWVkIHRoaXMgZnVuY3Rpb24gaW4gb3JkZXIgdG8gZG8gdGhl IHNjcm9sbCBvdXJzZWx2ZXMuCi0gICAgdm9pZCB3aGVlbEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVu dCYpOworICAgIGJvb2wgd2hlZWxFdmVudChQbGF0Zm9ybVdoZWVsRXZlbnQmKTsKICNpZiBFTkFC TEUoR0VTVFVSRV9FVkVOVFMpCiAgICAgdm9pZCBnZXN0dXJlRXZlbnQoY29uc3QgUGxhdGZvcm1H ZXN0dXJlRXZlbnQmKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsYWJsZUFyZWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbGFibGVBcmVhLmNwcAkocmV2aXNpb24gOTY1NDgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMyw5ICsxMjMsOSBA QCB2b2lkIFNjcm9sbGFibGVBcmVhOjpzY3JvbGxUb1lPZmZzZXRXaXRoCiAgICAgc2Nyb2xsVG9P ZmZzZXRXaXRob3V0QW5pbWF0aW9uKEZsb2F0UG9pbnQoc2Nyb2xsQW5pbWF0b3IoKS0+Y3VycmVu dFBvc2l0aW9uKCkueCgpLCB5KSk7CiB9CiAKLXZvaWQgU2Nyb2xsYWJsZUFyZWE6OmhhbmRsZVdo ZWVsRXZlbnQoUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQorYm9vbCBTY3JvbGxhYmxl QXJlYTo6aGFuZGxlV2hlZWxFdmVudChQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7 Ci0gICAgc2Nyb2xsQW5pbWF0b3IoKS0+aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKKyAg ICByZXR1cm4gc2Nyb2xsQW5pbWF0b3IoKS0+aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsK IH0KIAogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAkocmV2aXNpb24gOTY1NDgpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNjcm9sbFRvWE9mZnNldFdpdGhvdXRBbmltYXRpb24oZmxv YXQgeCk7CiAgICAgdm9pZCBzY3JvbGxUb1lPZmZzZXRXaXRob3V0QW5pbWF0aW9uKGZsb2F0IHgp OwogCi0gICAgdm9pZCBoYW5kbGVXaGVlbEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYpOworICAg IGJvb2wgaGFuZGxlV2hlZWxFdmVudChQbGF0Zm9ybVdoZWVsRXZlbnQmKTsKICNpZiBFTkFCTEUo R0VTVFVSRV9FVkVOVFMpCiAgICAgdm9pZCBoYW5kbGVHZXN0dXJlRXZlbnQoY29uc3QgUGxhdGZv cm1HZXN0dXJlRXZlbnQmKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMuaAko cmV2aXNpb24gOTY1NDgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3Jv bGxBbmltYXRvckNocm9taXVtTWFjLmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDcgKzU5LDcgQEAg cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxUb09mZnNldFdpdGhvdXRBbmltYXRpb24o Y29uc3QgRmxvYXRQb2ludCYpOwogCiAjaWYgRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQotICAgIHZp cnR1YWwgdm9pZCBoYW5kbGVXaGVlbEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYpOworICAgIHZp cnR1YWwgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYpIE9WRVJSSURF OwogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlR2Vz dHVyZUV2ZW50KGNvbnN0IFBsYXRmb3JtR2VzdHVyZUV2ZW50Jik7CiAjZW5kaWYKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xs QW5pbWF0b3JDaHJvbWl1bU1hYy5tbQkocmV2aXNpb24gOTY1NDgpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxBbmltYXRvckNocm9taXVtTWFjLm1tCSh3b3JraW5n IGNvcHkpCkBAIC03ODEsMjkgKzc4MSwyMyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNTY3JvbGxp bmdSaWdodEFuZFNoCiAgICAgcmV0dXJuIHdoZWVsRXZlbnQuZGVsdGFYKCkgPCAwICYmICFzY3Jv bGxhYmxlQXJlYS0+c2hvdWxkUnViYmVyQmFuZEluRGlyZWN0aW9uKFNjcm9sbFJpZ2h0KTsKIH0K IAotdm9pZCBTY3JvbGxBbmltYXRvckNocm9taXVtTWFjOjpoYW5kbGVXaGVlbEV2ZW50KFBsYXRm b3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKK2Jvb2wgU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1h Yzo6aGFuZGxlV2hlZWxFdmVudChQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAg ICAgbV9oYXZlU2Nyb2xsZWRTaW5jZVBhZ2VMb2FkID0gdHJ1ZTsKIAotICAgIGlmICghd2hlZWxF dmVudC5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVsdGFzKCkpIHsKLSAgICAgICAgU2Nyb2xsQW5pbWF0 b3I6OmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9 CisgICAgaWYgKCF3aGVlbEV2ZW50Lmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSkKKyAgICAg ICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwog CiAgICAgLy8gRklYTUU6IFRoaXMgaXMgc29tZXdoYXQgcm91bmRhYm91dCBoYWNrIHRvIGFsbG93 IGZvcndhcmRpbmcgd2hlZWwgZXZlbnRzCiAgICAgLy8gdXAgdG8gdGhlIHBhcmVudCBzY3JvbGxh YmxlIGFyZWEuIEl0IHRha2VzIGFkdmFudGFnZSBvZiB0aGUgZmFjdCB0aGF0CiAgICAgLy8gdGhl IGJhc2UgY2xhc3MgaW1wbGVtZW5hdGF0aW9uIG9mIGhhbmRsZVdoZWVsRXZlbnQgd2lsbCBub3Qg YWNjZXB0IHRoZQogICAgIC8vIHdoZWVsIGV2ZW50IGlmIHRoZXJlIGlzIG5vd2hlcmUgdG8gc2Ny b2xsLgogICAgIGlmIChmYWJzZih3aGVlbEV2ZW50LmRlbHRhWSgpKSA+PSBmYWJzZih3aGVlbEV2 ZW50LmRlbHRhWCgpKSkgewotICAgICAgICBpZiAoIWFsbG93c1ZlcnRpY2FsU3RyZXRjaGluZygp KSB7Ci0gICAgICAgICAgICBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2 ZW50KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgICAgICBpZiAoIWFsbG93 c1ZlcnRpY2FsU3RyZXRjaGluZygpKQorICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9y OjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGlm ICghYWxsb3dzSG9yaXpvbnRhbFN0cmV0Y2hpbmcoKSkgewotICAgICAgICAgICAgU2Nyb2xsQW5p bWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7Ci0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKCFhbGxvd3NIb3Jpem9udGFsU3RyZXRjaGluZygpKQor ICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVs RXZlbnQpOwogICAgICAgICAKICAgICAgICAgaWYgKG1fc2Nyb2xsYWJsZUFyZWEtPmhvcml6b250 YWxTY3JvbGxiYXIoKSkgewogICAgICAgICAgICAgLy8gSWYgdGhlcmUgaXMgYSBzY3JvbGxiYXIs IHdlIGFnZ3JlZ2F0ZSB0aGUgd2hlZWwgZXZlbnRzIHRvIGdldCBhbgpAQCAtODI5LDggKzgyMyw3 IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYzo6aGFuZGxlV2gKICAgICAgICAgICAg ICAgICAoaXNTY3JvbGxpbmdSaWdodEFuZFNob3VsZE5vdFJ1YmJlckJhbmQod2hlZWxFdmVudCwg bV9zY3JvbGxhYmxlQXJlYSkgJiYKICAgICAgICAgICAgICAgICBtX3Njcm9sbGVySW5pdGlhbGx5 UGlubmVkT25SaWdodCAmJgogICAgICAgICAgICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPmlzSG9y aXpvbnRhbFNjcm9sbGVyUGlubmVkVG9NYXhpbXVtUG9zaXRpb24oKSkpIHsKLSAgICAgICAgICAg ICAgICBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKLSAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9y OjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfQpAQCAtODQwLDEyICs4MzMsMTQgQEAgdm9pZCBTY3JvbGxBbmltYXRvckNocm9taXVt TWFjOjpoYW5kbGVXaAogICAgICAgICBpZiAod2hlZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgPT0g UGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VFbmRlZCkgewogICAgICAgICAgICAgbV9pZ25vcmVNb21l bnR1bVNjcm9sbHMgPSBmYWxzZTsKICAgICAgICAgICAgIHdoZWVsRXZlbnQuYWNjZXB0KCk7Cisg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQotICAgICAgICByZXR1cm47CisgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICB3aGVlbEV2ZW50LmFjY2VwdCgpOwogICAg IHNtb290aFNjcm9sbFdpdGhFdmVudCh3aGVlbEV2ZW50KTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0K IAogdm9pZCBTY3JvbGxBbmltYXRvckNocm9taXVtTWFjOjpoYW5kbGVHZXN0dXJlRXZlbnQoY29u c3QgUGxhdGZvcm1HZXN0dXJlRXZlbnQmIGdlc3R1cmVFdmVudCkKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCShyZXZpc2lvbiA5NjU0 OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCSh3 b3JraW5nIGNvcHkpCkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKGNvbnN0IEZsb2F0UG9pbnQmKTsKIAogI2lm IEVOQUJMRShSVUJCRVJfQkFORElORykKLSAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlV2hlZWxFdmVu dChQbGF0Zm9ybVdoZWVsRXZlbnQmKTsKKyAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlV2hlZWxFdmVu dChQbGF0Zm9ybVdoZWVsRXZlbnQmKSBPVkVSUklERTsKICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVO VFMpCiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZUdlc3R1cmVFdmVudChjb25zdCBQbGF0Zm9ybUdl c3R1cmVFdmVudCYpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv U2Nyb2xsQW5pbWF0b3JNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCShyZXZpc2lvbiA5NjU0OCkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQkod29ya2luZyBjb3B5KQpA QCAtNzkyLDI5ICs3OTIsMjQgQEAgc3RhdGljIGlubGluZSBib29sIGlzU2Nyb2xsaW5nUmlnaHRB bmRTaAogICAgIHJldHVybiB3aGVlbEV2ZW50LmRlbHRhWCgpIDwgMCAmJiAhc2Nyb2xsYWJsZUFy ZWEtPnNob3VsZFJ1YmJlckJhbmRJbkRpcmVjdGlvbihTY3JvbGxSaWdodCk7CiB9CiAKLXZvaWQg U2Nyb2xsQW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQoUGxhdGZvcm1XaGVlbEV2ZW50JiB3 aGVlbEV2ZW50KQorYm9vbCBTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChQbGF0 Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAgICAgbV9oYXZlU2Nyb2xsZWRTaW5jZVBh Z2VMb2FkID0gdHJ1ZTsKIAogICAgIGlmICghd2hlZWxFdmVudC5oYXNQcmVjaXNlU2Nyb2xsaW5n RGVsdGFzKCkpIHsKLSAgICAgICAgU2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQod2hl ZWxFdmVudCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9y OjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBU aGlzIGlzIHNvbWV3aGF0IHJvdW5kYWJvdXQgaGFjayB0byBhbGxvdyBmb3J3YXJkaW5nIHdoZWVs IGV2ZW50cwogICAgIC8vIHVwIHRvIHRoZSBwYXJlbnQgc2Nyb2xsYWJsZSBhcmVhLiBJdCB0YWtl cyBhZHZhbnRhZ2Ugb2YgdGhlIGZhY3QgdGhhdAotICAgIC8vIHRoZSBiYXNlIGNsYXNzIGltcGxl bWVuYXRhdGlvbiBvZiBoYW5kbGVXaGVlbEV2ZW50IHdpbGwgbm90IGFjY2VwdCB0aGUKKyAgICAv LyB0aGUgYmFzZSBjbGFzcyBpbXBsZW1lbnRhdGlvbiBvZiBoYW5kbGVXaGVlbEV2ZW50IHdpbGwg bm90IGFjY2VwdCB0aGUKICAgICAvLyB3aGVlbCBldmVudCBpZiB0aGVyZSBpcyBub3doZXJlIHRv IHNjcm9sbC4KICAgICBpZiAoZmFic2Yod2hlZWxFdmVudC5kZWx0YVkoKSkgPj0gZmFic2Yod2hl ZWxFdmVudC5kZWx0YVgoKSkpIHsKLSAgICAgICAgaWYgKCFhbGxvd3NWZXJ0aWNhbFN0cmV0Y2hp bmcoKSkgewotICAgICAgICAgICAgU2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQod2hl ZWxFdmVudCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKCFh bGxvd3NWZXJ0aWNhbFN0cmV0Y2hpbmcoKSkKKyAgICAgICAgICAgIHJldHVybiBTY3JvbGxBbmlt YXRvcjo6aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKICAgICB9IGVsc2UgewotICAgICAg ICBpZiAoIWFsbG93c0hvcml6b250YWxTdHJldGNoaW5nKCkpIHsKLSAgICAgICAgICAgIFNjcm9s bEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwotICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICB9CisgICAgICAgIGlmICghYWxsb3dzSG9yaXpvbnRhbFN0cmV0Y2hpbmco KSkKKyAgICAgICAgICAgIHJldHVybiBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudCh3 aGVlbEV2ZW50KTsKICAgICAgICAgCiAgICAgICAgIGlmIChtX3Njcm9sbGFibGVBcmVhLT5ob3Jp em9udGFsU2Nyb2xsYmFyKCkpIHsKICAgICAgICAgICAgIC8vIElmIHRoZXJlIGlzIGEgc2Nyb2xs YmFyLCB3ZSBhZ2dyZWdhdGUgdGhlIHdoZWVsIGV2ZW50cyB0byBnZXQgYW4KQEAgLTg0MCw4ICs4 MzUsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50CiAgICAgICAg ICAgICAgICAgKGlzU2Nyb2xsaW5nUmlnaHRBbmRTaG91bGROb3RSdWJiZXJCYW5kKHdoZWVsRXZl bnQsIG1fc2Nyb2xsYWJsZUFyZWEpICYmCiAgICAgICAgICAgICAgICAgbV9zY3JvbGxlckluaXRp YWxseVBpbm5lZE9uUmlnaHQgJiYKICAgICAgICAgICAgICAgICBtX3Njcm9sbGFibGVBcmVhLT5p c0hvcml6b250YWxTY3JvbGxlclBpbm5lZFRvTWF4aW11bVBvc2l0aW9uKCkpKSB7Ci0gICAgICAg ICAgICAgICAgU2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7Ci0g ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIHJldHVybiBTY3JvbGxBbmlt YXRvcjo6aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0KQEAgLTg1MSwxMiArODQ1LDE0IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6 OmhhbmRsZVdoZWVsRXZlbnQKICAgICAgICAgaWYgKHdoZWVsRXZlbnQubW9tZW50dW1QaGFzZSgp ID09IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlRW5kZWQpIHsKICAgICAgICAgICAgIG1faWdub3Jl TW9tZW50dW1TY3JvbGxzID0gZmFsc2U7CiAgICAgICAgICAgICB3aGVlbEV2ZW50LmFjY2VwdCgp OworICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuOwor ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgd2hlZWxFdmVudC5hY2NlcHQoKTsK ICAgICBzbW9vdGhTY3JvbGxXaXRoRXZlbnQod2hlZWxFdmVudCk7CisgICAgcmV0dXJuIHRydWU7 CiB9CiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmhhbmRsZUdlc3R1cmVFdmVudChjb25zdCBQ bGF0Zm9ybUdlc3R1cmVFdmVudCYgZ2VzdHVyZUV2ZW50KQo=