72551 2011-11-16 14:33:51 -0800 When the recommended scrollbar style changes, WKView's tracking options should adjust accordingly 2011-11-28 17:01:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified OS X 10.7 RESOLVED FIXED InRadar P2 Normal --- 72786 1 bdakin bdakin bdakin oldest_to_newest 504265 0 bdakin 2011-11-16 14:33:51 -0800 https://bugs.webkit.org/show_bug.cgi?id=72400 and http://trac.webkit.org/changeset/100483 made it so a WKView tracks the mouse all the time when the recommended scrollbar style is the legacy style at the time the WKView is created. The tracking options should also be updated whenever the recommended scrollbar style changes after the view has been created. <rdar://problem/10409328> 504275 1 115454 bdakin 2011-11-16 14:43:42 -0800 Created attachment 115454 Patch 505394 2 115454 darin 2011-11-17 17:47:38 -0800 Comment on attachment 115454 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115454&action=review > Source/WebCore/platform/ScrollView.cpp:966 > +void ScrollView::scrollbarStyleChanged(int newStyle, bool forceUpdate) > { > + UNUSED_PARAM(newStyle); Normally we omit the argument name or comment it out rather than using UNUSED_PARAM. > Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp:677 > +void BuiltInPDFView::scrollbarStyleChanged(int newStyle, bool forceUpdate) > { > + UNUSED_PARAM(newStyle); Same comment here. 506196 3 bdakin 2011-11-18 16:32:08 -0800 Thanks Darin! I changed those two spots. Committed with revision 100826. 510178 4 bdakin 2011-11-28 14:28:38 -0800 This got rolled out because of a Chromium build bustage (see https://bugs.webkit.org/show_bug.cgi?id=72786). I will be re-committing momentarily. 510237 5 bdakin 2011-11-28 15:07:20 -0800 Re-committed with revision 101290. 510280 6 bdakin 2011-11-28 15:43:47 -0800 The bots are not fully cooperating right now, but I they made it far enough through the build to catch a failure before going offline for a moment. Hopefully it's the only one. I committed a Chromium build fix with revision 101296. 510342 7 bdakin 2011-11-28 17:01:17 -0800 Aaand, revision 101306 is another Chromium build fix. 115454 2011-11-16 14:43:42 -0800 2011-11-17 17:47:38 -0800 Patch for-review.txt text/plain 17287 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDUwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDExLTExLTE2ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzI1NTEKKyAgICAgICAgV2hlbiB0aGUgcmVjb21tZW5kZWQgc2Ny b2xsYmFyIHN0eWxlIGNoYW5nZXMsIFdLVmlldydzIHRyYWNraW5nIG9wdGlvbnMgc2hvdWxkIAor ICAgICAgICBhZGp1c3QgYWNjb3JkaW5nbHkKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTA0MDkzMjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBuZXcgQ2hyb21lQ2xpZW50IGZ1bmN0aW9u IGlzIGNhbGxlZCB3aGVuIHRoZSByZWNvbW1lbmRlZCBzY3JvbGxiYXIgc3R5bGUgCisgICAgICAg IGNoYW5nZXMuIFRoaXMgd2F5LCBXZWJLaXQgY2FuIHJlc3BvbmQgdG8gdGhlIGNoYW5nZSBieSBh ZGp1c3RpbmcgaXRzIG1vdXNlIAorICAgICAgICB0cmFja2luZy4KKyAgICAgICAgKiBwYWdlL0No cm9tZUNsaWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50OjpyZWNvbW1lbmRl ZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKToKKworICAgICAgICBFeGlzdGluZyBTY3JvbGxhYmxl QXJlYSBmdW5jdGlvbiBzY3JvbGxiYXJTdHlsZUNoYW5nZWQoKSBub3cgdGFrZXMgYW4gaW50IAor ICAgICAgICBpbmRpY2F0aW5nIHRoZSBuZXcgc2Nyb2xsYmFyIHN0eWxlIGFuZCBhIGJvb2wgaW5k aWNhdGluZyB3aGV0aGVyIGl0IGlzIG5lY2Vzc2FyeSAKKyAgICAgICAgdG8gZm9yY2UgYW4gdXBk YXRlLiBJdCB1c2VkIHRvIGJlIHRoZSBjYXNlIHRoYXQgdGhpcyBmdW5jdGlvbiB3YXMgT05MWSB1 c2VkIHRvIAorICAgICAgICBmb3JjZSBhbiB1cGRhdGUgKGFuZCBvbmx5IGNhbGxlZCB3aGVuIGFu IHVwZGF0ZWQgd2FzIG5lZWRlZCksIGJ1dCBub3cgdGhhdCBpdCBtdXN0IAorICAgICAgICBhbHNv IGNhbGwgaW50byB0aGUgQ2hyb21lQ2xpZW50LCBpdCBpcyBuZWNlc3NhcnkgdG8gaW5jbHVkZSBh IGJvb2wgdHJhY2tpbmcgCisgICAgICAgIHdoZXRoZXIgd2UgbmVlZCB0byBmb3JjZSBhbiB1cGRh dGUuIE5ldyBpbXBsZW1lbnRhdGlvbiBvbiBGcmFtZVZpZXcgaXMgcmVzcG9uc2libGUgCisgICAg ICAgIGZvciBjYWxsaW5nIENocm9tZUNsaWVudCwgYW5kIHRoZW4gdGhhdCBjYWxscyBpbnRvIHRo ZSBwcmUtZXhpc3RpbmcgU2Nyb2xsVmlldyAKKyAgICAgICAgZnVuY3Rpb24gZm9yIHRoZSBmb3Jj ZVVwZGF0ZSBwYXJ0LgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKToKKyAgICAgICAgKiBwYWdl L0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6IHNjcm9sbGJhclN0eWxlQ2hhbmdlZCk6CisgICAgICAg ICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVB cmVhLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsYmFyU3R5bGVD aGFuZ2VkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW06Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6dXBkYXRlU2Nyb2xsZXJTdHlsZSk6 CisKIDIwMTEtMTEtMTYgIEpvc2h1YSBCZWxsICA8anNiZWxsQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBJbmRleGVkREI6IFJlZHVjZSBuZXN0ZWQga2V5IGRlcHRoIHRocmVzaG9sZCwgcmUtZW5h YmxlIGZsYWt5IHRlc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAkocmV2aXNp b24gMTAwNDk4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzI1LDYgKzMyNSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg dmlydHVhbCB2b2lkIGRpZENvbXBsZXRlQW5pbWF0ZWRTY3JvbGwoKSBjb25zdCB7IH0KICAgICAg ICAgCiAgICAgICAgIHZpcnR1YWwgdm9pZCBub3RpZnlTY3JvbGxlclRodW1iSXNWaXNpYmxlSW5S ZWN0KGNvbnN0IEludFJlY3QmKSB7IH0KKyAgICAgICAgdmlydHVhbCB2b2lkIHJlY29tbWVuZGVk U2Nyb2xsYmFyU3R5bGVEaWRDaGFuZ2UoaW50IC8qbmV3U3R5bGUqLykgeyB9CiAKICAgICAgICAg ZW51bSBEaWFsb2dUeXBlIHsKICAgICAgICAgICAgIEFsZXJ0RGlhbG9nID0gMCwKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJldmlzaW9uIDEwMDQ5OCkKKysrIFNvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ0NCw2ICsyNDQ0LDE5 IEBAIGJvb2wgRnJhbWVWaWV3OjpzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWEKICAgICByZXR1cm4g bV9mcmFtZS0+bG9hZGVyKCktPnN0YXRlKCkgIT0gRnJhbWVTdGF0ZUNvbXBsZXRlOwogfQogCit2 b2lkIEZyYW1lVmlldzo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKGludCBuZXdTdHlsZSwgYm9vbCBm b3JjZVVwZGF0ZSkKK3sKKyAgICBQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpOworICAgIGlm ICghcGFnZSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmIChwYWdlLT5tYWluRnJhbWUoKSAhPSBt X2ZyYW1lKQorICAgICAgICByZXR1cm47CisgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5y ZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKG5ld1N0eWxlKTsKKworICAgIGlmIChm b3JjZVVwZGF0ZSkKKyAgICAgICAgU2Nyb2xsVmlldzo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKG5l d1N0eWxlLCBmb3JjZVVwZGF0ZSk7Cit9CisKIHZvaWQgRnJhbWVWaWV3OjpzZXRBbmltYXRvcnNB cmVBY3RpdmUoKQogewogICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHJldmlzaW9uIDEwMDQ5OCkKKysrIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTI5Miw2ICsyOTIsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBmbHVzaEFueVBlbmRpbmdQb3N0TGF5b3V0VGFza3MoKTsKIAogICAgIHZp cnR1YWwgYm9vbCBzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucygpIGNvbnN0OworICAgIHZp cnR1YWwgdm9pZCBzY3JvbGxiYXJTdHlsZUNoYW5nZWQoaW50IG5ld1N0eWxlLCBib29sIGZvcmNl VXBkYXRlKTsKIAogICAgIHZvaWQgc2V0QW5pbWF0b3JzQXJlQWN0aXZlKCk7CiAKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCShyZXZpc2lvbiAxMDA0OTgpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAt OTYxLDggKzk2MSwxMiBAQCBib29sIFNjcm9sbFZpZXc6OmlzU2Nyb2xsQ29ybmVyVmlzaWJsZSgp CiAgICAgcmV0dXJuICFzY3JvbGxDb3JuZXJSZWN0KCkuaXNFbXB0eSgpOwogfQogCi12b2lkIFNj cm9sbFZpZXc6OnNjcm9sbGJhclN0eWxlQ2hhbmdlZCgpCit2b2lkIFNjcm9sbFZpZXc6OnNjcm9s bGJhclN0eWxlQ2hhbmdlZChpbnQgbmV3U3R5bGUsIGJvb2wgZm9yY2VVcGRhdGUpCiB7CisgICAg VU5VU0VEX1BBUkFNKG5ld1N0eWxlKTsKKyAgICBpZiAoIWZvcmNlVXBkYXRlKQorICAgICAgICBy ZXR1cm47CisKICAgICBjb250ZW50c1Jlc2l6ZWQoKTsKICAgICB1cGRhdGVTY3JvbGxiYXJzKHNj cm9sbE9mZnNldCgpKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZp ZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJ KHJldmlzaW9uIDEwMDQ5OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcu aAkod29ya2luZyBjb3B5KQpAQCAtNTksNyArNTksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2 b2lkIGRpZENvbXBsZXRlUnViYmVyQmFuZChjb25zdCBJbnRTaXplJikgY29uc3Q7CiAgICAgdmly dHVhbCB2b2lkIG5vdGlmeVBhZ2VUaGF0Q29udGVudEFyZWFXaWxsUGFpbnQoKSBjb25zdDsKICAg ICB2aXJ0dWFsIGJvb2wgaXNTY3JvbGxDb3JuZXJWaXNpYmxlKCkgY29uc3Q7Ci0gICAgdmlydHVh bCB2b2lkIHNjcm9sbGJhclN0eWxlQ2hhbmdlZCgpOworICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxi YXJTdHlsZUNoYW5nZWQoaW50IG5ld1N0eWxlLCBib29sIGZvcmNlVXBkYXRlKTsKIAogICAgIC8v IE5PVEU6IFRoaXMgc2hvdWxkIG9ubHkgYmUgY2FsbGVkIGJ5IHRoZSBvdmVycmlkZW4gc2V0U2Ny b2xsT2Zmc2V0IGZyb20gU2Nyb2xsYWJsZUFyZWEuCiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbFRv KGNvbnN0IEludFNpemUmIG5ld09mZnNldCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxhYmxlQXJlYS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbGFibGVBcmVhLmgJKHJldmlzaW9uIDEwMDQ5OCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw3ICsxMzksNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbXBsZXRlQW5pbWF0ZWRTY3JvbGwoKSBj b25zdCB7IH0KICAgICAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1h dGlvbnMoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9Ci0gICAgdmlydHVhbCB2b2lkIHNjcm9sbGJh clN0eWxlQ2hhbmdlZCgpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxiYXJTdHlsZUNoYW5n ZWQoaW50IC8qbmV3U3R5bGUqLywgYm9vbCAvKmZvcmNlVXBkYXRlKi8pIHsgfQogICAgIHZpcnR1 YWwgdm9pZCBzZXRWaXNpYmxlU2Nyb2xsZXJUaHVtYlJlY3QoY29uc3QgSW50UmVjdCYpIHsgfQog CiAgICAgdmlydHVhbCBib29sIGlzT25BY3RpdmVQYWdlKCkgY29uc3QgeyBBU1NFUlRfTk9UX1JF QUNIRUQoKTsgcmV0dXJuIHRydWU7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9TY3JvbGxBbmltYXRvck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0JKHJldmlzaW9uIDEwMDQ5OCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTQ2NCw4ICsxNDY0LDcgQEAgdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6dXBkYXRlU2Ny b2xsZXJTdAogCiAgICAgLy8gSWYgbmVlZHNTY3JvbGxlclN0eWxlVXBkYXRlKCkgaXMgdHJ1ZSwg dGhlbiB0aGUgcGFnZSBpcyByZXN0b3JpbmcgZnJvbSB0aGUgcGFnZSBjYWNoZSwgYW5kIAogICAg IC8vIGEgcmVsYXlvdXQgd2lsbCBoYXBwZW4gb24gaXRzIG93bi4gT3RoZXJ3aXNlLCB3ZSBtdXN0 IGluaXRpYXRlIGEgcmUtbGF5b3V0IG91cnNlbHZlcy4KLSAgICBpZiAoIW5lZWRzU2Nyb2xsZXJT dHlsZVVwZGF0ZSgpKQotICAgICAgICBzY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxiYXJTdHlsZUNo YW5nZWQoKTsKKyAgICBzY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxiYXJTdHlsZUNoYW5nZWQobmV3 U3R5bGUsICFuZWVkc1Njcm9sbGVyU3R5bGVVcGRhdGUoKSk7CiAKICAgICBzZXROZWVkc1Njcm9s bGVyU3R5bGVVcGRhdGUoZmFsc2UpOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTAwNTA4 KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MzcgQEAKKzIwMTEtMTEtMTYgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjU1MQorICAgICAg ICBXaGVuIHRoZSByZWNvbW1lbmRlZCBzY3JvbGxiYXIgc3R5bGUgY2hhbmdlcywgV0tWaWV3J3Mg dHJhY2tpbmcgb3B0aW9ucyBzaG91bGQgCisgICAgICAgIGFkanVzdCBhY2NvcmRpbmdseQorICAg ICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDQwOTMy OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVz ZSBuZXcgZnVuY3Rpb25zIHRha2UgY2FyZSBvZiBwYXNzaW5nIGFsb25nIHRoZSAKKyAgICAgICAg cmVjb21tZW5kZWRTY3JvbGxiYXJTdHlsZURpZENoYW5nZSgpIG1lc3NhZ2UgdGhhdCBvcmlnaW5h dGVzIGluIHRoZSBDaHJvbWVDbGllbnQuIAorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1Bh Z2VDbGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpyZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNo cm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6cmVjb21t ZW5kZWRTY3JvbGxiYXJTdHlsZURpZENoYW5nZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaDoKKworICAgICAgICBUaGlzIGlzIHdoZXJlIHdl IGFjdHVhbGx5IHJlc3BvbmQgdG8gdGhlIHJlY29tbWVuZGVkU2Nyb2xsYmFyU3R5bGVEaWRDaGFu Z2UgCisgICAgICAgIG1lc3NhZ2UuIFdlIHJlbW92ZSB0aGUgZXhpc3RpbmcgdHJhY2tpbmcgYXJl YSBhbmQgY3JlYXRlIGEgbmV3IHRyYWNraW5nIGFyZWEgd2l0aCAKKyAgICAgICAgdGhlIGFwcHJv cHJpYXRlIHRyYWNraW5nIG9wdGlvbnMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFn ZUNsaWVudEltcGwubW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpyZWNvbW1l bmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKToKKworICAgICAgICBCdWlsdEluUERGVmlldyBp bmhlcml0cyBmcm9tIFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhLCBzbyBzY3JvbGxiYXJTdHlsZUNo YW5nZWQoKSAKKyAgICAgICAgbXVzdCBub3cgdGFrZSB0d28gcGFyYW1ldGVycyBsaWtlIHRoZSBv bmUgaW4gU2Nyb2xsYWJsZUFyZWEuCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9C dWlsdEluUERGVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OkJ1aWx0SW5QREZWaWV3OjpzY3Jv bGxiYXJTdHlsZUNoYW5nZWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVp bHRJblBERlZpZXcuaDoKKwogMjAxMS0xMS0xNiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hA YXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgbmVlZHMgdG8gc3VwcG9ydCBh Y2Nlc3NpYmlsaXR5LXJlbGF0ZWQgRFJUIEFQSXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9QYWdlQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BhZ2VDbGllbnQuaAkocmV2aXNpb24gMTAwNDk4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BhZ2VDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTc3LDYgKzE3Nyw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzbWlzc0NvcnJlY3Rpb25QYW5lbChXZWJDb3JlOjpSZWFz b25Gb3JEaXNtaXNzaW5nQ29ycmVjdGlvblBhbmVsKSA9IDA7CiAgICAgdmlydHVhbCBTdHJpbmcg ZGlzbWlzc0NvcnJlY3Rpb25QYW5lbFNvb24oV2ViQ29yZTo6UmVhc29uRm9yRGlzbWlzc2luZ0Nv cnJlY3Rpb25QYW5lbCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCByZWNvcmRBdXRvY29ycmVjdGlv blJlc3BvbnNlKFdlYkNvcmU6OkVkaXRvckNsaWVudDo6QXV0b2NvcnJlY3Rpb25SZXNwb25zZVR5 cGUsIGNvbnN0IFN0cmluZyYgcmVwbGFjZWRTdHJpbmcsIGNvbnN0IFN0cmluZyYgcmVwbGFjZW1l bnRTdHJpbmcpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgcmVjb21tZW5kZWRTY3JvbGxiYXJTdHls ZURpZENoYW5nZShpbnQzMl90IG5ld1N0eWxlKSA9IDA7CiAgICAgCiAgICAgdmlydHVhbCBXS1Zp ZXcqIHdrVmlldygpIGNvbnN0ID0gMDsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDEwMDQ5OCkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjY1LDYg KzMyNjUsMTMgQEAgdm9pZCBXZWJQYWdlUHJveHk6Om5vdGlmeVNjcm9sbGVyVGh1bWJJcwogICAg IG1fdmlzaWJsZVNjcm9sbGVyVGh1bWJSZWN0ID0gc2Nyb2xsZXJUaHVtYjsKIH0KIAordm9pZCBX ZWJQYWdlUHJveHk6OnJlY29tbWVuZGVkU2Nyb2xsYmFyU3R5bGVEaWRDaGFuZ2UoaW50MzJfdCBu ZXdTdHlsZSkKK3sKKyNpZiBQTEFURk9STShNQUMpCisgICAgbV9wYWdlQ2xpZW50LT5yZWNvbW1l bmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKG5ld1N0eWxlKTsKKyNlbmRpZgorfQorCiB2b2lk IFdlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlU2Nyb2xsYmFyc0Zvck1haW5GcmFtZShib29sIGhhc0hv cml6b250YWxTY3JvbGxiYXIsIGJvb2wgaGFzVmVydGljYWxTY3JvbGxiYXIpCiB7CiAgICAgbV9t YWluRnJhbWVIYXNIb3Jpem9udGFsU2Nyb2xsYmFyID0gaGFzSG9yaXpvbnRhbFNjcm9sbGJhcjsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDEw MDQ5OCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2lu ZyBjb3B5KQpAQCAtNjYwLDYgKzY2MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZXF1ZXN0R2Vv bG9jYXRpb25QZXJtaXNzaW9uRm9yRnJhbWUodWludDY0X3QgZ2VvbG9jYXRpb25JRCwgdWludDY0 X3QgZnJhbWVJRCwgU3RyaW5nIG9yaWdpbklkZW50aWZpZXIpOwogICAgIHZvaWQgcnVuTW9kYWwo KTsKICAgICB2b2lkIG5vdGlmeVNjcm9sbGVyVGh1bWJJc1Zpc2libGVJblJlY3QoY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYpOworICAgIHZvaWQgcmVjb21tZW5kZWRTY3JvbGxiYXJTdHlsZURpZENo YW5nZShpbnQzMl90IG5ld1N0eWxlKTsKICAgICB2b2lkIGRpZENoYW5nZVNjcm9sbGJhcnNGb3JN YWluRnJhbWUoYm9vbCBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyLCBib29sIGhhc1ZlcnRpY2FsU2Ny b2xsYmFyKTsKICAgICB2b2lkIGRpZENoYW5nZVNjcm9sbE9mZnNldFBpbm5pbmdGb3JNYWluRnJh bWUoYm9vbCBwaW5uZWRUb0xlZnRTaWRlLCBib29sIHBpbm5lZFRvUmlnaHRTaWRlKTsKICAgICB2 b2lkIGRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4oY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2Fn ZXMuaW4JKHJldmlzaW9uIDEwMDQ5OCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDcgQEAgbWVz c2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICAgICBQcmludEZyYW1lKHVpbnQ2NF90IGZyYW1lSUQp IC0+ICgpCiAgICAgUnVuTW9kYWwoKQogICAgIE5vdGlmeVNjcm9sbGVyVGh1bWJJc1Zpc2libGVJ blJlY3QoV2ViQ29yZTo6SW50UmVjdCBzY3JvbGxlclRodW1iKQorICAgIFJlY29tbWVuZGVkU2Ny b2xsYmFyU3R5bGVEaWRDaGFuZ2UoaW50MzJfdCBuZXdTdHlsZSkKICAgICBEaWRDaGFuZ2VTY3Jv bGxiYXJzRm9yTWFpbkZyYW1lKGJvb2wgaGFzSG9yaXpvbnRhbFNjcm9sbGJhciwgYm9vbCBoYXNW ZXJ0aWNhbFNjcm9sbGJhcikKICAgICBEaWRDaGFuZ2VTY3JvbGxPZmZzZXRQaW5uaW5nRm9yTWFp bkZyYW1lKGJvb2wgaGFzSG9yaXpvbnRhbFNjcm9sbGJhciwgYm9vbCBoYXNWZXJ0aWNhbFNjcm9s bGJhcikKICAgICBEaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luKFdURjo6U3RyaW5nIG1pbWVUeXBl KQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xp ZW50SW1wbC5oCShyZXZpc2lvbiAxMDA0OTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjIsNiArMTIyLDgg QEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIFN0cmluZyBkaXNtaXNzQ29ycmVjdGlvblBhbmVsU29v bihXZWJDb3JlOjpSZWFzb25Gb3JEaXNtaXNzaW5nQ29ycmVjdGlvblBhbmVsKTsKICAgICB2aXJ0 dWFsIHZvaWQgcmVjb3JkQXV0b2NvcnJlY3Rpb25SZXNwb25zZShXZWJDb3JlOjpFZGl0b3JDbGll bnQ6OkF1dG9jb3JyZWN0aW9uUmVzcG9uc2VUeXBlLCBjb25zdCBTdHJpbmcmIHJlcGxhY2VkU3Ry aW5nLCBjb25zdCBTdHJpbmcmIHJlcGxhY2VtZW50U3RyaW5nKTsKIAorICAgIHZpcnR1YWwgdm9p ZCByZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKGludDMyX3QgbmV3U3R5bGUpOwor CiAgICAgdmlydHVhbCBXS1ZpZXcqIHdrVmlldygpIGNvbnN0IHsgcmV0dXJuIG1fd2tWaWV3OyB9 CiAKICAgICBXS1ZpZXcqIG1fd2tWaWV3OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0JKHJldmlzaW9uIDEwMDQ5OCkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC00NjAsNiArNDYwLDM0IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OnJlY29y ZEF1dG9jb3JyZWN0aW8KICNlbmRpZgogfQogCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpyZWNvbW1l bmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKGludDMyX3QgbmV3U3R5bGUpCit7CisjaWYgIWRl ZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQorICAgIE5TQXJyYXkgKnRyYWNraW5nQXJl YXMgPSBbbV93a1ZpZXcgdHJhY2tpbmdBcmVhc107CisgICAgTlNVSW50ZWdlciBjb3VudCA9IFt0 cmFja2luZ0FyZWFzIGNvdW50XTsKKyAgICBBU1NFUlQoY291bnQgPT0gMSk7CisgICAgCisgICAg Zm9yIChOU1VJbnRlZ2VyIGkgPSAwOyBpIDwgY291bnQ7ICsraSkKKyAgICAgICAgW21fd2tWaWV3 IHJlbW92ZVRyYWNraW5nQXJlYTpbdHJhY2tpbmdBcmVhcyBvYmplY3RBdEluZGV4OmldXTsKKwor ICAgIC8vIE5vdyByZS1jcmVhdGUgYSB0cmFja2luZyBhcmVhIHdpdGggdGhlIGFwcHJvcHJpYXRl IG9wdGlvbnMgZ2l2ZW4gdGhlIG5ldyBzY3JvbGxiYXIgc3R5bGUKKyAgICBOU1RyYWNraW5nQXJl YU9wdGlvbnMgb3B0aW9ucyA9IE5TVHJhY2tpbmdNb3VzZU1vdmVkIHwgTlNUcmFja2luZ01vdXNl RW50ZXJlZEFuZEV4aXRlZCB8IE5TVHJhY2tpbmdJblZpc2libGVSZWN0OworICAgIGlmIChuZXdT dHlsZSA9PSBOU1Njcm9sbGVyU3R5bGVMZWdhY3kpCisgICAgICAgIG9wdGlvbnMgfD0gTlNUcmFj a2luZ0FjdGl2ZUFsd2F5czsKKyAgICBlbHNlCisgICAgICAgIG9wdGlvbnMgfD0gTlNUcmFja2lu Z0FjdGl2ZUluS2V5V2luZG93OworCisgICAgTlNUcmFja2luZ0FyZWEgKnRyYWNraW5nQXJlYSA9 IFtbTlNUcmFja2luZ0FyZWEgYWxsb2NdIGluaXRXaXRoUmVjdDpbbV93a1ZpZXcgZnJhbWVdCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgb3B0aW9uczpvcHRpb25zCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvd25lcjptX3drVmlldworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNl ckluZm86bmlsXTsKKyAgICBbbV93a1ZpZXcgYWRkVHJhY2tpbmdBcmVhOnRyYWNraW5nQXJlYV07 CisgICAgW3RyYWNraW5nQXJlYSByZWxlYXNlXTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKG5l d1N0eWxlKTsKKyNlbmRpZgorfQorCiBib29sIFBhZ2VDbGllbnRJbXBsOjpleGVjdXRlU2F2ZWRD b21tYW5kQnlTZWxlY3Rvcihjb25zdCBTdHJpbmcmIHNlbGVjdG9yU3RyaW5nKQogewogICAgIHJl dHVybiBbbV93a1ZpZXcgX2V4ZWN1dGVTYXZlZENvbW1hbmRCeVNlbGVjdG9yOk5TU2VsZWN0b3JG cm9tU3RyaW5nKHNlbGVjdG9yU3RyaW5nKV07CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvUERGL0J1aWx0SW5QREZWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0J1aWx0SW5QREZWaWV3LmNwcAkocmV2aXNp b24gMTAwNDk4KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWls dEluUERGVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3Miw4ICs2NzIsMTIgQEAgYm9vbCBC dWlsdEluUERGVmlldzo6aXNPbkFjdGl2ZVBhZ2UoKSBjbwogICAgIHJldHVybiAhcGx1Z2luVmll dygpLT5mcmFtZSgpLT5kb2N1bWVudCgpLT5pblBhZ2VDYWNoZSgpOwogfQogCi12b2lkIEJ1aWx0 SW5QREZWaWV3OjpzY3JvbGxiYXJTdHlsZUNoYW5nZWQoKQordm9pZCBCdWlsdEluUERGVmlldzo6 c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKGludCBuZXdTdHlsZSwgYm9vbCBmb3JjZVVwZGF0ZSkKIHsK KyAgICBVTlVTRURfUEFSQU0obmV3U3R5bGUpOworICAgIGlmICghZm9yY2VVcGRhdGUpCisgICAg ICAgIHJldHVybjsKKwogICAgIC8vIElmIHRoZSBQREYgd2FzIHNjcm9sbGVkIGFsbCB0aGUgd2F5 IHRvIGJvdHRvbSByaWdodCBhbmQgc2Nyb2xsYmFycyBjaGFuZ2UgdG8gb3ZlcmxheSBzdHlsZSwg d2UgZG9uJ3Qgd2FudCB0byBkaXNwbGF5IHdoaXRlIHJlY3RhbmdsZXMgd2hlcmUgc2Nyb2xsYmFy cyB3ZXJlLgogICAgIEludFBvaW50IG5ld1Njcm9sbE9mZnNldCA9IEludFBvaW50KG1fc2Nyb2xs T2Zmc2V0KS5zaHJ1bmtUbyhtYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSk7CiAgICAgc2V0U2Nyb2xs T2Zmc2V0KG5ld1Njcm9sbE9mZnNldCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUERGL0J1aWx0SW5QREZWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5oCShyZXZpc2lvbiAxMDA0 OTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0J1aWx0SW5QREZW aWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzNCw3ICsxMzQsNyBAQCBwcml2YXRlOgogICAgIHZp cnR1YWwgYm9vbCBpc09uQWN0aXZlUGFnZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBkaXNj b25uZWN0RnJvbVBhZ2UoKSB7IG1fcGFnZSA9IDA7IH0KICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxk U3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfSAvLyBJZiB3 ZSByZXR1cm4gdHJ1ZSwgU2Nyb2xsQW5pbWF0b3JNYWMgd2lsbCBrZWVwIGN5Y2xpbmcgYSB0aW1l ciBmb3JldmVyLCB3YWl0aW5nIGZvciBhIGdvb2QgdGltZSB0byBhbmltYXRlLgotICAgIHZpcnR1 YWwgdm9pZCBzY3JvbGxiYXJTdHlsZUNoYW5nZWQoKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xs YmFyU3R5bGVDaGFuZ2VkKGludCBuZXdTdHlsZSwgYm9vbCBmb3JjZVVwZGF0ZSk7CiAgICAgdmly dHVhbCB2b2lkIHpvb21BbmltYXRvclRyYW5zZm9ybUNoYW5nZWQoZmxvYXQsIGZsb2F0LCBmbG9h dCwgWm9vbUFuaW1hdGlvblN0YXRlKSB7IH0KIAogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgdGhl IG90aGVyIGNvbnZlcnNpb24gZnVuY3Rpb25zOyB0aGlzIG9uZSBpcyBlbm91Z2ggdG8gZ2V0IHNj cm9sbGJhciBoaXQgdGVzdGluZyB3b3JraW5nLgpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cAkocmV2aXNpb24gMTAwNDk4KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03ODUsNiArNzg1 LDExIEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50Ojpub3RpZnlTY3JvbGxlclRodW0KICAgICBtX3Bh Z2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Tm90aWZ5U2Nyb2xsZXJUaHVtYklzVmlz aWJsZUluUmVjdChzY3JvbGxlclRodW1iKSk7CiB9CiAKK3ZvaWQgV2ViQ2hyb21lQ2xpZW50Ojpy ZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKGludDMyX3QgbmV3U3R5bGUpCit7Cisg ICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJlY29tbWVuZGVkU2Nyb2xs YmFyU3R5bGVEaWRDaGFuZ2UobmV3U3R5bGUpKTsKK30KKwogYm9vbCBXZWJDaHJvbWVDbGllbnQ6 OnNob3VsZFJ1YmJlckJhbmRJbkRpcmVjdGlvbihXZWJDb3JlOjpTY3JvbGxEaXJlY3Rpb24gZGly ZWN0aW9uKSBjb25zdAogewogICAgIEFTU0VSVChkaXJlY3Rpb24gIT0gV2ViQ29yZTo6U2Nyb2xs VXAgJiYgZGlyZWN0aW9uICE9IFdlYkNvcmU6OlNjcm9sbERvd24pOwpJbmRleDogU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5oCShyZXZpc2lvbiAxMDA0OTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTQs NiArMjE0LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tcGxldGVBbmltYXRl ZFNjcm9sbCgpIGNvbnN0IE9WRVJSSURFOwogCiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeVNjcm9s bGVyVGh1bWJJc1Zpc2libGVJblJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIE9WRVJSSURF OworICAgIHZpcnR1YWwgdm9pZCByZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKGlu dDMyX3QgbmV3U3R5bGUpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRSdWJiZXJC YW5kSW5EaXJlY3Rpb24oV2ViQ29yZTo6U2Nyb2xsRGlyZWN0aW9uKSBjb25zdCBPVkVSUklERTsK ICAgICAKICAgICB2aXJ0dWFsIHZvaWQgbnVtV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1bnNp Z25lZCkgT1ZFUlJJREU7Cg==