196018 2019-03-20 11:23:39 -0700 [iOS] Group UIWebFormAccessoryDelegate-related code and tighten it up a bit 2019-03-20 12:00:21 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1519016 0 dbates 2019-03-20 11:23:39 -0700 -[WKContentView _updateAccessory] is called from -hideKeyboard, which is invoked when we commit a load and don't have a form accessory view. No need to send nil messages as part of trying to update the non-existent form accessory view in this case. We should also group all UIWebFormAccessoryDelegate protocol methods for ease of discoverability and it's not possible to show and hide the AutoFill button from -_updateAccessory because we the show case needs a title based on the current design of the button added in bug #131343. So, remove a long standing FIXME. 1519027 1 365368 dbates 2019-03-20 11:39:16 -0700 Created attachment 365368 Patch 1519039 2 365368 wenson_hsieh 2019-03-20 11:48:28 -0700 Comment on attachment 365368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365368&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3753 > + _page->setFocusedElementValue(String { }); Nit - wouldn't just { } be more concise? 1519055 3 dbates 2019-03-20 11:56:10 -0700 (In reply to Wenson Hsieh from comment #2) > Comment on attachment 365368 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=365368&action=review > > > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3753 > > + _page->setFocusedElementValue(String { }); > > Nit - wouldn't just { } be more concise? OK 1519059 4 365377 dbates 2019-03-20 11:58:29 -0700 Created attachment 365377 To land 1519061 5 dbates 2019-03-20 11:59:13 -0700 Committed r243221: <https://trac.webkit.org/changeset/243221> 1519062 6 webkit-bug-importer 2019-03-20 12:00:21 -0700 <rdar://problem/49072320> 365368 2019-03-20 11:39:16 -0700 2019-03-20 11:58:28 -0700 Patch bug-196018-20190320113915.patch text/plain 6710 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU4N2ZlZDU4YmUyMGIwZTJj M2E2YzY1ZWEwMTFmNzAzMTQxNGJiNDUuLmUwMWU2OGRjNDRkNmRiNjE4ZTk4ZTIwOWQyNTcxNjVk MjUzMzJiYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDMtMjAgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEdyb3VwIFVJV2ViRm9y bUFjY2Vzc29yeURlbGVnYXRlLXJlbGF0ZWQgY29kZSBhbmQgdGlnaHRlbiBpdCB1cCBhIGJpdAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2MDE4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50 VmlldyBhY2Nlc3NvcnlDbGVhcl0pOiBVc2UgdW5pZm9ybSBpbml0aWFsaXplciBzeW50YXguIENv ZGUgY291bGQgc2VuZCB0aGUgZW1wdHkKKyAgICAgICAgc3RyaW5nLCBidXQgSSByZXNpc3RlZCBz aW5jZSBudWxsIHN0cmluZywgYXMgd2UgZG8gbm93LCBsaWtlbHkgZW5jb2RlcyBtb3JlIGNvbXBh Y3RseSBhbmQgd2UKKyAgICAgICAgYXZvaWQgYSBwZXItcHJvY2VzcyBhbGxvYy4KKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBhY2Nlc3NvcnlUYWI6XSk6IEZpeCBzdHlsZSBuaXQ7IG1pc3Npbmcg c3BhY2UgYmV0d2VlbiBjYXB0dXJlIGxpc3QgYW5kIGFyZ3VtZW50cworICAgICAgICBpbiBsYW1i ZGEuIEFsc28gdXNlIGxhbWRiYSBjYXB0dXJlIGluaXRpYWxpemVyIHN5bnRheCBhbmQgcmVtb3Zl IGEgbG9jYWwuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3VwZGF0ZUFjY2Vzc29yeV0pOiBS ZW1vdmUgYSBGSVhNRSBhcyBpdCBjYW4ndCBiZSBzYXRpZmllZCB3aXRoIHRoZSBjdXJyZW50Cisg ICAgICAgIGRlc2lnbiB3aXRob3V0IG1vcmUgYm9va2tlZXBpbmcuIFRoZSBkZXNpZ24gZm9yIHNo b3dpbmcgYW5kIGhpZGluZyBhbiBBdXRvRmlsbCBidXR0b24gYWRkZWQgaW4KKyAgICAgICAgcjE2 NjkzMyByZXF1aXJlcyBrbm93aW5nIHRoZSB0aXRsZSBmb3IgdGhlIGJ1dHRvbiB3aGVuIHNob3dp bmcgaXQgdmlhIC1zZXRBY2Nlc3NvcnlWaWV3Q3VzdG9tQnV0dG9uVGl0bGUuCisgICAgICAgIFdl IGNvdWxkIHJlLWltcGxlbWVudCBzdWNoIHRoYXQgLXNldEFjY2Vzc29yeVZpZXdDdXN0b21CdXR0 b25UaXRsZTogc3RvcmVzIHRoZSB0aXRsZSBhbmQgY2FsbHMKKyAgICAgICAgLV91cGRhdGVBY2Nl c3NvcnksIGJ1dCB0aGF0IGhhcyB0aGUgZGlzYWR2YW50YWdlIG9mIGluY3JlYXNpbmcgdGhlIG1l bW9yeSBmb290cHJpbnQgb2YgV0tDb250ZW50VmlldworICAgICAgICBmb3IgdGhlIHN0b3JlZCB0 aXRsZSBhbmQgdGhhdCBzZWVtcyB3b3JzZSB0aGFuIGNlbnRyYWxpemluZyB0aGUgbG9naWMgaW4g X3VwZGF0ZUFjY2Vzc29yeS4gU28sCisgICAgICAgIGxldCdzIG5vdCBmaXggdGhpcyBGSVhNRS4g Tm93IHRoYXQgd2UgYXJlIHJlbW92aW5nIHRoZSBGSVhNRSwgY2hhbmdlIHRvIHVzZSBhbiBlYXJs eSByZXR1cm4gc3R5bGUuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2hpZGVLZXlib2FyZF0p OiBNaWNybyBvcHRpbWl6YXRpb247IG9ubHkgY2FsbCBfdXBkYXRlQWNjZXNzb3J5IGlmIHdlIGhh dmUKKyAgICAgICAgYSBmb3JtIGFjY2Vzc29yeSB2aWV3LiBUaGlzIG1ldGhvZCBpcyBjYWxsZWQg ZXZlcnl0aW1lIHdlIGxvYWQgYSBwYWdlIChtb3JlIHByZWNpc2VseSB3aGVuIHdlCisgICAgICAg IGNvbW1pdCB0aGUgbG9hZCBmb3IgYSBwYWdlKSBpbiBhZGRpdGlvbiB0byBldmVyeXRpbWUgd2Ug Ymx1ciAoZGVmb2N1cykgYW4gZWxlbWVudC4gTm8gbmVlZCB0bworICAgICAgICB1cGRhdGUgYW4g YWNjZXNzb3J5IGlmIHdlIGRvbid0IGhhdmUgb25lLgorIAogMjAxOS0wMy0xNSAgRGFuaWVsIEJh dGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gTW9kYWxpZnkgPHNlbGVj dD4gcG9wb3ZlcjsgYXBwIGtleSBjb21tYW5kcyBzaG91bGQgbm90IGJlIHJlY29nbml6ZWQgd2hl biBwb3BvdmVyIGlzIG9wZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDVjY2Y3OGFkMjM0MmIwZmVhMmE0 NTk4ZTFlOTljZGUxMjExNWNmNDcuLjI2ZjQ1ODZlZmQ0ZjUxYjQxYjM2MWZmY2Q1NjA4NTA4ODEw ZGMwNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMzY4OSwxMyArMzY4OSw2IEBAIC0gKHZvaWQpX2hh bmRsZUF1dG9jb3JyZWN0aW9uQ29udGV4dDooY29uc3QgV2ViS2l0OjpXZWJBdXRvY29ycmVjdGlv bkNvbnRleHQmKWNvCiAgICAgW3NlbGYgX2ludm9rZVBlbmRpbmdBdXRvY29ycmVjdGlvbkNvbnRl eHRIYW5kbGVyOltXS0F1dG9jb3JyZWN0aW9uQ29udGV4dCBhdXRvY29ycmVjdGlvbkNvbnRleHRX aXRoQ29udGV4dDpjb250ZXh0XV07CiB9CiAKLS8vIFVJV2ViRm9ybUFjY2Vzc29yeURlbGVnYXRl Ci0tICh2b2lkKWFjY2Vzc29yeURvbmUKLXsKLSAgICBTZXRGb3JTY29wZTxCT09MPiBkaXNtaXNz aW5nQWNjZXNzb3J5U2NvcGUgeyBfZGlzbWlzc2luZ0FjY2Vzc29yeSwgWUVTIH07Ci0gICAgW3Nl bGYgcmVzaWduRmlyc3RSZXNwb25kZXJdOwotfQotCiAjaWYgIVVTRShVSUtJVF9LRVlCT0FSRF9B RERJVElPTlMpCiAtIChOU0FycmF5ICopa2V5Q29tbWFuZHMKIHsKQEAgLTM3MjAsMjEgKzM3MTMs NiBAQCAtICh2b2lkKV9wcmV2aW91c0FjY2Vzc29yeVRhYkZvcldlYlZpZXc6KGlkKXNlbmRlcgog ICAgIFtzZWxmIGFjY2Vzc29yeVRhYjpOT107CiB9CiAKLS0gKHZvaWQpYWNjZXNzb3J5VGFiOihC T09MKWlzTmV4dAotewotICAgIFtzZWxmIF9lbmRFZGl0aW5nXTsKLSAgICBfaW5wdXRQZXJpcGhl cmFsID0gbmlsOwotCi0gICAgX2lzQ2hhbmdpbmdGb2N1c1VzaW5nQWNjZXNzb3J5VGFiID0gWUVT OwotICAgIFtzZWxmIGJlZ2luU2VsZWN0aW9uQ2hhbmdlXTsKLSAgICBSZXRhaW5QdHI8V0tDb250 ZW50Vmlldz4gdmlldyA9IHNlbGY7Ci0gICAgX3BhZ2UtPmZvY3VzTmV4dEZvY3VzZWRFbGVtZW50 KGlzTmV4dCwgW3ZpZXddKFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcikgewotICAgICAgICBb dmlldyBlbmRTZWxlY3Rpb25DaGFuZ2VdOwotICAgICAgICBbdmlldyByZWxvYWRJbnB1dFZpZXdz XTsKLSAgICAgICAgdmlldy0+X2lzQ2hhbmdpbmdGb2N1c1VzaW5nQWNjZXNzb3J5VGFiID0gTk87 Ci0gICAgfSk7Ci19Ci0KIC0gKHZvaWQpX2JlY29tZUZpcnN0UmVzcG9uZGVyV2l0aFNlbGVjdGlv bk1vdmluZ0ZvcndhcmQ6KEJPT0wpc2VsZWN0aW5nRm9yd2FyZCBjb21wbGV0aW9uSGFuZGxlcjoo dm9pZCAoXikoQk9PTCBkaWRCZWNvbWVGaXJzdFJlc3BvbmRlcikpY29tcGxldGlvbkhhbmRsZXIK IHsKICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyQ29weSA9IEJsb2NrX2NvcHkoY29tcGxldGlv bkhhbmRsZXIpOwpAQCAtMzc2OCw2ICszNzQ2LDMzIEBAIC0gKHZvaWQpX3NldERvdWJsZVRhcEdl c3R1cmVzRW5hYmxlZDooQk9PTCllbmFibGVkCiAgICAgW3NlbGYgX3Jlc2V0SXNEb3VibGVUYXBQ ZW5kaW5nXTsKIH0KIAorLy8gTUFSSzogVUlXZWJGb3JtQWNjZXNzb3J5RGVsZWdhdGUgcHJvdG9j b2wgYW5kIGFjY2Vzc29yeSBtZXRob2RzCisKKy0gKHZvaWQpYWNjZXNzb3J5Q2xlYXIKK3sKKyAg ICBfcGFnZS0+c2V0Rm9jdXNlZEVsZW1lbnRWYWx1ZShTdHJpbmcgeyB9KTsKK30KKworLSAodm9p ZClhY2Nlc3NvcnlEb25lCit7CisgICAgU2V0Rm9yU2NvcGU8Qk9PTD4gZGlzbWlzc2luZ0FjY2Vz c29yeVNjb3BlIHsgX2Rpc21pc3NpbmdBY2Nlc3NvcnksIFlFUyB9OworICAgIFtzZWxmIHJlc2ln bkZpcnN0UmVzcG9uZGVyXTsKK30KKworLSAodm9pZClhY2Nlc3NvcnlUYWI6KEJPT0wpaXNOZXh0 Cit7CisgICAgW3NlbGYgX2VuZEVkaXRpbmddOworICAgIF9pbnB1dFBlcmlwaGVyYWwgPSBuaWw7 CisKKyAgICBfaXNDaGFuZ2luZ0ZvY3VzVXNpbmdBY2Nlc3NvcnlUYWIgPSBZRVM7CisgICAgW3Nl bGYgYmVnaW5TZWxlY3Rpb25DaGFuZ2VdOworICAgIF9wYWdlLT5mb2N1c05leHRGb2N1c2VkRWxl bWVudChpc05leHQsIFtwcm90ZWN0ZWRTZWxmID0gcmV0YWluUHRyKHNlbGYpXSAoV2ViS2l0OjpD YWxsYmFja0Jhc2U6OkVycm9yKSB7CisgICAgICAgIFtwcm90ZWN0ZWRTZWxmIGVuZFNlbGVjdGlv bkNoYW5nZV07CisgICAgICAgIFtwcm90ZWN0ZWRTZWxmIHJlbG9hZElucHV0Vmlld3NdOworICAg ICAgICBwcm90ZWN0ZWRTZWxmLT5faXNDaGFuZ2luZ0ZvY3VzVXNpbmdBY2Nlc3NvcnlUYWIgPSBO TzsKKyAgICB9KTsKK30KKwogLSAodm9pZClhY2Nlc3NvcnlBdXRvRmlsbAogewogICAgIGlkIDxf V0tJbnB1dERlbGVnYXRlPiBpbnB1dERlbGVnYXRlID0gW193ZWJWaWV3IF9pbnB1dERlbGVnYXRl XTsKQEAgLTM3NzUsMzYgKzM3ODAsMzAgQEAgLSAodm9pZClhY2Nlc3NvcnlBdXRvRmlsbAogICAg ICAgICBbaW5wdXREZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmlldyBhY2Nlc3NvcnlWaWV3Q3VzdG9t QnV0dG9uVGFwcGVkSW5Gb3JtSW5wdXRTZXNzaW9uOl9mb3JtSW5wdXRTZXNzaW9uLmdldCgpXTsK IH0KIAotLSAodm9pZClhY2Nlc3NvcnlDbGVhcgotewotICAgIF9wYWdlLT5zZXRGb2N1c2VkRWxl bWVudFZhbHVlKFN0cmluZygpKTsKLX0KLQogLSAodm9pZClfdXBkYXRlQWNjZXNzb3J5CiB7CiAg ICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXROZXh0RW5hYmxlZDpfZm9jdXNlZEVsZW1lbnRJbmZv cm1hdGlvbi5oYXNOZXh0Tm9kZV07CiAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRQcmV2aW91 c0VuYWJsZWQ6X2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaGFzUHJldmlvdXNOb2RlXTsKIAot ICAgIGlmIChjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSkKKyAgICBpZiAoY3VycmVu dFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpIHsKICAgICAgICAgW19mb3JtQWNjZXNzb3J5Vmll dyBzZXRDbGVhclZpc2libGU6Tk9dOwotICAgIGVsc2UgewotICAgICAgICBzd2l0Y2ggKF9mb2N1 c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlKSB7Ci0gICAgICAgIGNhc2UgV2ViS2l0 OjpJbnB1dFR5cGU6OkRhdGU6Ci0gICAgICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6Ok1vbnRo OgotICAgICAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpEYXRlVGltZUxvY2FsOgotICAgICAg ICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpUaW1lOgotICAgICAgICAgICAgW19mb3JtQWNjZXNz b3J5VmlldyBzZXRDbGVhclZpc2libGU6WUVTXTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICBkZWZhdWx0OgotICAgICAgICAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRDbGVhclZpc2li bGU6Tk9dOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KKyAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIC8vIEZJWE1FOiBoaWRlIG9yIHNob3cgdGhlIEF1dG9GaWxsIGJ1dHRvbiBh cyBuZWVkZWQuCisgICAgc3dpdGNoIChfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50 VHlwZSkgeworICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OkRhdGU6CisgICAgY2FzZSBXZWJL aXQ6OklucHV0VHlwZTo6TW9udGg6CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6RGF0ZVRp bWVMb2NhbDoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpUaW1lOgorICAgICAgICBbX2Zv cm1BY2Nlc3NvcnlWaWV3IHNldENsZWFyVmlzaWJsZTpZRVNdOworICAgICAgICByZXR1cm47Cisg ICAgZGVmYXVsdDoKKyAgICAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRDbGVhclZpc2libGU6 Tk9dOworICAgICAgICByZXR1cm47CisgICAgfQogfQogCi0vLyBLZXlib2FyZCBpbnRlcmFjdGlv bgorLy8gTUFSSzogS2V5Ym9hcmQgaW50ZXJhY3Rpb24KIC8vIFVJVGV4dElucHV0IHByb3RvY29s IGltcGxlbWVudGF0aW9uCiAKIC0gKEJPT0wpX2FsbG93QW5pbWF0ZWRVcGRhdGVTZWxlY3Rpb25S ZWN0Vmlld3MKQEAgLTQ3ODUsNyArNDc4NCw4IEBAIC0gKHZvaWQpX2hpZGVLZXlib2FyZAogCiAg ICAgLy8gRklYTUU6IERvZXMgaXQgbWFrZSBzZW5zZSB0byBjYWxsIC1yZWxvYWRJbnB1dFZpZXdz IG9uIHdhdGNoT1M/CiAgICAgW3NlbGYgcmVsb2FkSW5wdXRWaWV3c107Ci0gICAgW3NlbGYgX3Vw ZGF0ZUFjY2Vzc29yeV07CisgICAgaWYgKF9mb3JtQWNjZXNzb3J5VmlldykKKyAgICAgICAgW3Nl bGYgX3VwZGF0ZUFjY2Vzc29yeV07CiB9CiAKIC0gKGNvbnN0IFdlYktpdDo6Rm9jdXNlZEVsZW1l bnRJbmZvcm1hdGlvbiYpZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbgo= 365377 2019-03-20 11:58:29 -0700 2019-03-20 11:58:29 -0700 To land bug-196018-20190320115829.patch text/plain 6692 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJkYTk2ZjRkYzlhNGJjYzM0 ZTI1MzBiYzkyYjJkOTUyYzA0MmRkMjMuLjU4YjJkOTExNmY4ZDMxYjRmMmNiY2YwMzAzMGM4MTYx NzdjZDMxMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDMtMjAgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEdyb3VwIFVJV2ViRm9y bUFjY2Vzc29yeURlbGVnYXRlLXJlbGF0ZWQgY29kZSBhbmQgdGlnaHRlbiBpdCB1cCBhIGJpdAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2MDE4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgICogVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgYWNjZXNzb3J5Q2xlYXJdKTogVXNlIHVuaWZvcm0gaW5pdGlhbGl6ZXIgc3ludGF4LiBDb2Rl IGNvdWxkIHNlbmQgdGhlIGVtcHR5CisgICAgICAgIHN0cmluZywgYnV0IEkgcmVzaXN0ZWQgc2lu Y2UgbnVsbCBzdHJpbmcsIGFzIHdlIGRvIG5vdywgbGlrZWx5IGVuY29kZXMgbW9yZSBjb21wYWN0 bHkgYW5kIHdlCisgICAgICAgIGF2b2lkIGEgcGVyLXByb2Nlc3MgYWxsb2MuCisgICAgICAgICgt W1dLQ29udGVudFZpZXcgYWNjZXNzb3J5VGFiOl0pOiBGaXggc3R5bGUgbml0OyBtaXNzaW5nIHNw YWNlIGJldHdlZW4gY2FwdHVyZSBsaXN0IGFuZCBhcmd1bWVudHMKKyAgICAgICAgaW4gbGFtYmRh LiBBbHNvIHVzZSBsYW1kYmEgY2FwdHVyZSBpbml0aWFsaXplciBzeW50YXggYW5kIHJlbW92ZSBh IGxvY2FsLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF91cGRhdGVBY2Nlc3NvcnldKTogUmVt b3ZlIGEgRklYTUUgYXMgaXQgY2FuJ3QgYmUgc2F0aWZpZWQgd2l0aCB0aGUgY3VycmVudAorICAg ICAgICBkZXNpZ24gd2l0aG91dCBtb3JlIGJvb2trZWVwaW5nLiBUaGUgZGVzaWduIGZvciBzaG93 aW5nIGFuZCBoaWRpbmcgYW4gQXV0b0ZpbGwgYnV0dG9uIGFkZGVkIGluCisgICAgICAgIHIxNjY5 MzMgcmVxdWlyZXMga25vd2luZyB0aGUgdGl0bGUgZm9yIHRoZSBidXR0b24gd2hlbiBzaG93aW5n IGl0IHZpYSAtc2V0QWNjZXNzb3J5Vmlld0N1c3RvbUJ1dHRvblRpdGxlLgorICAgICAgICBXZSBj b3VsZCByZS1pbXBsZW1lbnQgc3VjaCB0aGF0IC1zZXRBY2Nlc3NvcnlWaWV3Q3VzdG9tQnV0dG9u VGl0bGU6IHN0b3JlcyB0aGUgdGl0bGUgYW5kIGNhbGxzCisgICAgICAgIC1fdXBkYXRlQWNjZXNz b3J5LCBidXQgdGhhdCBoYXMgdGhlIGRpc2FkdmFudGFnZSBvZiBpbmNyZWFzaW5nIHRoZSBtZW1v cnkgZm9vdHByaW50IG9mIFdLQ29udGVudFZpZXcKKyAgICAgICAgZm9yIHRoZSBzdG9yZWQgdGl0 bGUgYW5kIHRoYXQgc2VlbXMgd29yc2UgdGhhbiBjZW50cmFsaXppbmcgdGhlIGxvZ2ljIGluIF91 cGRhdGVBY2Nlc3NvcnkuIFNvLAorICAgICAgICBsZXQncyBub3QgZml4IHRoaXMgRklYTUUuIE5v dyB0aGF0IHdlIGFyZSByZW1vdmluZyB0aGUgRklYTUUsIGNoYW5nZSB0byB1c2UgYW4gZWFybHkg cmV0dXJuIHN0eWxlLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9oaWRlS2V5Ym9hcmRdKTog TWljcm8gb3B0aW1pemF0aW9uOyBvbmx5IGNhbGwgX3VwZGF0ZUFjY2Vzc29yeSBpZiB3ZSBoYXZl CisgICAgICAgIGEgZm9ybSBhY2Nlc3Nvcnkgdmlldy4gVGhpcyBtZXRob2QgaXMgY2FsbGVkIGV2 ZXJ5dGltZSB3ZSBsb2FkIGEgcGFnZSAobW9yZSBwcmVjaXNlbHkgd2hlbiB3ZQorICAgICAgICBj b21taXQgdGhlIGxvYWQgZm9yIGEgcGFnZSkgaW4gYWRkaXRpb24gdG8gZXZlcnl0aW1lIHdlIGJs dXIgKGRlZm9jdXMpIGFuIGVsZW1lbnQuIE5vIG5lZWQgdG8KKyAgICAgICAgdXBkYXRlIGFuIGFj Y2Vzc29yeSBpZiB3ZSBkb24ndCBoYXZlIG9uZS4KKyAKIDIwMTktMDMtMjAgIE9saXZpZXIgUm9i aW4gIDxvbGl2aWVycm9iaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBfZ2V0Q29udGVu dHNBc0F0dHJpYnV0ZWRTdHJpbmdXaXRoQ29tcGxldGlvbkhhbmRsZXIgYXZhaWxhYmlsaXR5IGZv ciBpT1MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBmZjA4MzUxNGNjZWQ0OTNmZWFmZWJhZmJmZjE1NTdl ODE5ZDFjMWZkLi5kNThjNDY3NWE4OWM2OGU2MmY4NzBjNzM5YmIxNjIwNjRlMDRkYjk5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0KQEAgLTM2OTMsMTMgKzM2OTMsNiBAQCAtICh2b2lkKV9oYW5kbGVBdXRvY29y cmVjdGlvbkNvbnRleHQ6KGNvbnN0IFdlYktpdDo6V2ViQXV0b2NvcnJlY3Rpb25Db250ZXh0Jilj bwogICAgIFtzZWxmIF9pbnZva2VQZW5kaW5nQXV0b2NvcnJlY3Rpb25Db250ZXh0SGFuZGxlcjpb V0tBdXRvY29ycmVjdGlvbkNvbnRleHQgYXV0b2NvcnJlY3Rpb25Db250ZXh0V2l0aENvbnRleHQ6 Y29udGV4dF1dOwogfQogCi0vLyBVSVdlYkZvcm1BY2Nlc3NvcnlEZWxlZ2F0ZQotLSAodm9pZClh Y2Nlc3NvcnlEb25lCi17Ci0gICAgU2V0Rm9yU2NvcGU8Qk9PTD4gZGlzbWlzc2luZ0FjY2Vzc29y eVNjb3BlIHsgX2Rpc21pc3NpbmdBY2Nlc3NvcnksIFlFUyB9OwotICAgIFtzZWxmIHJlc2lnbkZp cnN0UmVzcG9uZGVyXTsKLX0KLQogI2lmICFVU0UoVUlLSVRfS0VZQk9BUkRfQURESVRJT05TKQog LSAoTlNBcnJheSAqKWtleUNvbW1hbmRzCiB7CkBAIC0zNzI0LDIxICszNzE3LDYgQEAgLSAodm9p ZClfcHJldmlvdXNBY2Nlc3NvcnlUYWJGb3JXZWJWaWV3OihpZClzZW5kZXIKICAgICBbc2VsZiBh Y2Nlc3NvcnlUYWI6Tk9dOwogfQogCi0tICh2b2lkKWFjY2Vzc29yeVRhYjooQk9PTClpc05leHQK LXsKLSAgICBbc2VsZiBfZW5kRWRpdGluZ107Ci0gICAgX2lucHV0UGVyaXBoZXJhbCA9IG5pbDsK LQotICAgIF9pc0NoYW5naW5nRm9jdXNVc2luZ0FjY2Vzc29yeVRhYiA9IFlFUzsKLSAgICBbc2Vs ZiBiZWdpblNlbGVjdGlvbkNoYW5nZV07Ci0gICAgUmV0YWluUHRyPFdLQ29udGVudFZpZXc+IHZp ZXcgPSBzZWxmOwotICAgIF9wYWdlLT5mb2N1c05leHRGb2N1c2VkRWxlbWVudChpc05leHQsIFt2 aWV3XShXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3IpIHsKLSAgICAgICAgW3ZpZXcgZW5kU2Vs ZWN0aW9uQ2hhbmdlXTsKLSAgICAgICAgW3ZpZXcgcmVsb2FkSW5wdXRWaWV3c107Ci0gICAgICAg IHZpZXctPl9pc0NoYW5naW5nRm9jdXNVc2luZ0FjY2Vzc29yeVRhYiA9IE5POwotICAgIH0pOwot fQotCiAtICh2b2lkKV9iZWNvbWVGaXJzdFJlc3BvbmRlcldpdGhTZWxlY3Rpb25Nb3ZpbmdGb3J3 YXJkOihCT09MKXNlbGVjdGluZ0ZvcndhcmQgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKEJP T0wgZGlkQmVjb21lRmlyc3RSZXNwb25kZXIpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgYXV0 byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRpb25IYW5kbGVyKTsK QEAgLTM3NzIsNiArMzc1MCwzMyBAQCAtICh2b2lkKV9zZXREb3VibGVUYXBHZXN0dXJlc0VuYWJs ZWQ6KEJPT0wpZW5hYmxlZAogICAgIFtzZWxmIF9yZXNldElzRG91YmxlVGFwUGVuZGluZ107CiB9 CiAKKy8vIE1BUks6IFVJV2ViRm9ybUFjY2Vzc29yeURlbGVnYXRlIHByb3RvY29sIGFuZCBhY2Nl c3NvcnkgbWV0aG9kcworCistICh2b2lkKWFjY2Vzc29yeUNsZWFyCit7CisgICAgX3BhZ2UtPnNl dEZvY3VzZWRFbGVtZW50VmFsdWUoeyB9KTsKK30KKworLSAodm9pZClhY2Nlc3NvcnlEb25lCit7 CisgICAgU2V0Rm9yU2NvcGU8Qk9PTD4gZGlzbWlzc2luZ0FjY2Vzc29yeVNjb3BlIHsgX2Rpc21p c3NpbmdBY2Nlc3NvcnksIFlFUyB9OworICAgIFtzZWxmIHJlc2lnbkZpcnN0UmVzcG9uZGVyXTsK K30KKworLSAodm9pZClhY2Nlc3NvcnlUYWI6KEJPT0wpaXNOZXh0Cit7CisgICAgW3NlbGYgX2Vu ZEVkaXRpbmddOworICAgIF9pbnB1dFBlcmlwaGVyYWwgPSBuaWw7CisKKyAgICBfaXNDaGFuZ2lu Z0ZvY3VzVXNpbmdBY2Nlc3NvcnlUYWIgPSBZRVM7CisgICAgW3NlbGYgYmVnaW5TZWxlY3Rpb25D aGFuZ2VdOworICAgIF9wYWdlLT5mb2N1c05leHRGb2N1c2VkRWxlbWVudChpc05leHQsIFtwcm90 ZWN0ZWRTZWxmID0gcmV0YWluUHRyKHNlbGYpXSAoV2ViS2l0OjpDYWxsYmFja0Jhc2U6OkVycm9y KSB7CisgICAgICAgIFtwcm90ZWN0ZWRTZWxmIGVuZFNlbGVjdGlvbkNoYW5nZV07CisgICAgICAg IFtwcm90ZWN0ZWRTZWxmIHJlbG9hZElucHV0Vmlld3NdOworICAgICAgICBwcm90ZWN0ZWRTZWxm LT5faXNDaGFuZ2luZ0ZvY3VzVXNpbmdBY2Nlc3NvcnlUYWIgPSBOTzsKKyAgICB9KTsKK30KKwog LSAodm9pZClhY2Nlc3NvcnlBdXRvRmlsbAogewogICAgIGlkIDxfV0tJbnB1dERlbGVnYXRlPiBp bnB1dERlbGVnYXRlID0gW193ZWJWaWV3IF9pbnB1dERlbGVnYXRlXTsKQEAgLTM3NzksMzYgKzM3 ODQsMzAgQEAgLSAodm9pZClhY2Nlc3NvcnlBdXRvRmlsbAogICAgICAgICBbaW5wdXREZWxlZ2F0 ZSBfd2ViVmlldzpfd2ViVmlldyBhY2Nlc3NvcnlWaWV3Q3VzdG9tQnV0dG9uVGFwcGVkSW5Gb3Jt SW5wdXRTZXNzaW9uOl9mb3JtSW5wdXRTZXNzaW9uLmdldCgpXTsKIH0KIAotLSAodm9pZClhY2Nl c3NvcnlDbGVhcgotewotICAgIF9wYWdlLT5zZXRGb2N1c2VkRWxlbWVudFZhbHVlKFN0cmluZygp KTsKLX0KLQogLSAodm9pZClfdXBkYXRlQWNjZXNzb3J5CiB7CiAgICAgW19mb3JtQWNjZXNzb3J5 VmlldyBzZXROZXh0RW5hYmxlZDpfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5oYXNOZXh0Tm9k ZV07CiAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRQcmV2aW91c0VuYWJsZWQ6X2ZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb24uaGFzUHJldmlvdXNOb2RlXTsKIAotICAgIGlmIChjdXJyZW50VXNl ckludGVyZmFjZUlkaW9tSXNQYWQoKSkKKyAgICBpZiAoY3VycmVudFVzZXJJbnRlcmZhY2VJZGlv bUlzUGFkKCkpIHsKICAgICAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRDbGVhclZpc2libGU6 Tk9dOwotICAgIGVsc2UgewotICAgICAgICBzd2l0Y2ggKF9mb2N1c2VkRWxlbWVudEluZm9ybWF0 aW9uLmVsZW1lbnRUeXBlKSB7Ci0gICAgICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OkRhdGU6 Ci0gICAgICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6Ok1vbnRoOgotICAgICAgICBjYXNlIFdl YktpdDo6SW5wdXRUeXBlOjpEYXRlVGltZUxvY2FsOgotICAgICAgICBjYXNlIFdlYktpdDo6SW5w dXRUeXBlOjpUaW1lOgotICAgICAgICAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRDbGVhclZp c2libGU6WUVTXTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAg ICAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRDbGVhclZpc2libGU6Tk9dOwotICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIH0KKyAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIC8vIEZJ WE1FOiBoaWRlIG9yIHNob3cgdGhlIEF1dG9GaWxsIGJ1dHRvbiBhcyBuZWVkZWQuCisgICAgc3dp dGNoIChfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSkgeworICAgIGNhc2Ug V2ViS2l0OjpJbnB1dFR5cGU6OkRhdGU6CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6TW9u dGg6CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6RGF0ZVRpbWVMb2NhbDoKKyAgICBjYXNl IFdlYktpdDo6SW5wdXRUeXBlOjpUaW1lOgorICAgICAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IHNl dENsZWFyVmlzaWJsZTpZRVNdOworICAgICAgICByZXR1cm47CisgICAgZGVmYXVsdDoKKyAgICAg ICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRDbGVhclZpc2libGU6Tk9dOworICAgICAgICByZXR1 cm47CisgICAgfQogfQogCi0vLyBLZXlib2FyZCBpbnRlcmFjdGlvbgorLy8gTUFSSzogS2V5Ym9h cmQgaW50ZXJhY3Rpb24KIC8vIFVJVGV4dElucHV0IHByb3RvY29sIGltcGxlbWVudGF0aW9uCiAK IC0gKEJPT0wpX2FsbG93QW5pbWF0ZWRVcGRhdGVTZWxlY3Rpb25SZWN0Vmlld3MKQEAgLTQ3ODIs NyArNDc4MSw4IEBAIC0gKHZvaWQpX2hpZGVLZXlib2FyZAogCiAgICAgLy8gRklYTUU6IERvZXMg aXQgbWFrZSBzZW5zZSB0byBjYWxsIC1yZWxvYWRJbnB1dFZpZXdzIG9uIHdhdGNoT1M/CiAgICAg W3NlbGYgcmVsb2FkSW5wdXRWaWV3c107Ci0gICAgW3NlbGYgX3VwZGF0ZUFjY2Vzc29yeV07Cisg ICAgaWYgKF9mb3JtQWNjZXNzb3J5VmlldykKKyAgICAgICAgW3NlbGYgX3VwZGF0ZUFjY2Vzc29y eV07CiB9CiAKIC0gKGNvbnN0IFdlYktpdDo6Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbiYpZm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbgo=