71078 2011-10-27 16:28:00 -0700 [chromium] Track wheel event handler registration and pass to input filter 2011-10-28 16:30:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr enne fishd jamesr kbr nduca vangelis webkit.review.bot oldest_to_newest 492080 0 jamesr 2011-10-27 16:28:00 -0700 [chromium] Track wheel event handler registration and pass to input filter 492083 1 112779 jamesr 2011-10-27 16:30:38 -0700 Created attachment 112779 Patch 492085 2 jamesr 2011-10-27 16:31:48 -0700 This should make it much easier to test compositor threading things. This patch changes the behavior when --enable-threaded-compositing is passed in, but that's not yet a supported configuration. 492119 3 112779 vangelis 2011-10-27 17:21:45 -0700 Comment on attachment 112779 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112779&action=review Looks good > Source/WebKit/chromium/src/WebViewImpl.cpp:786 > + m_haveWheelEventHandlers = numberOfWheelHandlers; Is this WebKit style? I would find something like: m_haveWheelEventHandlers = (numberOfWheelHandlers > 0) a bit easier to read. 492122 4 jamesr 2011-10-27 17:24:41 -0700 WK style is to avoid comparisons to 0 generally, but I agree that it'd be nice to call out the int->bool conversion here. Will change. 492125 5 112787 jamesr 2011-10-27 17:29:08 -0700 Created attachment 112787 Patch 492507 6 112787 kbr 2011-10-28 10:20:38 -0700 Comment on attachment 112787 Patch Looks fine. r=me 492777 7 jamesr 2011-10-28 16:30:17 -0700 Committed r98778: <http://trac.webkit.org/changeset/98778> 112779 2011-10-27 16:30:38 -0700 2011-10-27 17:29:04 -0700 Patch bug-71078-20111027163037.patch text/plain 12658 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogOTg2MzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlODNmYWZiMzZhZjVjZjk1 MDkxY2ViMmZhYmU5MTQzMDI5YWYyYTIxLi43Y2FjMDRjM2Y0ZDhlZTE5NzhkOGZjYTJmM2JkOTRi NWNmNDE2NDE1IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMTAtMjcgIEphbWVz IFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFRy YWNrIHdoZWVsIGV2ZW50IGhhbmRsZXIgcmVnaXN0cmF0aW9uIGFuZCBwYXNzIHRvIGlucHV0IGZp bHRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzEw NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IHByb3BhZ2F0ZXMgbW91c2Ugd2hlZWwgcmVnaXN0cmF0aW9uIG5vdGlmaWNhdGlvbnMgdG8gdGhl IGNvbXBvc2l0b3IgaW5wdXQgZmlsdGVyLiBJZiB0aGVyZSBhcmUgYW55IGhhbmRsZXJzCisgICAg ICAgIHJlZ2lzdGVyZWQsIHdoaWNoIGluY2x1ZGVzIEpTIGhhbmRsZXJzIGFuZCBzY3JvbGxhYmxl IGFyZWFzIG90aGVyIHRoYW4gdGhlIG1haW4gdmlldywgdGhlIGlucHV0IGZpbHRlciB3aWxsIHBh c3MKKyAgICAgICAgbW91c2Ugd2hlZWwgZXZlbnRzIHRvIHRoZSB3aWRnZXQuIE90aGVyd2lzZSB3 aGVuIHRocmVhZGVkIGNvbXBvc2l0aW5nIGlzIGVuYWJsZWQgdGhlIGlucHV0IGZpbHRlciB0cmFu c2xhdGVzCisgICAgICAgIHdoZWVsIGV2ZW50cyBpbnRvIHJvb3QgbGF5ZXIgc2Nyb2xsaW5nLgor CisgICAgICAgIE9ubHkgY2hhbmdlcyBiZWhhdmlvciB3aXRoIGFuIG9mZi1ieS1kZWZhdWx0IGZs YWcgZW5hYmxlZCwgc28gbm8gdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXll clRyZWVIb3N0OjpDQ0xheWVyVHJlZUhvc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRy ZWVIb3N0OjpmaW5pc2hDb21taXRPbkltcGxUaHJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6Q0NM YXllclRyZWVIb3N0OjpzZXRIYXZlV2hlZWxFdmVudEhhbmRsZXJzKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9zdEltcGw6OkNDTGF5ZXJUcmVlSG9zdEltcGwp OgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6aGF2ZVdoZWVsRXZlbnRI YW5kbGVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0SW1wbC5oOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6 c2V0SGF2ZVdoZWVsRXZlbnRIYW5kbGVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NTY3JvbGxDb250cm9sbGVyLmg6CisKIDIwMTEtMTAtMjcgIFRvbnkgQ2hh bmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBmaXggc2l6aW5nIG9mIGF1dG8gc2l6 ZWQgZmxleGJveApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1M2M1YzZjY2IyMmQ1YzYy NzQ5M2I3ZmQ4NmVkZjMwNjFhM2FkY2U3Li5hMzA3ZDUwOTk3MTI1YWY4OWY2NjNmZjg0YWM2ZDgy YjljYjg5NTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisy MDExLTEwLTI3ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgW2Nocm9taXVtXSBUcmFjayB3aGVlbCBldmVudCBoYW5kbGVyIHJlZ2lzdHJhdGlvbiBhbmQg cGFzcyB0byBpbnB1dCBmaWx0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcxMDc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUHVzaGVzIG1vdXNlIHdoZWVsIGV2ZW50IGhhbmRsZXIgbm90aWZpY2F0aW9u cyB0byBDQ0xheWVyVHJlZUhvc3Qgd2hlbiBjb21wb3NpdGluZy4KKworICAgICAgICAqIHNyYy9D aHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6 bnVtV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCk6CisgICAgICAgICogc3JjL1dlYkNvbXBvc2l0 b3JJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29tcG9zaXRvckltcGw6OmhhbmRsZUlu cHV0RXZlbnQpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXdJbXBsOjpudW1iZXJPZldoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0 aXZlKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMS0xMC0yNyAgQW50b2lu ZSBMYWJvdXIgIDxwaW1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IHRlYXJkb3duIGlu IFdlYipMYXllckltcGwsIGFuZCBhZGQgdGVzdHMgZm9yIFdlYipMYXllcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggNDE4ZDUyOThkMTA2YjlmZWRlN2NiZTFiNGE0YTMwMGE1 MGI5ZWNjYS4uODA4MGRjMzAxMWExMmE0YjRjZmRmYmYzYTIyMWQ3ZTg3NmExZjQwMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCkBAIC01Niw2ICs1Niw3IEBAIENDTGF5ZXJUcmVl SG9zdDo6Q0NMYXllclRyZWVIb3N0KENDTGF5ZXJUcmVlSG9zdENsaWVudCogY2xpZW50LCBQYXNz UmVmUHRyPExheWVyCiAgICAgLCBtX3Jvb3RMYXllcihyb290TGF5ZXIpCiAgICAgLCBtX3NldHRp bmdzKHNldHRpbmdzKQogICAgICwgbV92aXNpYmxlKHRydWUpCisgICAgLCBtX2hhdmVXaGVlbEV2 ZW50SGFuZGxlcnMoZmFsc2UpCiB7CiAgICAgQ0NNYWluVGhyZWFkOjppbml0aWFsaXplKCk7CiAg ICAgQVNTRVJUKENDUHJveHk6OmlzTWFpblRocmVhZCgpKTsKQEAgLTEyOCw2ICsxMjksNyBAQCB2 b2lkIENDTGF5ZXJUcmVlSG9zdDo6ZmluaXNoQ29tbWl0T25JbXBsVGhyZWFkKENDTGF5ZXJUcmVl SG9zdEltcGwqIGhvc3RJbXBsKQogICAgIEFTU0VSVChDQ1Byb3h5Ojppc0ltcGxUaHJlYWQoKSk7 CiAgICAgaG9zdEltcGwtPnNldFNvdXJjZUZyYW1lTnVtYmVyKGZyYW1lTnVtYmVyKCkpOwogICAg IGhvc3RJbXBsLT5zZXRWaXNpYmxlKG1fdmlzaWJsZSk7CisgICAgaG9zdEltcGwtPnNldEhhdmVX aGVlbEV2ZW50SGFuZGxlcnMobV9oYXZlV2hlZWxFdmVudEhhbmRsZXJzKTsKICAgICBob3N0SW1w bC0+c2V0Wm9vbUFuaW1hdG9yVHJhbnNmb3JtKG1fem9vbUFuaW1hdG9yVHJhbnNmb3JtKTsKICAg ICBob3N0SW1wbC0+c2V0Vmlld3BvcnQodmlld3BvcnRTaXplKCkpOwogCkBAIC0yMzYsNiArMjM4 LDE1IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0OjpzZXRWaXNpYmxlKGJvb2wgdmlzaWJsZSkKICAg ICB9CiB9CiAKK3ZvaWQgQ0NMYXllclRyZWVIb3N0OjpzZXRIYXZlV2hlZWxFdmVudEhhbmRsZXJz KGJvb2wgaGF2ZVdoZWVsRXZlbnRIYW5kbGVycykKK3sKKyAgICBpZiAobV9oYXZlV2hlZWxFdmVu dEhhbmRsZXJzID09IGhhdmVXaGVlbEV2ZW50SGFuZGxlcnMpCisgICAgICAgIHJldHVybjsKKyAg ICBtX2hhdmVXaGVlbEV2ZW50SGFuZGxlcnMgPSBoYXZlV2hlZWxFdmVudEhhbmRsZXJzOworICAg IG1fcHJveHktPnNldE5lZWRzQ29tbWl0KCk7Cit9CisKKwogdm9pZCBDQ0xheWVyVHJlZUhvc3Q6 Omxvc2VDb21wb3NpdG9yQ29udGV4dChpbnQgbnVtVGltZXMpCiB7CiAgICAgbV9wcm94eS0+bG9z ZUNvbXBvc2l0b3JDb250ZXh0KG51bVRpbWVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgK aW5kZXggMWM0ZDQzMWQ4NjAyMzQ4Y2Q3ZmVkODdlNjBmODhmZmI1NTQ2OTFkMC4uY2NlMDViYTQz NGNhOTczOWU1NmUwNTEyOWQyMjIyM2QxNDhhMWJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0LmgKQEAgLTE1Nyw2ICsxNTcsNyBAQCBwdWJsaWM6CiAgICAgVGV4dHVyZU1hbmFnZXIqIGNv bnRlbnRzVGV4dHVyZU1hbmFnZXIoKSBjb25zdDsKIAogICAgIHZvaWQgc2V0VmlzaWJsZShib29s KTsKKyAgICB2b2lkIHNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnMoYm9vbCk7CiAKICAgICB2b2lk IHVwZGF0ZUxheWVycygpOwogCkBAIC0xNjQsNiArMTY1LDcgQEAgcHVibGljOgogICAgIHZvaWQg YXBwbHlTY3JvbGxEZWx0YXMoY29uc3QgQ0NTY3JvbGxVcGRhdGVTZXQmKTsKICAgICB2b2lkIHN0 YXJ0UmF0ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0QqKTsKICAgICB2b2lkIHN0b3BSYXRlTGlt aXRlcihHcmFwaGljc0NvbnRleHQzRCopOworCiBwcm90ZWN0ZWQ6CiAgICAgQ0NMYXllclRyZWVI b3N0KENDTGF5ZXJUcmVlSG9zdENsaWVudCosIFBhc3NSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gcm9v dExheWVyLCBjb25zdCBDQ1NldHRpbmdzJik7CiAgICAgYm9vbCBpbml0aWFsaXplKCk7CkBAIC0x OTgsNiArMjAwLDcgQEAgcHJpdmF0ZToKICAgICBJbnRTaXplIG1fdmlld3BvcnRTaXplOwogICAg IFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fem9vbUFuaW1hdG9yVHJhbnNmb3JtOwogICAgIGJvb2wg bV92aXNpYmxlOworICAgIGJvb2wgbV9oYXZlV2hlZWxFdmVudEhhbmRsZXJzOwogICAgIHR5cGVk ZWYgSGFzaE1hcDxHcmFwaGljc0NvbnRleHQzRCosIFJlZlB0cjxSYXRlTGltaXRlcj4gPiBSYXRl TGltaXRlck1hcDsKICAgICBSYXRlTGltaXRlck1hcCBtX3JhdGVMaW1pdGVyczsKIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xh eWVyVHJlZUhvc3RJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCmluZGV4IDUxNGMwZTlmYWIyYTRlYmFm YWJmN2VmMWE3M2E1ZmNjNzBhNDFlNzMuLjUxZDkyZjUwMmJkYTkwMWVjYmExNjUwZTFhMTMwZTc5 ODQwODAzYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCkBAIC00 OSw2ICs0OSw3IEBAIENDTGF5ZXJUcmVlSG9zdEltcGw6OkNDTGF5ZXJUcmVlSG9zdEltcGwoY29u c3QgQ0NTZXR0aW5ncyYgc2V0dGluZ3MsIENDTGF5ZXJUcmVlCiAgICAgLCBtX2ZyYW1lTnVtYmVy KDApCiAgICAgLCBtX3NldHRpbmdzKHNldHRpbmdzKQogICAgICwgbV92aXNpYmxlKHRydWUpCisg ICAgLCBtX2hhdmVXaGVlbEV2ZW50SGFuZGxlcnMoZmFsc2UpCiB7CiAgICAgQVNTRVJUKENDUHJv eHk6OmlzSW1wbFRocmVhZCgpKTsKIH0KQEAgLTE4MSw2ICsxODIsMTEgQEAgdm9pZCBDQ0xheWVy VHJlZUhvc3RJbXBsOjpzY3JvbGxSb290TGF5ZXIoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEp CiAgICAgbV9jbGllbnQtPnNldE5lZWRzUmVkcmF3T25JbXBsVGhyZWFkKCk7CiB9CiAKK2Jvb2wg Q0NMYXllclRyZWVIb3N0SW1wbDo6aGF2ZVdoZWVsRXZlbnRIYW5kbGVycygpCit7CisgICAgcmV0 dXJuIG1faGF2ZVdoZWVsRXZlbnRIYW5kbGVyczsKK30KKwogUGFzc093blB0cjxDQ1Njcm9sbFVw ZGF0ZVNldD4gQ0NMYXllclRyZWVIb3N0SW1wbDo6cHJvY2Vzc1Njcm9sbERlbHRhcygpCiB7CiAg ICAgT3duUHRyPENDU2Nyb2xsVXBkYXRlU2V0PiBzY3JvbGxJbmZvID0gYWRvcHRQdHIobmV3IEND U2Nyb2xsVXBkYXRlU2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5oCmlu ZGV4IGY2YTgzMDIzMmYyMzljOTM5MzI1Y2U1OTQzNDQ5NjAzODYxMWMyZmYuLjJhZmZlYTI2YTFk N2ZhZTIwMmNiZjYwYmRlMTEzNDdhY2U2OWQyY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3RJbXBsLmgKQEAgLTYwLDYgKzYwLDcgQEAgcHVibGljOgogCiAgICAgLy8gQ0NTY3JvbGxD b250cm9sbGVyIGltcGxlbWVudGF0aW9uCiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbFJvb3RMYXll cihjb25zdCBJbnRTaXplJik7CisgICAgdmlydHVhbCBib29sIGhhdmVXaGVlbEV2ZW50SGFuZGxl cnMoKTsKIAogICAgIC8vIFZpcnR1YWwgZm9yIHRlc3RpbmcKICAgICB2aXJ0dWFsIHZvaWQgYmVn aW5Db21taXQoKTsKQEAgLTg2LDYgKzg3LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Um9vdExh eWVyKFBhc3NSZWZQdHI8Q0NMYXllckltcGw+KTsKIAogICAgIHZvaWQgc2V0VmlzaWJsZShib29s KTsKKyAgICB2b2lkIHNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnMoYm9vbCBoYXZlV2hlZWxFdmVu dEhhbmRsZXJzKSB7IG1faGF2ZVdoZWVsRXZlbnRIYW5kbGVycyA9IGhhdmVXaGVlbEV2ZW50SGFu ZGxlcnM7IH0KIAogICAgIGludCBzb3VyY2VGcmFtZU51bWJlcigpIGNvbnN0IHsgcmV0dXJuIG1f c291cmNlRnJhbWVOdW1iZXI7IH0KICAgICB2b2lkIHNldFNvdXJjZUZyYW1lTnVtYmVyKGludCBm cmFtZU51bWJlcikgeyBtX3NvdXJjZUZyYW1lTnVtYmVyID0gZnJhbWVOdW1iZXI7IH0KQEAgLTEx MCw2ICsxMTIsNyBAQCBwcml2YXRlOgogICAgIENDU2V0dGluZ3MgbV9zZXR0aW5nczsKICAgICBJ bnRTaXplIG1fdmlld3BvcnRTaXplOwogICAgIGJvb2wgbV92aXNpYmxlOworICAgIGJvb2wgbV9o YXZlV2hlZWxFdmVudEhhbmRsZXJzOwogfTsKIAogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsQ29udHJvbGxlci5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxDb250 cm9sbGVyLmgKaW5kZXggYmNkMmY1ZjI3NWYzYjdjM2UwOTAyMjRkNWQ2MzVkZjE0OWZmMTlhNS4u OTJiOTVkN2RjYWNkNzRhZGYzZGJlNTZmY2YyYTBkZTA4OThiY2M0MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxDb250cm9s bGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NTY3JvbGxDb250cm9sbGVyLmgKQEAgLTM1LDYgKzM1LDcgQEAgY2xhc3MgQ0NTY3JvbGxDb250 cm9sbGVyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShDQ1Njcm9sbENvbnRyb2xsZXIpOwog cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxSb290TGF5ZXIoY29uc3QgSW50U2l6ZSYp ID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgaGF2ZVdoZWVsRXZlbnRIYW5kbGVycygpID0gMDsKIAog cHJvdGVjdGVkOgogICAgIENDU2Nyb2xsQ29udHJvbGxlcigpIHsgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAppbmRleCBhYTUzNWZmMmY1OWYy MmU5OWUyN2Q3MzMxNjEyNGM3ZTgyYjA0N2M1Li4xZjA2OWM5MjYwNDU4Mjc1ZmQ0YzI0M2ViM2Zm ZjcxNTE4OWQ0YmZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJv bWVDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVD bGllbnRJbXBsLmNwcApAQCAtOTk5LDggKzk5OSw3IEBAIGJvb2wgQ2hyb21lQ2xpZW50SW1wbDo6 c2hvdWxkUnViYmVyQmFuZEluRGlyZWN0aW9uKFdlYkNvcmU6OlNjcm9sbERpcmVjdGlvbiBkaXJl CiAKIHZvaWQgQ2hyb21lQ2xpZW50SW1wbDo6bnVtV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1 bnNpZ25lZCBudW1iZXJPZldoZWVsSGFuZGxlcnMpCiB7Ci0gICAgaWYgKG1fd2ViVmlldy0+Y2xp ZW50KCkpCi0gICAgICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPm51bWJlck9mV2hlZWxFdmVudEhh bmRsZXJzQ2hhbmdlZChudW1iZXJPZldoZWVsSGFuZGxlcnMpOworICAgIG1fd2ViVmlldy0+bnVt YmVyT2ZXaGVlbEV2ZW50SGFuZGxlcnNDaGFuZ2VkKG51bWJlck9mV2hlZWxIYW5kbGVycyk7CiB9 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViQ29tcG9zaXRvckltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViQ29tcG9zaXRvckltcGwuY3BwCmluZGV4IDAyODZmMTk4NzdiMWQ2MDQzZjM1YjYwOTMx YmQ4MzBhOWMzNmRlMDQuLmQ4YmQzYTE2MzQxYjc5YzVmYjIyMWQ3YTNmZTIwZDYxODBjNDlhZDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbXBs LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9ySW1wbC5j cHAKQEAgLTExNiw3ICsxMTYsMTMgQEAgdm9pZCBXZWJDb21wb3NpdG9ySW1wbDo6aGFuZGxlSW5w dXRFdmVudChjb25zdCBXZWJJbnB1dEV2ZW50JiBldmVudCkKIHsKICAgICBBU1NFUlQoQ0NQcm94 eTo6aXNJbXBsVGhyZWFkKCkpOwogICAgIEFTU0VSVChtX2NsaWVudCk7Ci0gICAgLy8gRklYTUU6 IERvIHNvbWV0aGluZyBpbnRlcmVzdGluZyB3aXRoIHRoaXMgaW5wdXQgZXZlbnQgbGlrZSBpbmZv cm0gb3VyIG1fc2Nyb2xsQ29udHJvbGxlci4KKworICAgIGlmIChldmVudC50eXBlID09IFdlYklu cHV0RXZlbnQ6Ok1vdXNlV2hlZWwgJiYgIW1fc2Nyb2xsQ29udHJvbGxlci0+aGF2ZVdoZWVsRXZl bnRIYW5kbGVycygpKSB7CisgICAgICAgIGNvbnN0IFdlYk1vdXNlV2hlZWxFdmVudCYgd2hlZWxF dmVudCA9ICpzdGF0aWNfY2FzdDxjb25zdCBXZWJNb3VzZVdoZWVsRXZlbnQqPigmZXZlbnQpOwor ICAgICAgICBtX3Njcm9sbENvbnRyb2xsZXItPnNjcm9sbFJvb3RMYXllcihJbnRTaXplKC13aGVl bEV2ZW50LmRlbHRhWCwgLXdoZWVsRXZlbnQuZGVsdGFZKSk7CisgICAgICAgIG1fY2xpZW50LT5k aWRIYW5kbGVJbnB1dEV2ZW50KCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgbV9jbGll bnQtPmRpZE5vdEhhbmRsZUlucHV0RXZlbnQodHJ1ZSAvKiBzZW5kVG9XaWRnZXQgKi8pOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggNTAyMzcz YjE3ODNmMjM2M2I0NWFiYWZkZDZlNGI0MzQwMTdkMzI0Ny4uZGQwYzYwNWFhYmY3NGQwMmJjZGU5 YjQ3MTE4ODY0ZGZmNjBiYjQyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcApAQCAtNzgxLDYgKzc4MSwxNyBAQCBib29sIFdlYlZpZXdJbXBsOjp0b3VjaEV2 ZW50KGNvbnN0IFdlYlRvdWNoRXZlbnQmIGV2ZW50KQogfQogI2VuZGlmCiAKK3ZvaWQgV2ViVmll d0ltcGw6Om51bWJlck9mV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1bnNpZ25lZCBudW1iZXJP ZldoZWVsSGFuZGxlcnMpCit7CisgICAgbV9oYXZlV2hlZWxFdmVudEhhbmRsZXJzID0gbnVtYmVy T2ZXaGVlbEhhbmRsZXJzOworICAgIGlmIChtX2NsaWVudCkKKyAgICAgICAgbV9jbGllbnQtPm51 bWJlck9mV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZChudW1iZXJPZldoZWVsSGFuZGxlcnMpOwor I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICBpZiAobV9sYXllclRyZWVIb3N0 KQorICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnMobV9o YXZlV2hlZWxFdmVudEhhbmRsZXJzKTsKKyNlbmRpZgorfQorCiAjaWYgIU9TKERBUldJTikKIC8v IE1hYyBoYXMgbm8gd2F5IHRvIG9wZW4gYSBjb250ZXh0IG1lbnUgYmFzZWQgb24gYSBrZXlib2Fy ZCBldmVudC4KIGJvb2wgV2ViVmlld0ltcGw6OnNlbmRDb250ZXh0TWVudUV2ZW50KGNvbnN0IFdl YktleWJvYXJkRXZlbnQmIGV2ZW50KQpAQCAtMjY4NSw2ICsyNjk2LDcgQEAgdm9pZCBXZWJWaWV3 SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0aXZlKQogICAg ICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50SG9zdCA9IE5vbkNvbXBvc2l0ZWRDb250ZW50SG9z dDo6Y3JlYXRlKFdlYlZpZXdJbXBsQ29udGVudFBhaW50ZXI6OmNyZWF0ZSh0aGlzKSk7CiAgICAg ICAgIG1fbGF5ZXJUcmVlSG9zdCA9IENDTGF5ZXJUcmVlSG9zdDo6Y3JlYXRlKHRoaXMsIG1fbm9u Q29tcG9zaXRlZENvbnRlbnRIb3N0LT50b3BMZXZlbFJvb3RMYXllcigpLT5wbGF0Zm9ybUxheWVy KCksIGNjU2V0dGluZ3MpOwogICAgICAgICBpZiAobV9sYXllclRyZWVIb3N0KSB7CisgICAgICAg ICAgICBtX2xheWVyVHJlZUhvc3QtPnNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnMobV9oYXZlV2hl ZWxFdmVudEhhbmRsZXJzKTsKICAgICAgICAgICAgIHVwZGF0ZUxheWVyVHJlZVZpZXdwb3J0KCk7 CiAgICAgICAgICAgICBtX2NsaWVudC0+ZGlkQWN0aXZhdGVDb21wb3NpdG9yKG1fbGF5ZXJUcmVl SG9zdC0+Y29tcG9zaXRvcklkZW50aWZpZXIoKSk7CiAgICAgICAgICAgICBtX2lzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0FjdGl2ZSA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuaAppbmRleCA1YTFkZDE1NDg5NjIxODhiOTJhZGRiYWRjMDg1OTY2NTFlY2FiNTJi Li44M2I1ZjRiNTU4ODhiZDk0N2RjZjA4NzMwZjZjMzA3YWQzYmVhYTczIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTMwMSw2ICszMDEsOCBAQCBwdWJsaWM6 CiAgICAgYm9vbCBjaGFyRXZlbnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpOwogICAgIGJvb2wg dG91Y2hFdmVudChjb25zdCBXZWJUb3VjaEV2ZW50Jik7CiAKKyAgICB2b2lkIG51bWJlck9mV2hl ZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1bnNpZ25lZCk7CisKICAgICAvLyBIYW5kbGVzIGNvbnRl eHQgbWVudSBldmVudHMgb3JpZ25hdGVkIHZpYSB0aGUgdGhlIGtleWJvYXJkLiBUaGVzZQogICAg IC8vIGluY2x1ZGUgdGhlIFZLX0FQUFMgdmlydHVhbCBrZXkgYW5kIHRoZSBTaGlmdCtGMTAgY29t YmluZS4gQ29kZSBpcwogICAgIC8vIGJhc2VkIG9uIHRoZSBXZWJraXQgZnVuY3Rpb24gYm9vbCBX ZWJWaWV3OjpoYW5kbGVDb250ZXh0TWVudUV2ZW50KFdQQVJBTQpAQCAtNTg1LDYgKzU4Nyw3IEBA IHByaXZhdGU6CiAgICAgLy8gSWYgdHJ1ZSwgdGhlIGdyYXBoaWNzIGNvbnRleHQgaXMgYmVpbmcg cmVzdG9yZWQuCiAgICAgYm9vbCBtX3JlY3JlYXRpbmdHcmFwaGljc0NvbnRleHQ7CiAjZW5kaWYK KyAgICBib29sIG1faGF2ZVdoZWVsRXZlbnRIYW5kbGVyczsKICAgICBzdGF0aWMgY29uc3QgV2Vi SW5wdXRFdmVudCogbV9jdXJyZW50SW5wdXRFdmVudDsKIAogI2lmIEVOQUJMRShJTlBVVF9TUEVF Q0gpCg== 112787 2011-10-27 17:29:08 -0700 2011-10-28 10:20:38 -0700 Patch bug-71078-20111027172907.patch text/plain 12662 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogOTg2MzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlODNmYWZiMzZhZjVjZjk1 MDkxY2ViMmZhYmU5MTQzMDI5YWYyYTIxLi43Y2FjMDRjM2Y0ZDhlZTE5NzhkOGZjYTJmM2JkOTRi NWNmNDE2NDE1IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMTAtMjcgIEphbWVz IFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFRy YWNrIHdoZWVsIGV2ZW50IGhhbmRsZXIgcmVnaXN0cmF0aW9uIGFuZCBwYXNzIHRvIGlucHV0IGZp bHRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzEw NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IHByb3BhZ2F0ZXMgbW91c2Ugd2hlZWwgcmVnaXN0cmF0aW9uIG5vdGlmaWNhdGlvbnMgdG8gdGhl IGNvbXBvc2l0b3IgaW5wdXQgZmlsdGVyLiBJZiB0aGVyZSBhcmUgYW55IGhhbmRsZXJzCisgICAg ICAgIHJlZ2lzdGVyZWQsIHdoaWNoIGluY2x1ZGVzIEpTIGhhbmRsZXJzIGFuZCBzY3JvbGxhYmxl IGFyZWFzIG90aGVyIHRoYW4gdGhlIG1haW4gdmlldywgdGhlIGlucHV0IGZpbHRlciB3aWxsIHBh c3MKKyAgICAgICAgbW91c2Ugd2hlZWwgZXZlbnRzIHRvIHRoZSB3aWRnZXQuIE90aGVyd2lzZSB3 aGVuIHRocmVhZGVkIGNvbXBvc2l0aW5nIGlzIGVuYWJsZWQgdGhlIGlucHV0IGZpbHRlciB0cmFu c2xhdGVzCisgICAgICAgIHdoZWVsIGV2ZW50cyBpbnRvIHJvb3QgbGF5ZXIgc2Nyb2xsaW5nLgor CisgICAgICAgIE9ubHkgY2hhbmdlcyBiZWhhdmlvciB3aXRoIGFuIG9mZi1ieS1kZWZhdWx0IGZs YWcgZW5hYmxlZCwgc28gbm8gdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXll clRyZWVIb3N0OjpDQ0xheWVyVHJlZUhvc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRy ZWVIb3N0OjpmaW5pc2hDb21taXRPbkltcGxUaHJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6Q0NM YXllclRyZWVIb3N0OjpzZXRIYXZlV2hlZWxFdmVudEhhbmRsZXJzKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9zdEltcGw6OkNDTGF5ZXJUcmVlSG9zdEltcGwp OgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6aGF2ZVdoZWVsRXZlbnRI YW5kbGVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0SW1wbC5oOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6 c2V0SGF2ZVdoZWVsRXZlbnRIYW5kbGVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NTY3JvbGxDb250cm9sbGVyLmg6CisKIDIwMTEtMTAtMjcgIFRvbnkgQ2hh bmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBmaXggc2l6aW5nIG9mIGF1dG8gc2l6 ZWQgZmxleGJveApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1M2M1YzZjY2IyMmQ1YzYy NzQ5M2I3ZmQ4NmVkZjMwNjFhM2FkY2U3Li5hMzA3ZDUwOTk3MTI1YWY4OWY2NjNmZjg0YWM2ZDgy YjljYjg5NTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisy MDExLTEwLTI3ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgW2Nocm9taXVtXSBUcmFjayB3aGVlbCBldmVudCBoYW5kbGVyIHJlZ2lzdHJhdGlvbiBhbmQg cGFzcyB0byBpbnB1dCBmaWx0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcxMDc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUHVzaGVzIG1vdXNlIHdoZWVsIGV2ZW50IGhhbmRsZXIgbm90aWZpY2F0aW9u cyB0byBDQ0xheWVyVHJlZUhvc3Qgd2hlbiBjb21wb3NpdGluZy4KKworICAgICAgICAqIHNyYy9D aHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6 bnVtV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCk6CisgICAgICAgICogc3JjL1dlYkNvbXBvc2l0 b3JJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29tcG9zaXRvckltcGw6OmhhbmRsZUlu cHV0RXZlbnQpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXdJbXBsOjpudW1iZXJPZldoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0 aXZlKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMS0xMC0yNyAgQW50b2lu ZSBMYWJvdXIgIDxwaW1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IHRlYXJkb3duIGlu IFdlYipMYXllckltcGwsIGFuZCBhZGQgdGVzdHMgZm9yIFdlYipMYXllcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggNDE4ZDUyOThkMTA2YjlmZWRlN2NiZTFiNGE0YTMwMGE1 MGI5ZWNjYS4uODA4MGRjMzAxMWExMmE0YjRjZmRmYmYzYTIyMWQ3ZTg3NmExZjQwMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCkBAIC01Niw2ICs1Niw3IEBAIENDTGF5ZXJUcmVl SG9zdDo6Q0NMYXllclRyZWVIb3N0KENDTGF5ZXJUcmVlSG9zdENsaWVudCogY2xpZW50LCBQYXNz UmVmUHRyPExheWVyCiAgICAgLCBtX3Jvb3RMYXllcihyb290TGF5ZXIpCiAgICAgLCBtX3NldHRp bmdzKHNldHRpbmdzKQogICAgICwgbV92aXNpYmxlKHRydWUpCisgICAgLCBtX2hhdmVXaGVlbEV2 ZW50SGFuZGxlcnMoZmFsc2UpCiB7CiAgICAgQ0NNYWluVGhyZWFkOjppbml0aWFsaXplKCk7CiAg ICAgQVNTRVJUKENDUHJveHk6OmlzTWFpblRocmVhZCgpKTsKQEAgLTEyOCw2ICsxMjksNyBAQCB2 b2lkIENDTGF5ZXJUcmVlSG9zdDo6ZmluaXNoQ29tbWl0T25JbXBsVGhyZWFkKENDTGF5ZXJUcmVl SG9zdEltcGwqIGhvc3RJbXBsKQogICAgIEFTU0VSVChDQ1Byb3h5Ojppc0ltcGxUaHJlYWQoKSk7 CiAgICAgaG9zdEltcGwtPnNldFNvdXJjZUZyYW1lTnVtYmVyKGZyYW1lTnVtYmVyKCkpOwogICAg IGhvc3RJbXBsLT5zZXRWaXNpYmxlKG1fdmlzaWJsZSk7CisgICAgaG9zdEltcGwtPnNldEhhdmVX aGVlbEV2ZW50SGFuZGxlcnMobV9oYXZlV2hlZWxFdmVudEhhbmRsZXJzKTsKICAgICBob3N0SW1w bC0+c2V0Wm9vbUFuaW1hdG9yVHJhbnNmb3JtKG1fem9vbUFuaW1hdG9yVHJhbnNmb3JtKTsKICAg ICBob3N0SW1wbC0+c2V0Vmlld3BvcnQodmlld3BvcnRTaXplKCkpOwogCkBAIC0yMzYsNiArMjM4 LDE1IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0OjpzZXRWaXNpYmxlKGJvb2wgdmlzaWJsZSkKICAg ICB9CiB9CiAKK3ZvaWQgQ0NMYXllclRyZWVIb3N0OjpzZXRIYXZlV2hlZWxFdmVudEhhbmRsZXJz KGJvb2wgaGF2ZVdoZWVsRXZlbnRIYW5kbGVycykKK3sKKyAgICBpZiAobV9oYXZlV2hlZWxFdmVu dEhhbmRsZXJzID09IGhhdmVXaGVlbEV2ZW50SGFuZGxlcnMpCisgICAgICAgIHJldHVybjsKKyAg ICBtX2hhdmVXaGVlbEV2ZW50SGFuZGxlcnMgPSBoYXZlV2hlZWxFdmVudEhhbmRsZXJzOworICAg IG1fcHJveHktPnNldE5lZWRzQ29tbWl0KCk7Cit9CisKKwogdm9pZCBDQ0xheWVyVHJlZUhvc3Q6 Omxvc2VDb21wb3NpdG9yQ29udGV4dChpbnQgbnVtVGltZXMpCiB7CiAgICAgbV9wcm94eS0+bG9z ZUNvbXBvc2l0b3JDb250ZXh0KG51bVRpbWVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgK aW5kZXggMWM0ZDQzMWQ4NjAyMzQ4Y2Q3ZmVkODdlNjBmODhmZmI1NTQ2OTFkMC4uY2NlMDViYTQz NGNhOTczOWU1NmUwNTEyOWQyMjIyM2QxNDhhMWJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0LmgKQEAgLTE1Nyw2ICsxNTcsNyBAQCBwdWJsaWM6CiAgICAgVGV4dHVyZU1hbmFnZXIqIGNv bnRlbnRzVGV4dHVyZU1hbmFnZXIoKSBjb25zdDsKIAogICAgIHZvaWQgc2V0VmlzaWJsZShib29s KTsKKyAgICB2b2lkIHNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnMoYm9vbCk7CiAKICAgICB2b2lk IHVwZGF0ZUxheWVycygpOwogCkBAIC0xNjQsNiArMTY1LDcgQEAgcHVibGljOgogICAgIHZvaWQg YXBwbHlTY3JvbGxEZWx0YXMoY29uc3QgQ0NTY3JvbGxVcGRhdGVTZXQmKTsKICAgICB2b2lkIHN0 YXJ0UmF0ZUxpbWl0ZXIoR3JhcGhpY3NDb250ZXh0M0QqKTsKICAgICB2b2lkIHN0b3BSYXRlTGlt aXRlcihHcmFwaGljc0NvbnRleHQzRCopOworCiBwcm90ZWN0ZWQ6CiAgICAgQ0NMYXllclRyZWVI b3N0KENDTGF5ZXJUcmVlSG9zdENsaWVudCosIFBhc3NSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gcm9v dExheWVyLCBjb25zdCBDQ1NldHRpbmdzJik7CiAgICAgYm9vbCBpbml0aWFsaXplKCk7CkBAIC0x OTgsNiArMjAwLDcgQEAgcHJpdmF0ZToKICAgICBJbnRTaXplIG1fdmlld3BvcnRTaXplOwogICAg IFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fem9vbUFuaW1hdG9yVHJhbnNmb3JtOwogICAgIGJvb2wg bV92aXNpYmxlOworICAgIGJvb2wgbV9oYXZlV2hlZWxFdmVudEhhbmRsZXJzOwogICAgIHR5cGVk ZWYgSGFzaE1hcDxHcmFwaGljc0NvbnRleHQzRCosIFJlZlB0cjxSYXRlTGltaXRlcj4gPiBSYXRl TGltaXRlck1hcDsKICAgICBSYXRlTGltaXRlck1hcCBtX3JhdGVMaW1pdGVyczsKIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xh eWVyVHJlZUhvc3RJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCmluZGV4IDUxNGMwZTlmYWIyYTRlYmFm YWJmN2VmMWE3M2E1ZmNjNzBhNDFlNzMuLjUxZDkyZjUwMmJkYTkwMWVjYmExNjUwZTFhMTMwZTc5 ODQwODAzYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCkBAIC00 OSw2ICs0OSw3IEBAIENDTGF5ZXJUcmVlSG9zdEltcGw6OkNDTGF5ZXJUcmVlSG9zdEltcGwoY29u c3QgQ0NTZXR0aW5ncyYgc2V0dGluZ3MsIENDTGF5ZXJUcmVlCiAgICAgLCBtX2ZyYW1lTnVtYmVy KDApCiAgICAgLCBtX3NldHRpbmdzKHNldHRpbmdzKQogICAgICwgbV92aXNpYmxlKHRydWUpCisg ICAgLCBtX2hhdmVXaGVlbEV2ZW50SGFuZGxlcnMoZmFsc2UpCiB7CiAgICAgQVNTRVJUKENDUHJv eHk6OmlzSW1wbFRocmVhZCgpKTsKIH0KQEAgLTE4MSw2ICsxODIsMTEgQEAgdm9pZCBDQ0xheWVy VHJlZUhvc3RJbXBsOjpzY3JvbGxSb290TGF5ZXIoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEp CiAgICAgbV9jbGllbnQtPnNldE5lZWRzUmVkcmF3T25JbXBsVGhyZWFkKCk7CiB9CiAKK2Jvb2wg Q0NMYXllclRyZWVIb3N0SW1wbDo6aGF2ZVdoZWVsRXZlbnRIYW5kbGVycygpCit7CisgICAgcmV0 dXJuIG1faGF2ZVdoZWVsRXZlbnRIYW5kbGVyczsKK30KKwogUGFzc093blB0cjxDQ1Njcm9sbFVw ZGF0ZVNldD4gQ0NMYXllclRyZWVIb3N0SW1wbDo6cHJvY2Vzc1Njcm9sbERlbHRhcygpCiB7CiAg ICAgT3duUHRyPENDU2Nyb2xsVXBkYXRlU2V0PiBzY3JvbGxJbmZvID0gYWRvcHRQdHIobmV3IEND U2Nyb2xsVXBkYXRlU2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5oCmlu ZGV4IGY2YTgzMDIzMmYyMzljOTM5MzI1Y2U1OTQzNDQ5NjAzODYxMWMyZmYuLjJhZmZlYTI2YTFk N2ZhZTIwMmNiZjYwYmRlMTEzNDdhY2U2OWQyY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGwuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3RJbXBsLmgKQEAgLTYwLDYgKzYwLDcgQEAgcHVibGljOgogCiAgICAgLy8gQ0NTY3JvbGxD b250cm9sbGVyIGltcGxlbWVudGF0aW9uCiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbFJvb3RMYXll cihjb25zdCBJbnRTaXplJik7CisgICAgdmlydHVhbCBib29sIGhhdmVXaGVlbEV2ZW50SGFuZGxl cnMoKTsKIAogICAgIC8vIFZpcnR1YWwgZm9yIHRlc3RpbmcKICAgICB2aXJ0dWFsIHZvaWQgYmVn aW5Db21taXQoKTsKQEAgLTg2LDYgKzg3LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Um9vdExh eWVyKFBhc3NSZWZQdHI8Q0NMYXllckltcGw+KTsKIAogICAgIHZvaWQgc2V0VmlzaWJsZShib29s KTsKKyAgICB2b2lkIHNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnMoYm9vbCBoYXZlV2hlZWxFdmVu dEhhbmRsZXJzKSB7IG1faGF2ZVdoZWVsRXZlbnRIYW5kbGVycyA9IGhhdmVXaGVlbEV2ZW50SGFu ZGxlcnM7IH0KIAogICAgIGludCBzb3VyY2VGcmFtZU51bWJlcigpIGNvbnN0IHsgcmV0dXJuIG1f c291cmNlRnJhbWVOdW1iZXI7IH0KICAgICB2b2lkIHNldFNvdXJjZUZyYW1lTnVtYmVyKGludCBm cmFtZU51bWJlcikgeyBtX3NvdXJjZUZyYW1lTnVtYmVyID0gZnJhbWVOdW1iZXI7IH0KQEAgLTEx MCw2ICsxMTIsNyBAQCBwcml2YXRlOgogICAgIENDU2V0dGluZ3MgbV9zZXR0aW5nczsKICAgICBJ bnRTaXplIG1fdmlld3BvcnRTaXplOwogICAgIGJvb2wgbV92aXNpYmxlOworICAgIGJvb2wgbV9o YXZlV2hlZWxFdmVudEhhbmRsZXJzOwogfTsKIAogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsQ29udHJvbGxlci5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxDb250 cm9sbGVyLmgKaW5kZXggYmNkMmY1ZjI3NWYzYjdjM2UwOTAyMjRkNWQ2MzVkZjE0OWZmMTlhNS4u OTJiOTVkN2RjYWNkNzRhZGYzZGJlNTZmY2YyYTBkZTA4OThiY2M0MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxDb250cm9s bGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NTY3JvbGxDb250cm9sbGVyLmgKQEAgLTM1LDYgKzM1LDcgQEAgY2xhc3MgQ0NTY3JvbGxDb250 cm9sbGVyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShDQ1Njcm9sbENvbnRyb2xsZXIpOwog cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxSb290TGF5ZXIoY29uc3QgSW50U2l6ZSYp ID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgaGF2ZVdoZWVsRXZlbnRIYW5kbGVycygpID0gMDsKIAog cHJvdGVjdGVkOgogICAgIENDU2Nyb2xsQ29udHJvbGxlcigpIHsgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAppbmRleCBhYTUzNWZmMmY1OWYy MmU5OWUyN2Q3MzMxNjEyNGM3ZTgyYjA0N2M1Li4xZjA2OWM5MjYwNDU4Mjc1ZmQ0YzI0M2ViM2Zm ZjcxNTE4OWQ0YmZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJv bWVDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVD bGllbnRJbXBsLmNwcApAQCAtOTk5LDggKzk5OSw3IEBAIGJvb2wgQ2hyb21lQ2xpZW50SW1wbDo6 c2hvdWxkUnViYmVyQmFuZEluRGlyZWN0aW9uKFdlYkNvcmU6OlNjcm9sbERpcmVjdGlvbiBkaXJl CiAKIHZvaWQgQ2hyb21lQ2xpZW50SW1wbDo6bnVtV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1 bnNpZ25lZCBudW1iZXJPZldoZWVsSGFuZGxlcnMpCiB7Ci0gICAgaWYgKG1fd2ViVmlldy0+Y2xp ZW50KCkpCi0gICAgICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPm51bWJlck9mV2hlZWxFdmVudEhh bmRsZXJzQ2hhbmdlZChudW1iZXJPZldoZWVsSGFuZGxlcnMpOworICAgIG1fd2ViVmlldy0+bnVt YmVyT2ZXaGVlbEV2ZW50SGFuZGxlcnNDaGFuZ2VkKG51bWJlck9mV2hlZWxIYW5kbGVycyk7CiB9 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViQ29tcG9zaXRvckltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViQ29tcG9zaXRvckltcGwuY3BwCmluZGV4IDAyODZmMTk4NzdiMWQ2MDQzZjM1YjYwOTMx YmQ4MzBhOWMzNmRlMDQuLmQ4YmQzYTE2MzQxYjc5YzVmYjIyMWQ3YTNmZTIwZDYxODBjNDlhZDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbXBs LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9ySW1wbC5j cHAKQEAgLTExNiw3ICsxMTYsMTMgQEAgdm9pZCBXZWJDb21wb3NpdG9ySW1wbDo6aGFuZGxlSW5w dXRFdmVudChjb25zdCBXZWJJbnB1dEV2ZW50JiBldmVudCkKIHsKICAgICBBU1NFUlQoQ0NQcm94 eTo6aXNJbXBsVGhyZWFkKCkpOwogICAgIEFTU0VSVChtX2NsaWVudCk7Ci0gICAgLy8gRklYTUU6 IERvIHNvbWV0aGluZyBpbnRlcmVzdGluZyB3aXRoIHRoaXMgaW5wdXQgZXZlbnQgbGlrZSBpbmZv cm0gb3VyIG1fc2Nyb2xsQ29udHJvbGxlci4KKworICAgIGlmIChldmVudC50eXBlID09IFdlYklu cHV0RXZlbnQ6Ok1vdXNlV2hlZWwgJiYgIW1fc2Nyb2xsQ29udHJvbGxlci0+aGF2ZVdoZWVsRXZl bnRIYW5kbGVycygpKSB7CisgICAgICAgIGNvbnN0IFdlYk1vdXNlV2hlZWxFdmVudCYgd2hlZWxF dmVudCA9ICpzdGF0aWNfY2FzdDxjb25zdCBXZWJNb3VzZVdoZWVsRXZlbnQqPigmZXZlbnQpOwor ICAgICAgICBtX3Njcm9sbENvbnRyb2xsZXItPnNjcm9sbFJvb3RMYXllcihJbnRTaXplKC13aGVl bEV2ZW50LmRlbHRhWCwgLXdoZWVsRXZlbnQuZGVsdGFZKSk7CisgICAgICAgIG1fY2xpZW50LT5k aWRIYW5kbGVJbnB1dEV2ZW50KCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgbV9jbGll bnQtPmRpZE5vdEhhbmRsZUlucHV0RXZlbnQodHJ1ZSAvKiBzZW5kVG9XaWRnZXQgKi8pOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggNTAyMzcz YjE3ODNmMjM2M2I0NWFiYWZkZDZlNGI0MzQwMTdkMzI0Ny4uMzI5YjAyYmNhZTc4YjY3NjQyMmE3 MGUxMDAyZTkyYzE1MjBlNTY4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcApAQCAtNzgxLDYgKzc4MSwxNyBAQCBib29sIFdlYlZpZXdJbXBsOjp0b3VjaEV2 ZW50KGNvbnN0IFdlYlRvdWNoRXZlbnQmIGV2ZW50KQogfQogI2VuZGlmCiAKK3ZvaWQgV2ViVmll d0ltcGw6Om51bWJlck9mV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1bnNpZ25lZCBudW1iZXJP ZldoZWVsSGFuZGxlcnMpCit7CisgICAgbV9oYXZlV2hlZWxFdmVudEhhbmRsZXJzID0gbnVtYmVy T2ZXaGVlbEhhbmRsZXJzID4gMDsKKyAgICBpZiAobV9jbGllbnQpCisgICAgICAgIG1fY2xpZW50 LT5udW1iZXJPZldoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQobnVtYmVyT2ZXaGVlbEhhbmRsZXJz KTsKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgaWYgKG1fbGF5ZXJUcmVl SG9zdCkKKyAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zZXRIYXZlV2hlZWxFdmVudEhhbmRsZXJz KG1faGF2ZVdoZWVsRXZlbnRIYW5kbGVycyk7CisjZW5kaWYKK30KKwogI2lmICFPUyhEQVJXSU4p CiAvLyBNYWMgaGFzIG5vIHdheSB0byBvcGVuIGEgY29udGV4dCBtZW51IGJhc2VkIG9uIGEga2V5 Ym9hcmQgZXZlbnQuCiBib29sIFdlYlZpZXdJbXBsOjpzZW5kQ29udGV4dE1lbnVFdmVudChjb25z dCBXZWJLZXlib2FyZEV2ZW50JiBldmVudCkKQEAgLTI2ODUsNiArMjY5Niw3IEBAIHZvaWQgV2Vi Vmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZShib29sIGFjdGl2ZSkK ICAgICAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudEhvc3QgPSBOb25Db21wb3NpdGVkQ29udGVu dEhvc3Q6OmNyZWF0ZShXZWJWaWV3SW1wbENvbnRlbnRQYWludGVyOjpjcmVhdGUodGhpcykpOwog ICAgICAgICBtX2xheWVyVHJlZUhvc3QgPSBDQ0xheWVyVHJlZUhvc3Q6OmNyZWF0ZSh0aGlzLCBt X25vbkNvbXBvc2l0ZWRDb250ZW50SG9zdC0+dG9wTGV2ZWxSb290TGF5ZXIoKS0+cGxhdGZvcm1M YXllcigpLCBjY1NldHRpbmdzKTsKICAgICAgICAgaWYgKG1fbGF5ZXJUcmVlSG9zdCkgeworICAg ICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zZXRIYXZlV2hlZWxFdmVudEhhbmRsZXJzKG1faGF2 ZVdoZWVsRXZlbnRIYW5kbGVycyk7CiAgICAgICAgICAgICB1cGRhdGVMYXllclRyZWVWaWV3cG9y dCgpOwogICAgICAgICAgICAgbV9jbGllbnQtPmRpZEFjdGl2YXRlQ29tcG9zaXRvcihtX2xheWVy VHJlZUhvc3QtPmNvbXBvc2l0b3JJZGVudGlmaWVyKCkpOwogICAgICAgICAgICAgbV9pc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmgKaW5kZXggNWExZGQxNTQ4OTYyMTg4YjkyYWRkYmFkYzA4NTk2NjUxZWNh YjUyYi4uODNiNWY0YjU1ODg4YmQ5NDdkY2YwODczMGY2YzMwN2FkM2JlYWE3MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0zMDEsNiArMzAxLDggQEAgcHVi bGljOgogICAgIGJvb2wgY2hhckV2ZW50KGNvbnN0IFdlYktleWJvYXJkRXZlbnQmKTsKICAgICBi b29sIHRvdWNoRXZlbnQoY29uc3QgV2ViVG91Y2hFdmVudCYpOwogCisgICAgdm9pZCBudW1iZXJP ZldoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQodW5zaWduZWQpOworCiAgICAgLy8gSGFuZGxlcyBj b250ZXh0IG1lbnUgZXZlbnRzIG9yaWduYXRlZCB2aWEgdGhlIHRoZSBrZXlib2FyZC4gVGhlc2UK ICAgICAvLyBpbmNsdWRlIHRoZSBWS19BUFBTIHZpcnR1YWwga2V5IGFuZCB0aGUgU2hpZnQrRjEw IGNvbWJpbmUuIENvZGUgaXMKICAgICAvLyBiYXNlZCBvbiB0aGUgV2Via2l0IGZ1bmN0aW9uIGJv b2wgV2ViVmlldzo6aGFuZGxlQ29udGV4dE1lbnVFdmVudChXUEFSQU0KQEAgLTU4NSw2ICs1ODcs NyBAQCBwcml2YXRlOgogICAgIC8vIElmIHRydWUsIHRoZSBncmFwaGljcyBjb250ZXh0IGlzIGJl aW5nIHJlc3RvcmVkLgogICAgIGJvb2wgbV9yZWNyZWF0aW5nR3JhcGhpY3NDb250ZXh0OwogI2Vu ZGlmCisgICAgYm9vbCBtX2hhdmVXaGVlbEV2ZW50SGFuZGxlcnM7CiAgICAgc3RhdGljIGNvbnN0 IFdlYklucHV0RXZlbnQqIG1fY3VycmVudElucHV0RXZlbnQ7CiAKICNpZiBFTkFCTEUoSU5QVVRf U1BFRUNIKQo=