126021 2013-12-19 15:06:09 -0800 Different and incorrect flags are passed to sendSync when accessibility is enabled, SpinRunLoopWhileWaitingForReply 2015-12-21 07:17:37 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 127411 127429 1 ap mitz andersca cfleizach darin mitz sam webkit-bug-importer oldest_to_newest 961559 0 ap 2013-12-19 15:06:09 -0800 In WebKit2, we have multiple places where sendSync flags depend on whether accessibility is enabled. unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0; WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags); It is unfortunate to have such differences, because we get to support two runtime behaviors instead of one. I think that we should either make SpinRunLoopWhileWaitingForReply unconditional, or stop passing SpinRunLoopWhileWaitingForReply, and find different fixes for bugs it was needed for. Bug 126014 is one case where SpinRunLoopWhileWaitingForReply was found to cause significant trouble. 961584 1 ap 2013-12-19 15:32:09 -0800 See also: bug 123828. 961586 2 webkit-bug-importer 2013-12-19 15:32:21 -0800 <rdar://problem/15703778> 972291 3 ap 2014-01-26 18:00:30 -0800 Removing "possibly" from the title, as it's certainly incorrect given the test crashes seen in blocking bugs. Now that accessibility gets disabled after each test, this should affect testing, but it may cause instability in real life. 1150645 4 267719 mitz 2015-12-20 08:23:54 -0800 Created attachment 267719 Get rid of SpinRunLoopWhileWaitingForReply 1150736 5 mitz 2015-12-21 07:17:37 -0800 Committed <http://trac.webkit.org/r194330>. 267719 2015-12-20 08:23:54 -0800 2015-12-20 13:10:25 -0800 Get rid of SpinRunLoopWhileWaitingForReply bug-126021-20151220082316.patch text/plain 14805 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NDMxOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE1LTEyLTIwICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgRGlmZmVyZW50IGFuZCBpbmNvcnJl Y3QgZmxhZ3MgYXJlIHBhc3NlZCB0byBzZW5kU3luYyB3aGVuIGFjY2Vzc2liaWxpdHkgaXMgZW5h YmxlZCwgU3BpblJ1bkxvb3BXaGlsZVdhaXRpbmdGb3JSZXBseQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MDIxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2V0IHJpZCBvZiBTcGluUnVuTG9vcFdoaWxl V2FpdGluZ0ZvclJlcGx5IGJlY2F1c2UgaXTigJlzIG5vdCB1c2VkIGFueW1vcmUuCisKKyAgICAg ICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChJUEM6OkNvbm5lY3Rp b246OndhaXRGb3JTeW5jUmVwbHkpOiBSZW1vdmVkIHRoZSBTcGluUnVuTG9vcFdoaWxlV2FpdGlu Z0ZvclJlcGx5IGJyYW5jaC4KKworICAgICAgICAqIFBsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmg6 IFJlbW92ZWQgU3BpblJ1bkxvb3BXaGlsZVdhaXRpbmdGb3JSZXBseS4KKworICAgICAgICAqIFdl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViQ2hyb21lQ2xpZW50OjpydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwpOiBEb27i gJl0IGNoZWNrCisgICAgICAgICAgV2ViUGFnZTo6c3luY2hyb25vdXNNZXNzYWdlc1Nob3VsZFNw aW5SdW5Mb29wKCkgYW5kIGRvbuKAmXQgc3BlY2lmeQorICAgICAgICAgIFNwaW5SdW5Mb29wV2hp bGVXYWl0aW5nRm9yUmVwbHkuCisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6cnVu SmF2YVNjcmlwdEFsZXJ0KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVu dDo6cnVuSmF2YVNjcmlwdENvbmZpcm0pOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViQ2hy b21lQ2xpZW50OjpydW5KYXZhU2NyaXB0UHJvbXB0KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6 OldlYkNocm9tZUNsaWVudDo6cHJpbnQpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViQ2hy b21lQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEpOiBEaXR0by4KKyAgICAgICAgKFdlYktp dDo6V2ViQ2hyb21lQ2xpZW50OjpyZWFjaGVkQXBwbGljYXRpb25DYWNoZU9yaWdpblF1b3RhKTog RGl0dG8uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UpOiBEaXR0by4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c3lu Y2hyb25vdXNNZXNzYWdlc1Nob3VsZFNwaW5SdW5Mb29wKTogRGVsZXRlZC4KKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorCiAyMDE1LTEyLTE5ICBEYW4gQmVybnN0ZWlu ICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gV2ViS2l0IGNvbnRhaW5zIGRlYWQg c291cmNlIGNvZGUgZm9yIE9TIFggTWF2ZXJpY2tzIGFuZCBlYXJsaWVyCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uY3BwCShyZXZpc2lvbiAxOTQzMTgpCisr KyBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTU4MiwxOCArNTgyLDkgQEAgc3RkOjp1bmlxdWVfcHRyPE1lc3NhZ2VEZWNvZGVyPiBD b25uZWN0aQogICAgICAgICAvLyBXZSBkaWRuJ3QgZmluZCBhIHN5bmMgcmVwbHkgeWV0LCBrZWVw IHdhaXRpbmcuCiAgICAgICAgIC8vIFRoaXMgYWxsb3dzIHRoZSBXZWJQcm9jZXNzIHRvIHN0aWxs IHNlcnZlIGNsaWVudHMgd2hpbGUgd2FpdGluZyBmb3IgdGhlIG1lc3NhZ2UgdG8gcmV0dXJuLgog ICAgICAgICAvLyBOb3RhYmx5LCBpdCBjYW4gY29udGludWUgdG8gcHJvY2VzcyBhY2Nlc3NpYmls aXR5IHJlcXVlc3RzLCB3aGljaCBhcmUgb24gdGhlIG1haW4gdGhyZWFkLgotICAgICAgICBpZiAo c3luY1NlbmRGbGFncyAmIFNwaW5SdW5Mb29wV2hpbGVXYWl0aW5nRm9yUmVwbHkpIHsKLSNpZiBQ TEFURk9STShDT0NPQSkKLSAgICAgICAgICAgIC8vIEZJWE1FOiBBbHRob3VnaCB3ZSBydW4gZm9y ZXZlciwgYW55IGV2ZW50cyBpbmNvbWluZyB3aWxsIGNhdXNlIHVzIHRvIGRyb3Agb3V0IGFuZCBl eGl0IG91dC4gVGhpcyBob3dldmVyIGRvZXNuJ3QKLSAgICAgICAgICAgIC8vIGFjY291bnQgZm9y IGEgdGltZW91dCB2YWx1ZSBwYXNzZWQgaW4uIFRpbWVvdXQgaXMgYWx3YXlzIE5vVGltZW91dCBp biB0aGVzZSBjYXNlcywgYnV0IHRoYXQgY291bGQgY2hhbmdlLgotICAgICAgICAgICAgUnVuTG9v cDo6Y3VycmVudCgpLnJ1bkZvckR1cmF0aW9uKDFlMTApOwotICAgICAgICAgICAgdGltZWRPdXQg PSBjdXJyZW50VGltZSgpID49IGFic29sdXRlVGltZTsKLSNlbmRpZgotICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgIHRpbWVkT3V0ID0gIVN5bmNNZXNzYWdlU3RhdGU6OnNpbmdsZXRvbigpLndh aXQoYWJzb2x1dGVUaW1lKTsKLSAgICAgICAgCisgICAgICAgIHRpbWVkT3V0ID0gIVN5bmNNZXNz YWdlU3RhdGU6OnNpbmdsZXRvbigpLndhaXQoYWJzb2x1dGVUaW1lKTsKICAgICB9Ci0gICAgCisK ICAgICBkaWRSZWNlaXZlU3luY1JlcGx5KHN5bmNTZW5kRmxhZ3MpOwogCiAgICAgcmV0dXJuIG51 bGxwdHI7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmgJKHJl dmlzaW9uIDE5NDMxOCkKKysrIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9u LmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDEwICs2OSw3IEBAIGVudW0gTWVzc2FnZVNlbmRGbGFn cyB7CiBlbnVtIFN5bmNNZXNzYWdlU2VuZEZsYWdzIHsKICAgICAvLyBVc2UgdGhpcyB0byBpbmZv cm0gdGhhdCB0aGlzIHN5bmMgY2FsbCB3aWxsIHN1c3BlbmQgdGhpcyBwcm9jZXNzIHVudGlsIHRo ZSB1c2VyIHJlc3BvbmRzIHdpdGggaW5wdXQuCiAgICAgSW5mb3JtUGxhdGZvcm1Qcm9jZXNzV2ls bFN1c3BlbmQgPSAxIDw8IDAsCi0gICAgLy8gU29tZSBwbGF0Zm9ybSBhY2Nlc3NpYmlsaXR5IGNs aWVudHMgY2FuJ3Qgc3VzcGVuZCBncmFjZWZ1bGx5IGFuZCBuZWVkIHRvIHNwaW4gdGhlIHJ1biBs b29wIHNvIFdlYlByb2Nlc3MgZG9lc24ndCBoYW5nLgotICAgIC8vIEZJWE1FICgxMjYwMjEpOiBS ZW1vdmUgd2hlbiBubyBwbGF0Zm9ybXMgbmVlZCB0byBzdXBwb3J0IHRoaXMuCi0gICAgU3BpblJ1 bkxvb3BXaGlsZVdhaXRpbmdGb3JSZXBseSA9IDEgPDwgMSwKLSAgICBVc2VGdWxseVN5bmNocm9u b3VzTW9kZUZvclRlc3RpbmcgPSAxIDw8IDIsCisgICAgVXNlRnVsbHlTeW5jaHJvbm91c01vZGVG b3JUZXN0aW5nID0gMSA8PCAxLAogfTsKIAogZW51bSBXYWl0Rm9yTWVzc2FnZUZsYWdzIHsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xp ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHJldmlzaW9uIDE5NDMxOCkKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzQxLDExICszNDEsNyBAQCBib29sIFdlYkNocm9tZUNsaWVudDo6cnVu QmVmb3JlVW5sb2FkQ29uCiAKICAgICBIYW5nRGV0ZWN0aW9uRGlzYWJsZXIgaGFuZ0RldGVjdGlv bkRpc2FibGVyOwogCi0gICAgdW5zaWduZWQgc3luY1NlbmRGbGFncyA9IElQQzo6SW5mb3JtUGxh dGZvcm1Qcm9jZXNzV2lsbFN1c3BlbmQ7Ci0gICAgaWYgKFdlYlBhZ2U6OnN5bmNocm9ub3VzTWVz c2FnZXNTaG91bGRTcGluUnVuTG9vcCgpKQotICAgICAgICBzeW5jU2VuZEZsYWdzIHw9IElQQzo6 U3BpblJ1bkxvb3BXaGlsZVdhaXRpbmdGb3JSZXBseTsKLSAgICAKLSAgICBpZiAoIVdlYlByb2Nl c3M6OnNpbmdsZXRvbigpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OlJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChtZXNzYWdlLCB3 ZWJGcmFtZS0+ZnJhbWVJRCgpKSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuQmVmb3JlVW5s b2FkQ29uZmlybVBhbmVsOjpSZXBseShzaG91bGRDbG9zZSksIG1fcGFnZS0+cGFnZUlEKCksIHN0 ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM6Om1heCgpLCBzeW5jU2VuZEZsYWdzKSkKKyAgICBpZiAo IVdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmRT eW5jKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbCht ZXNzYWdlLCB3ZWJGcmFtZS0+ZnJhbWVJRCgpKSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVu QmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsOjpSZXBseShzaG91bGRDbG9zZSksIG1fcGFnZS0+cGFn ZUlEKCksIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM6Om1heCgpLCBJUEM6OkluZm9ybVBsYXRm b3JtUHJvY2Vzc1dpbGxTdXNwZW5kKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0 dXJuIHNob3VsZENsb3NlOwpAQCAtMzgwLDEwICszNzYsNyBAQCB2b2lkIFdlYkNocm9tZUNsaWVu dDo6cnVuSmF2YVNjcmlwdEFsZXJ0CiAKICAgICBIYW5nRGV0ZWN0aW9uRGlzYWJsZXIgaGFuZ0Rl dGVjdGlvbkRpc2FibGVyOwogCi0gICAgdW5zaWduZWQgc3luY1NlbmRGbGFncyA9IElQQzo6SW5m b3JtUGxhdGZvcm1Qcm9jZXNzV2lsbFN1c3BlbmQ7Ci0gICAgaWYgKFdlYlBhZ2U6OnN5bmNocm9u b3VzTWVzc2FnZXNTaG91bGRTcGluUnVuTG9vcCgpKQotICAgICAgICBzeW5jU2VuZEZsYWdzIHw9 IElQQzo6U3BpblJ1bkxvb3BXaGlsZVdhaXRpbmdGb3JSZXBseTsKLSAgICBXZWJQcm9jZXNzOjpz aW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kU3luYyhNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpSdW5KYXZhU2NyaXB0QWxlcnQod2ViRnJhbWUtPmZyYW1lSUQoKSwgU2Vj dXJpdHlPcmlnaW5EYXRhOjpmcm9tRnJhbWUoZnJhbWUpLCBhbGVydFRleHQpLCBNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpSdW5KYXZhU2NyaXB0QWxlcnQ6OlJlcGx5KCksIG1fcGFnZS0+cGFnZUlE KCksIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM6Om1heCgpLCBzeW5jU2VuZEZsYWdzKTsKKyAg ICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5k U3luYyhNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpSdW5KYXZhU2NyaXB0QWxlcnQod2ViRnJhbWUt PmZyYW1lSUQoKSwgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tRnJhbWUoZnJhbWUpLCBhbGVydFRl eHQpLCBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpSdW5KYXZhU2NyaXB0QWxlcnQ6OlJlcGx5KCks IG1fcGFnZS0+cGFnZUlEKCksIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM6Om1heCgpLCBJUEM6 OkluZm9ybVBsYXRmb3JtUHJvY2Vzc1dpbGxTdXNwZW5kKTsKIH0KIAogYm9vbCBXZWJDaHJvbWVD bGllbnQ6OnJ1bkphdmFTY3JpcHRDb25maXJtKEZyYW1lKiBmcmFtZSwgY29uc3QgU3RyaW5nJiBt ZXNzYWdlKQpAQCAtMzk2LDExICszODksOCBAQCBib29sIFdlYkNocm9tZUNsaWVudDo6cnVuSmF2 YVNjcmlwdENvbmZpCiAKICAgICBIYW5nRGV0ZWN0aW9uRGlzYWJsZXIgaGFuZ0RldGVjdGlvbkRp c2FibGVyOwogCi0gICAgdW5zaWduZWQgc3luY1NlbmRGbGFncyA9IElQQzo6SW5mb3JtUGxhdGZv cm1Qcm9jZXNzV2lsbFN1c3BlbmQ7Ci0gICAgaWYgKFdlYlBhZ2U6OnN5bmNocm9ub3VzTWVzc2Fn ZXNTaG91bGRTcGluUnVuTG9vcCgpKQotICAgICAgICBzeW5jU2VuZEZsYWdzIHw9IElQQzo6U3Bp blJ1bkxvb3BXaGlsZVdhaXRpbmdGb3JSZXBseTsKICAgICBib29sIHJlc3VsdCA9IGZhbHNlOwot ICAgIGlmICghV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24o KS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlwdENvbmZpcm0o d2ViRnJhbWUtPmZyYW1lSUQoKSwgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tRnJhbWUoZnJhbWUp LCBtZXNzYWdlKSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlwdENvbmZpcm06 OlJlcGx5KHJlc3VsdCksIG1fcGFnZS0+cGFnZUlEKCksIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29u ZHM6Om1heCgpLCBzeW5jU2VuZEZsYWdzKSkKKyAgICBpZiAoIVdlYlByb2Nlc3M6OnNpbmdsZXRv bigpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OlJ1bkphdmFTY3JpcHRDb25maXJtKHdlYkZyYW1lLT5mcmFtZUlEKCksIFNlY3VyaXR5 T3JpZ2luRGF0YTo6ZnJvbUZyYW1lKGZyYW1lKSwgbWVzc2FnZSksIE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OlJ1bkphdmFTY3JpcHRDb25maXJtOjpSZXBseShyZXN1bHQpLCBtX3BhZ2UtPnBhZ2VJ RCgpLCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzOjptYXgoKSwgSVBDOjpJbmZvcm1QbGF0Zm9y bVByb2Nlc3NXaWxsU3VzcGVuZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVy biByZXN1bHQ7CkBAIC00MTYsMTEgKzQwNiw3IEBAIGJvb2wgV2ViQ2hyb21lQ2xpZW50OjpydW5K YXZhU2NyaXB0UHJvbXAKIAogICAgIEhhbmdEZXRlY3Rpb25EaXNhYmxlciBoYW5nRGV0ZWN0aW9u RGlzYWJsZXI7CiAKLSAgICB1bnNpZ25lZCBzeW5jU2VuZEZsYWdzID0gSVBDOjpJbmZvcm1QbGF0 Zm9ybVByb2Nlc3NXaWxsU3VzcGVuZDsKLSAgICBpZiAoV2ViUGFnZTo6c3luY2hyb25vdXNNZXNz YWdlc1Nob3VsZFNwaW5SdW5Mb29wKCkpCi0gICAgICAgIHN5bmNTZW5kRmxhZ3MgfD0gSVBDOjpT cGluUnVuTG9vcFdoaWxlV2FpdGluZ0ZvclJlcGx5OwotICAgIAotICAgIGlmICghV2ViUHJvY2Vz czo6c2luZ2xldG9uKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlwdFByb21wdCh3ZWJGcmFtZS0+ZnJhbWVJRCgp LCBTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21GcmFtZShmcmFtZSksIG1lc3NhZ2UsIGRlZmF1bHRW YWx1ZSksIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJ1bkphdmFTY3JpcHRQcm9tcHQ6OlJlcGx5 KHJlc3VsdCksIG1fcGFnZS0+cGFnZUlEKCksIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM6Om1h eCgpLCBzeW5jU2VuZEZsYWdzKSkKKyAgICBpZiAoIVdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnBh cmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OlJ1bkphdmFTY3JpcHRQcm9tcHQod2ViRnJhbWUtPmZyYW1lSUQoKSwgU2VjdXJpdHlPcmlnaW5E YXRhOjpmcm9tRnJhbWUoZnJhbWUpLCBtZXNzYWdlLCBkZWZhdWx0VmFsdWUpLCBNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpSdW5KYXZhU2NyaXB0UHJvbXB0OjpSZXBseShyZXN1bHQpLCBtX3BhZ2Ut PnBhZ2VJRCgpLCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzOjptYXgoKSwgSVBDOjpJbmZvcm1Q bGF0Zm9ybVByb2Nlc3NXaWxsU3VzcGVuZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IHJldHVybiAhcmVzdWx0LmlzTnVsbCgpOwpAQCAtNjQ0LDExICs2MzAsNyBAQCB2b2lkIFdlYkNo cm9tZUNsaWVudDo6cHJpbnQoRnJhbWUqIGZyYW1lCiAgICAgfQogI2VuZGlmCiAKLSAgICB1bnNp Z25lZCBzeW5jU2VuZEZsYWdzID0gSVBDOjpJbmZvcm1QbGF0Zm9ybVByb2Nlc3NXaWxsU3VzcGVu ZDsKLSAgICBpZiAoV2ViUGFnZTo6c3luY2hyb25vdXNNZXNzYWdlc1Nob3VsZFNwaW5SdW5Mb29w KCkpCi0gICAgICAgIHN5bmNTZW5kRmxhZ3MgfD0gSVBDOjpTcGluUnVuTG9vcFdoaWxlV2FpdGlu Z0ZvclJlcGx5OwotICAgIAotICAgIG1fcGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6UHJpbnRGcmFtZSh3ZWJGcmFtZS0+ZnJhbWVJRCgpKSwgTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6UHJpbnRGcmFtZTo6UmVwbHkoKSwgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kczo6bWF4 KCksIHN5bmNTZW5kRmxhZ3MpOworICAgIG1fcGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6UHJpbnRGcmFtZSh3ZWJGcmFtZS0+ZnJhbWVJRCgpKSwgTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6UHJpbnRGcmFtZTo6UmVwbHkoKSwgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kczo6 bWF4KCksIElQQzo6SW5mb3JtUGxhdGZvcm1Qcm9jZXNzV2lsbFN1c3BlbmQpOwogfQogCiB2b2lk IFdlYkNocm9tZUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKEZyYW1lKiBmcmFtZSwgY29u c3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUsIERhdGFiYXNlRGV0YWlscyBkZXRhaWxzKQpAQCAtNjY2 LDEzICs2NDgsOSBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1CiAg ICAgbmV3UXVvdGEgPSBtX3BhZ2UtPmluamVjdGVkQnVuZGxlVUlDbGllbnQoKS5kaWRFeGNlZWRE YXRhYmFzZVF1b3RhKG1fcGFnZSwgc2VjdXJpdHlPcmlnaW4uZ2V0KCksIGRhdGFiYXNlTmFtZSwg ZGV0YWlscy5kaXNwbGF5TmFtZSgpLCBjdXJyZW50UXVvdGEsIGN1cnJlbnRPcmlnaW5Vc2FnZSwg ZGV0YWlscy5jdXJyZW50VXNhZ2UoKSwgZGV0YWlscy5leHBlY3RlZFVzYWdlKCkpOwogCiAgICAg aWYgKCFuZXdRdW90YSkgewotICAgICAgICB1bnNpZ25lZCBzeW5jU2VuZEZsYWdzID0gSVBDOjpJ bmZvcm1QbGF0Zm9ybVByb2Nlc3NXaWxsU3VzcGVuZDsKLSAgICAgICAgaWYgKFdlYlBhZ2U6OnN5 bmNocm9ub3VzTWVzc2FnZXNTaG91bGRTcGluUnVuTG9vcCgpKQotICAgICAgICAgICAgc3luY1Nl bmRGbGFncyB8PSBJUEM6OlNwaW5SdW5Mb29wV2hpbGVXYWl0aW5nRm9yUmVwbHk7Ci0gICAgICAg IAogICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlv bigpLT5zZW5kU3luYygKICAgICAgICAgICAgIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkV4Y2Vl ZGVkRGF0YWJhc2VRdW90YSh3ZWJGcmFtZS0+ZnJhbWVJRCgpLCBvcmlnaW4tPmRhdGFiYXNlSWRl bnRpZmllcigpLCBkYXRhYmFzZU5hbWUsIGRldGFpbHMuZGlzcGxheU5hbWUoKSwgY3VycmVudFF1 b3RhLCBjdXJyZW50T3JpZ2luVXNhZ2UsIGRldGFpbHMuY3VycmVudFVzYWdlKCksIGRldGFpbHMu ZXhwZWN0ZWRVc2FnZSgpKSwKLSAgICAgICAgICAgIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkV4 Y2VlZGVkRGF0YWJhc2VRdW90YTo6UmVwbHkobmV3UXVvdGEpLCBtX3BhZ2UtPnBhZ2VJRCgpLCBz dGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzOjptYXgoKSwgc3luY1NlbmRGbGFncyk7CisgICAgICAg ICAgICBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpFeGNlZWRlZERhdGFiYXNlUXVvdGE6OlJlcGx5 KG5ld1F1b3RhKSwgbV9wYWdlLT5wYWdlSUQoKSwgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kczo6 bWF4KCksIElQQzo6SW5mb3JtUGxhdGZvcm1Qcm9jZXNzV2lsbFN1c3BlbmQpOwogICAgIH0KIAog ICAgIGRiTWFuYWdlci5zZXRRdW90YShvcmlnaW4sIG5ld1F1b3RhKTsKQEAgLTY4OSwxMCArNjY3 LDYgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnJlYWNoZWRBcHBsaWNhdGlvbgogICAgIGlmICht X3BhZ2UtPmluamVjdGVkQnVuZGxlVUlDbGllbnQoKS5kaWRSZWFjaEFwcGxpY2F0aW9uQ2FjaGVP cmlnaW5RdW90YShtX3BhZ2UsIHNlY3VyaXR5T3JpZ2luLmdldCgpLCB0b3RhbEJ5dGVzTmVlZGVk KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgdW5zaWduZWQgc3luY1NlbmRGbGFncyA9IElQQzo6 SW5mb3JtUGxhdGZvcm1Qcm9jZXNzV2lsbFN1c3BlbmQ7Ci0gICAgaWYgKFdlYlBhZ2U6OnN5bmNo cm9ub3VzTWVzc2FnZXNTaG91bGRTcGluUnVuTG9vcCgpKQotICAgICAgICBzeW5jU2VuZEZsYWdz IHw9IElQQzo6U3BpblJ1bkxvb3BXaGlsZVdhaXRpbmdGb3JSZXBseTsKLQogICAgIGF1dG8mIGNh Y2hlU3RvcmFnZSA9IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKTsKICAgICBp bnQ2NF90IGN1cnJlbnRRdW90YSA9IDA7CiAgICAgaWYgKCFjYWNoZVN0b3JhZ2UuY2FsY3VsYXRl UXVvdGFGb3JPcmlnaW4ob3JpZ2luLCBjdXJyZW50UXVvdGEpKQpAQCAtNzAxLDcgKzY3NSw3IEBA IHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpyZWFjaGVkQXBwbGljYXRpb24KICAgICB1aW50NjRfdCBu ZXdRdW90YSA9IDA7CiAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkucGFyZW50UHJvY2Vzc0Nv bm5lY3Rpb24oKS0+c2VuZFN5bmMoCiAgICAgICAgIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJl YWNoZWRBcHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVvdGEob3JpZ2luLT5kYXRhYmFzZUlkZW50aWZp ZXIoKSwgY3VycmVudFF1b3RhLCB0b3RhbEJ5dGVzTmVlZGVkKSwKLSAgICAgICAgTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6UmVhY2hlZEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5RdW90YTo6UmVwbHko bmV3UXVvdGEpLCBtX3BhZ2UtPnBhZ2VJRCgpLCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzOjpt YXgoKSwgc3luY1NlbmRGbGFncyk7CisgICAgICAgIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJl YWNoZWRBcHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVvdGE6OlJlcGx5KG5ld1F1b3RhKSwgbV9wYWdl LT5wYWdlSUQoKSwgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kczo6bWF4KCksIElQQzo6SW5mb3Jt UGxhdGZvcm1Qcm9jZXNzV2lsbFN1c3BlbmQpOwogCiAgICAgY2FjaGVTdG9yYWdlLnN0b3JlVXBk YXRlZFF1b3RhRm9yT3JpZ2luKG9yaWdpbiwgbmV3UXVvdGEpOwogfQpJbmRleDogU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDE5NDMxOCkKKysrIFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02OTYsMTIgKzY5Niw4IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OmRpc3BhdGNoRGVjaWQKICAgICB1aW50NjRfdCBwb2xpY3lBY3Rpb247CiAgICAgRG93bmxv YWRJRCBkb3dubG9hZElEOwogCi0gICAgdW5zaWduZWQgc3luY1NlbmRGbGFncyA9IElQQzo6SW5m b3JtUGxhdGZvcm1Qcm9jZXNzV2lsbFN1c3BlbmQ7Ci0gICAgaWYgKFdlYlBhZ2U6OnN5bmNocm9u b3VzTWVzc2FnZXNTaG91bGRTcGluUnVuTG9vcCgpKQotICAgICAgICBzeW5jU2VuZEZsYWdzIHw9 IElQQzo6U3BpblJ1bkxvb3BXaGlsZVdhaXRpbmdGb3JSZXBseTsKLQogICAgIFdlYkNvcmU6OkZy YW1lKiBjb3JlRnJhbWUgPSBtX2ZyYW1lID8gbV9mcmFtZS0+Y29yZUZyYW1lKCkgOiBudWxscHRy OwotICAgIGlmICghd2ViUGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVj aWRlUG9saWN5Rm9yUmVzcG9uc2VTeW5jKG1fZnJhbWUtPmZyYW1lSUQoKSwgU2VjdXJpdHlPcmln aW5EYXRhOjpmcm9tRnJhbWUoY29yZUZyYW1lKSwgcmVzcG9uc2UsIHJlcXVlc3QsIGNhblNob3dN SU1FVHlwZSwgbGlzdGVuZXJJRCwgVXNlckRhdGEoV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkudHJh bnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5nZXQoKSkuZ2V0KCkpKSwgTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VTeW5jOjpSZXBseShyZWNlaXZl ZFBvbGljeUFjdGlvbiwgcG9saWN5QWN0aW9uLCBkb3dubG9hZElEKSwgc3RkOjpjaHJvbm86Om1p bGxpc2Vjb25kczo6bWF4KCksIHN5bmNTZW5kRmxhZ3MpKSB7CisgICAgaWYgKCF3ZWJQYWdlLT5z ZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNwb25zZVN5 bmMobV9mcmFtZS0+ZnJhbWVJRCgpLCBTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21GcmFtZShjb3Jl RnJhbWUpLCByZXNwb25zZSwgcmVxdWVzdCwgY2FuU2hvd01JTUVUeXBlLCBsaXN0ZW5lcklELCBV c2VyRGF0YShXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVz KHVzZXJEYXRhLmdldCgpKS5nZXQoKSkpLCBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQ b2xpY3lGb3JSZXNwb25zZVN5bmM6OlJlcGx5KHJlY2VpdmVkUG9saWN5QWN0aW9uLCBwb2xpY3lB Y3Rpb24sIGRvd25sb2FkSUQpLCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzOjptYXgoKSwgSVBD OjpJbmZvcm1QbGF0Zm9ybVByb2Nlc3NXaWxsU3VzcGVuZCkpIHsKICAgICAgICAgbV9mcmFtZS0+ ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGxpc3RlbmVySUQsIFBvbGljeUlnbm9yZSwgMCwgeyB9 KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDE5NDMxOCkKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTAwNywxMSArNTAwNyw2IEBAIFBhc3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IFdlYlBhZ2U6OnJh bmcKICAgICByZXR1cm4gVGV4dEl0ZXJhdG9yOjpyYW5nZUZyb21Mb2NhdGlvbkFuZExlbmd0aChm cmFtZS5zZWxlY3Rpb24oKS5yb290RWRpdGFibGVFbGVtZW50T3JEb2N1bWVudEVsZW1lbnQoKSwg c3RhdGljX2Nhc3Q8aW50PihyYW5nZS5sb2NhdGlvbiksIGxlbmd0aCk7CiB9CiAgICAgCi1ib29s IFdlYlBhZ2U6OnN5bmNocm9ub3VzTWVzc2FnZXNTaG91bGRTcGluUnVuTG9vcCgpCi17Ci0gICAg cmV0dXJuIGZhbHNlOwotfQotCiB2b2lkIFdlYlBhZ2U6OmRpZENoYW5nZVNjcm9sbE9mZnNldEZv ckZyYW1lKEZyYW1lKiBmcmFtZSkKIHsKICAgICBpZiAoIWZyYW1lLT5pc01haW5GcmFtZSgpKQpJ bmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZp c2lvbiAxOTQzMTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04ODEsMTAgKzg4MSw2IEBAIHB1YmxpYzoKIAogICAgIHZv aWQgZ2V0Qnl0ZWNvZGVQcm9maWxlKHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogICAgIAotICAgIC8v IFNvbWUgcGxhdGZvcm1zIHJlcXVpcmUgYWNjZXNzaWJpbGl0eS1lbmFibGVkIHByb2Nlc3NlcyB0 byBzcGluIHRoZSBydW4gbG9vcCBzbyB0aGF0IHRoZSBXZWJQcm9jZXNzIGRvZXNuJ3QgaGFuZy4K LSAgICAvLyBXaGlsZSB0aGlzIGlzIG5vdCBpZGVhbCwgaXQgZG9lcyBub3QgaGF2ZSB0byBiZSBh cHBsaWVkIHRvIGV2ZXJ5IHBsYXRmb3JtIGF0IHRoZSBtb21lbnQuCi0gICAgc3RhdGljIGJvb2wg c3luY2hyb25vdXNNZXNzYWdlc1Nob3VsZFNwaW5SdW5Mb29wKCk7Ci0KICNpZiBFTkFCTEUoU0VS VklDRV9DT05UUk9MUykgfHwgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKQogICAg IHZvaWQgaGFuZGxlVGVsZXBob25lTnVtYmVyQ2xpY2soY29uc3QgU3RyaW5nJiBudW1iZXIsIGNv bnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAgICAgdm9pZCBoYW5kbGVTZWxlY3Rpb25TZXJ2aWNl Q2xpY2soV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb24mLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgdGVs ZXBob25lTnVtYmVycywgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKTsK