168738 2017-02-22 13:14:58 -0800 Simple line layout: Set the pagination strut on the flow when the first line does not fit the page. 2017-02-22 14:39:33 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue esprehn+autocc glenn hyatt koivisto kondapallykalyan mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1280013 0 zalan 2017-02-22 13:14:58 -0800 This strut is tracked by the flow and by the rootbox. 1280014 1 webkit-bug-importer 2017-02-22 13:16:11 -0800 <rdar://problem/30659469> 1280020 2 302430 zalan 2017-02-22 13:27:04 -0800 Created attachment 302430 Patch 1280030 3 302434 zalan 2017-02-22 13:45:25 -0800 Created attachment 302434 Patch 1280055 4 302434 commit-queue 2017-02-22 14:39:28 -0800 Comment on attachment 302434 Patch Clearing flags on attachment: 302434 Committed r212854: <http://trac.webkit.org/changeset/212854> 1280056 5 commit-queue 2017-02-22 14:39:33 -0800 All reviewed patches have been landed. Closing bug. 302430 2017-02-22 13:27:04 -0800 2017-02-22 13:44:32 -0800 Patch bug-168738-20170222132417.patch text/plain 13120 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyODQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NmM2ZjMTMwYzM5ZTYw YjMzMzRjNDZhODI2MTI4OWQ4ZjdhNDk1MC4uZmE5MTFiODk4YjIyZmZiNzhlODYxZWVlY2Q1OTFm NmI2MDgzYTdhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDE3LTAyLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBTZXQgdGhlIHBhZ2luYXRpb24gc3RydXQgb24gdGhlIGZsb3cgd2hlbiB0aGUgZmlyc3QgbGlu ZSBkb2VzIG5vdCBmaXQgdGhlIHBhZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjg3MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNjU5NDY5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBw YWdpbmF0aW9uIHN0cnV0IGZvciB0aGUgZmlyc3QgbGluZSBpcyB0cmFja2VkIGJ5IHRoZSBwYXJl bnQgUmVuZGVyQmxvY2tGbG93IGFuZCBub3QgYnkKKyAgICAgICAgdGhlIGxpbmUgaXRzZWxmIChz ZWUgUmVuZGVyQmxvY2tGbG93OjphZGp1c3RMaW5lUG9zaXRpb25Gb3JQYWdpbmF0aW9uKCkpLiBB bHNvIHJlbmFtZWQgKlBhZ2luYXRpb25TdHJ1dCogdG8KKyAgICAgICAgKkxpbmVTdHJ1dCogdG8g bWFrZSBzdXJlIHdlIGRvbid0IGNvbmZ1c2UgaXQgd2l0aCB0aGUgYmxvY2sgbGV2ZWwgc3RydXQu CisKKyAgICAgICAgTm90IGVuYWJsZWQgeWV0LgorCisgICAgICAgICogcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y29t cHV0ZUxpbmVUb3BBbmRCb3R0b21XaXRoT3ZlcmZsb3cpOgorICAgICAgICAoV2ViQ29yZTo6U2lt cGxlTGluZUxheW91dDo6Y29tcHV0ZUxpbmVCcmVha0luZGV4KToKKyAgICAgICAgKFdlYkNvcmU6 OlNpbXBsZUxpbmVMYXlvdXQ6OnNldFBhZ2VCcmVha0ZvckxpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6U2ltcGxlTGluZUxheW91dDo6YWRqdXN0TGluZVBvc2l0aW9uc0ZvclBhZ2luYXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y3JlYXRlKToKKyAgICAgICAgKFdl YkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkxheW91dDo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNv cmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkxheW91dDo6TGF5b3V0KToKKyAgICAgICAgKiByZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dC5oOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91 dDo6TGF5b3V0OjpoYXNMaW5lU3RydXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVM YXlvdXQ6OkxheW91dDo6c3RydXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlv dXQ6OkxheW91dDo6aGFzUGFnaW5hdGlvblN0cnV0cyk6IERlbGV0ZWQuCisgICAgICAgICogcmVu ZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlTGluZUxheW91dDo6cGFpbnRGbG93KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxl TGluZUxheW91dEZ1bmN0aW9ucy5oOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91 dDo6Y29tcHV0ZUZsb3dIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5 b3V0UmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJl c29sdmVyOjpSdW46OmNvbXB1dGVCYXNlbGluZVBvc2l0aW9uKToKKworMjAxNy0wMi0yMiAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCiAgICAgICAgIFNpbXBsZSBsaW5lIGxheW91 dDogZW5zdXJlTGluZUJveGVzIGZvciBwYWdpbmF0ZWQgY29udGVudC4KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODcyOQogICAgICAgICA8cmRhcjov L3Byb2JsZW0vMzA2NTQ0MDA+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv U2ltcGxlTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dC5jcHAKaW5kZXggNGI4ZDlhN2QxMzRjNTVmNzZkZDllNjQyNjllMzQzOTAzNzg0NmFh ZC4uZjM5MGIzNzk4ZTIxNDYxZTdhMzQ1YWEyZGRhYmFmY2NkYWQyYjBjZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcApAQCAtOTE0LDcgKzkxNCw3 IEBAIHN0cnVjdCBQYWdpbmF0ZWRMaW5lIHsKIH07CiB1c2luZyBQYWdpbmF0ZWRMaW5lcyA9IFZl Y3RvcjxQYWdpbmF0ZWRMaW5lLCAyMD47CiAKLXN0YXRpYyBQYWdpbmF0ZWRMaW5lIGNvbXB1dGVM aW5lVG9wQW5kQm90dG9tV2l0aE92ZXJmbG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywg dW5zaWduZWQgbGluZUluZGV4LCBMYXlvdXQ6OlNpbXBsZVBhZ2luYXRpb25TdHJ1dHMmIHN0cnV0 cykKK3N0YXRpYyBQYWdpbmF0ZWRMaW5lIGNvbXB1dGVMaW5lVG9wQW5kQm90dG9tV2l0aE92ZXJm bG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgdW5zaWduZWQgbGluZUluZGV4LCBMYXlv dXQ6OlNpbXBsZUxpbmVTdHJ1dHMmIHN0cnV0cykKIHsKICAgICAvLyBGSVhNRTogQWRkIHZpc3Vh bE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMuCiAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBmbG93LnN0 eWxlKCkuZm9udENhc2NhZGUoKS5mb250TWV0cmljcygpOwpAQCAtOTM3LDcgKzkzNyw3IEBAIHN0 YXRpYyBQYWdpbmF0ZWRMaW5lIGNvbXB1dGVMaW5lVG9wQW5kQm90dG9tV2l0aE92ZXJmbG93KGNv bnN0IFJlbmRlckJsb2NrRmxvdyYKICAgICByZXR1cm4geyB0b3BQb3NpdGlvbiwgYm90dG9tUG9z aXRpb24sIGJvdHRvbVBvc2l0aW9uIC0gdG9wUG9zaXRpb24gfTsKIH0KIAotc3RhdGljIHVuc2ln bmVkIGNvbXB1dGVMaW5lQnJlYWtJbmRleCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwgdW5zaWdu ZWQgbGluZUNvdW50LCB1bnNpZ25lZCB3aWRvd3MsIGNvbnN0IExheW91dDo6U2ltcGxlUGFnaW5h dGlvblN0cnV0cyYgc3RydXRzKQorc3RhdGljIHVuc2lnbmVkIGNvbXB1dGVMaW5lQnJlYWtJbmRl eCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwgdW5zaWduZWQgbGluZUNvdW50LCB1bnNpZ25lZCB3 aWRvd3MsIGNvbnN0IExheW91dDo6U2ltcGxlTGluZVN0cnV0cyYgc3RydXRzKQogewogICAgIC8v IEZpcnN0IGxpbmUgZG9lcyBub3QgZml0IHRoZSBjdXJyZW50IHBhZ2UuCiAgICAgaWYgKCFicmVh a0NhbmRpZGF0ZSkKQEAgLTk1NiwxOSArOTU2LDYgQEAgc3RhdGljIHVuc2lnbmVkIGNvbXB1dGVM aW5lQnJlYWtJbmRleCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwgdW5zaWduZWQgbGluZUNvdW4K ICAgICByZXR1cm4gc3RkOjptYXg8dW5zaWduZWQ+KHN0cnV0cy5sYXN0KCkubGluZUJyZWFrICsg MSwgbGluZUJyZWFrKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0UGFnZUJyZWFrRm9yTGluZSh1bnNp Z25lZCBsaW5lQnJlYWssIFBhZ2luYXRlZExpbmVzJiBsaW5lcywgUmVuZGVyQmxvY2tGbG93JiBm bG93KQotewotICAgIGlmICghbGluZUJyZWFrKSB7Ci0gICAgICAgIC8vIFdoZW4gdGhlIGxpbmUg ZG9lcyBub3QgZml0IHRoZSBjdXJyZW50IHBhZ2UsIGp1c3QgYWRkIGEgcGFnZSBicmVhayBpbiBm cm9udC4KLSAgICAgICAgYXV0byBsaW5lID0gbGluZXMuZmlyc3QoKTsKLSAgICAgICAgZmxvdy5z ZXRQYWdlQnJlYWsobGluZS50b3AsIGZsb3cucGFnZVJlbWFpbmluZ0xvZ2ljYWxIZWlnaHRGb3JP ZmZzZXQobGluZS50b3AsIFJlbmRlckJsb2NrRmxvdzo6RXhjbHVkZVBhZ2VCb3VuZGFyeSkpOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIGF1dG8gYmVmb3JlTGluZUJyZWFrID0gbGluZXMu YXQobGluZUJyZWFrIC0gMSk7Ci0gICAgYXV0byBzcGFjZVNob3J0YWdlID0gZmxvdy5wYWdlUmVt YWluaW5nTG9naWNhbEhlaWdodEZvck9mZnNldChiZWZvcmVMaW5lQnJlYWsudG9wLCBSZW5kZXJC bG9ja0Zsb3c6OkV4Y2x1ZGVQYWdlQm91bmRhcnkpIC0gYmVmb3JlTGluZUJyZWFrLmhlaWdodDsK LSAgICBmbG93LnNldFBhZ2VCcmVhayhiZWZvcmVMaW5lQnJlYWsuYm90dG9tLCBzcGFjZVNob3J0 YWdlKTsKLX0KLQogc3RhdGljIExheW91dFVuaXQgY29tcHV0ZU9mZnNldEFmdGVyTGluZUJyZWFr KExheW91dFVuaXQgbGluZUJyZWFrUG9zaXRpb24sIGJvb2wgaXNGaXJzdExpbmUsIGJvb2wgYXRU aGVUb3BPZkNvbHVtbk9yUGFnZSwgY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93KQogewogICAg IC8vIE5vIG9mZnNldCBmb3IgdG9wIG9mIHRoZSBwYWdlIGxpbmVzIHVubGVzcyB3aWRvd3MgcHVz aGVkIHRoZSBsaW5lIGJyZWFrLgpAQCAtOTc4LDYgKzk2NSwyMyBAQCBzdGF0aWMgTGF5b3V0VW5p dCBjb21wdXRlT2Zmc2V0QWZ0ZXJMaW5lQnJlYWsoTGF5b3V0VW5pdCBsaW5lQnJlYWtQb3NpdGlv biwgYm9vbAogICAgIHJldHVybiBvZmZzZXQgKyBmbG93LnBhZ2VSZW1haW5pbmdMb2dpY2FsSGVp Z2h0Rm9yT2Zmc2V0KGxpbmVCcmVha1Bvc2l0aW9uLCBSZW5kZXJCbG9ja0Zsb3c6OkV4Y2x1ZGVQ YWdlQm91bmRhcnkpOwogfQogCitzdGF0aWMgdm9pZCBzZXRQYWdlQnJlYWtGb3JMaW5lKHVuc2ln bmVkIGxpbmVCcmVha0luZGV4LCBQYWdpbmF0ZWRMaW5lcyYgbGluZXMsIFJlbmRlckJsb2NrRmxv dyYgZmxvdywgTGF5b3V0OjpTaW1wbGVMaW5lU3RydXRzJiBzdHJ1dHMsCisgICAgYm9vbCBhdFRo ZVRvcE9mQ29sdW1uT3JQYWdlKQoreworICAgIGlmICghbGluZUJyZWFrSW5kZXgpIHsKKyAgICAg ICAgLy8gV2hlbiB0aGUgZmlyc3QgbGluZSBkb2VzIG5vdCBmaXQgdGhlIGN1cnJlbnQgcGFnZSwg anVzdCBhZGQgYSBwYWdlIGJyZWFrIGluIGZyb250IGFuZCBzZXQgdGhlIHN0cnV0IG9uIHRoZSBi bG9jay4KKyAgICAgICAgYXV0byBsaW5lID0gbGluZXMuZmlyc3QoKTsKKyAgICAgICAgYXV0byBy ZW1haW5pbmdMb2dpY2FsSGVpZ2h0ID0gZmxvdy5wYWdlUmVtYWluaW5nTG9naWNhbEhlaWdodEZv ck9mZnNldChsaW5lLnRvcCwgUmVuZGVyQmxvY2tGbG93OjpFeGNsdWRlUGFnZUJvdW5kYXJ5KTsK KyAgICAgICAgZmxvdy5zZXRQYWdlQnJlYWsobGluZS50b3AsIGxpbmUuaGVpZ2h0IC0gcmVtYWlu aW5nTG9naWNhbEhlaWdodCk7CisgICAgICAgIGZsb3cuc2V0UGFnaW5hdGlvblN0cnV0KHJlbWFp bmluZ0xvZ2ljYWxIZWlnaHQpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGF1dG8gYmVm b3JlTGluZUJyZWFrID0gbGluZXMuYXQobGluZUJyZWFrSW5kZXggLSAxKTsKKyAgICBhdXRvIHNw YWNlU2hvcnRhZ2UgPSBmbG93LnBhZ2VSZW1haW5pbmdMb2dpY2FsSGVpZ2h0Rm9yT2Zmc2V0KGJl Zm9yZUxpbmVCcmVhay50b3AsIFJlbmRlckJsb2NrRmxvdzo6RXhjbHVkZVBhZ2VCb3VuZGFyeSkg LSBiZWZvcmVMaW5lQnJlYWsuaGVpZ2h0OworICAgIGZsb3cuc2V0UGFnZUJyZWFrKGJlZm9yZUxp bmVCcmVhay5ib3R0b20sIHNwYWNlU2hvcnRhZ2UpOworICAgIHN0cnV0cy5hcHBlbmQoeyBsaW5l QnJlYWtJbmRleCwgY29tcHV0ZU9mZnNldEFmdGVyTGluZUJyZWFrKGxpbmVzW2xpbmVCcmVha0lu ZGV4XS50b3AsICFsaW5lQnJlYWtJbmRleCwgYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSwgZmxvdykg fSk7Cit9CisKIHN0YXRpYyB2b2lkIHVwZGF0ZU1pbmltdW1QYWdlSGVpZ2h0KFJlbmRlckJsb2Nr RmxvdyYgZmxvdywgdW5zaWduZWQgbGluZUNvdW50KQogewogICAgIGF1dG8mIHN0eWxlID0gZmxv dy5zdHlsZSgpOwpAQCAtOTg3LDcgKzk5MSw3IEBAIHN0YXRpYyB2b2lkIHVwZGF0ZU1pbmltdW1Q YWdlSGVpZ2h0KFJlbmRlckJsb2NrRmxvdyYgZmxvdywgdW5zaWduZWQgbGluZUNvdW50KQogICAg IGZsb3cudXBkYXRlTWluaW11bVBhZ2VIZWlnaHQoMCwgbWluaW11bUxpbmVDb3VudCAqIGxpbmVI ZWlnaHRGcm9tRmxvdyhmbG93KSk7CiB9CiAKLXN0YXRpYyB2b2lkIGFkanVzdExpbmVQb3NpdGlv bnNGb3JQYWdpbmF0aW9uKExheW91dDo6UnVuVmVjdG9yJiBydW5zLCBMYXlvdXQ6OlNpbXBsZVBh Z2luYXRpb25TdHJ1dHMmIHN0cnV0cywKK3N0YXRpYyB2b2lkIGFkanVzdExpbmVQb3NpdGlvbnNG b3JQYWdpbmF0aW9uKExheW91dDo6UnVuVmVjdG9yJiBydW5zLCBMYXlvdXQ6OlNpbXBsZUxpbmVT dHJ1dHMmIHN0cnV0cywKICAgICBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIHVuc2lnbmVkIGxpbmVD b3VudCkKIHsKICAgICB1cGRhdGVNaW5pbXVtUGFnZUhlaWdodChmbG93LCBsaW5lQ291bnQpOwpA QCAtMTAwOSw4ICsxMDEzLDcgQEAgc3RhdGljIHZvaWQgYWRqdXN0TGluZVBvc2l0aW9uc0ZvclBh Z2luYXRpb24oTGF5b3V0OjpSdW5WZWN0b3ImIHJ1bnMsIExheW91dDo6U2kKICAgICAgICAgICAg IGF1dG8gbGluZUJyZWFrSW5kZXggPSBjb21wdXRlTGluZUJyZWFrSW5kZXgobGluZUluZGV4LCBs aW5lQ291bnQsIHdpZG93cywgc3RydXRzKTsKICAgICAgICAgICAgIC8vIEFyZSB3ZSBzdGlsbCBh dCB0aGUgdG9wIG9mIHRoZSBjb2x1bW4vcGFnZT8KICAgICAgICAgICAgIGF0VGhlVG9wT2ZDb2x1 bW5PclBhZ2UgPSBhdFRoZVRvcE9mQ29sdW1uT3JQYWdlID8gbGluZUluZGV4ID09IGxpbmVCcmVh a0luZGV4IDogZmFsc2U7Ci0gICAgICAgICAgICBzZXRQYWdlQnJlYWtGb3JMaW5lKGxpbmVCcmVh a0luZGV4LCBsaW5lcywgZmxvdyk7Ci0gICAgICAgICAgICBzdHJ1dHMuYXBwZW5kKHsgbGluZUJy ZWFrSW5kZXgsIGNvbXB1dGVPZmZzZXRBZnRlckxpbmVCcmVhayhsaW5lc1tsaW5lQnJlYWtJbmRl eF0udG9wLCAhbGluZUJyZWFrSW5kZXgsIGF0VGhlVG9wT2ZDb2x1bW5PclBhZ2UsIGZsb3cpIH0p OworICAgICAgICAgICAgc2V0UGFnZUJyZWFrRm9yTGluZShsaW5lQnJlYWtJbmRleCwgbGluZXMs IGZsb3csIHN0cnV0cywgYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSk7CiAgICAgICAgICAgICAvLyBS ZWNvbXB1dGUgbGluZSBwb3NpdGlvbnMgdGhhdCB3ZSBhbHJlYWR5IHZpc2l0ZWQgYnV0IHdpbmRv dyBicmVhayBwdXNoZWQgdGhlbSB0byBhIG5ldyBwYWdlLgogICAgICAgICAgICAgZm9yIChhdXRv IGkgPSBsaW5lQnJlYWtJbmRleDsgaSA8IGxpbmVzLnNpemUoKTsgKytpKQogICAgICAgICAgICAg ICAgIGxpbmVzLmF0KGkpID0gY29tcHV0ZUxpbmVUb3BBbmRCb3R0b21XaXRoT3ZlcmZsb3coZmxv dywgaSwgc3RydXRzKTsKQEAgLTEwNDQsMjQgKzEwNDcsMjQgQEAgc3RkOjp1bmlxdWVfcHRyPExh eW91dD4gY3JlYXRlKFJlbmRlckJsb2NrRmxvdyYgZmxvdykKICAgICB1bnNpZ25lZCBsaW5lQ291 bnQgPSAwOwogICAgIExheW91dDo6UnVuVmVjdG9yIHJ1bnM7CiAgICAgY3JlYXRlVGV4dFJ1bnMo cnVucywgZmxvdywgbGluZUNvdW50KTsKLSAgICBMYXlvdXQ6OlNpbXBsZVBhZ2luYXRpb25TdHJ1 dHMgc3RydXRzOworICAgIExheW91dDo6U2ltcGxlTGluZVN0cnV0cyBzdHJ1dHM7CiAgICAgYXV0 byBpc1BhZ2luYXRlZCA9IGZsb3cudmlldygpLmxheW91dFN0YXRlKCkgJiYgZmxvdy52aWV3KCku bGF5b3V0U3RhdGUoKS0+aXNQYWdpbmF0ZWQoKTsKICAgICBpZiAoaXNQYWdpbmF0ZWQpCiAgICAg ICAgIGFkanVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0aW9uKHJ1bnMsIHN0cnV0cywgZmxvdywg bGluZUNvdW50KTsKICAgICByZXR1cm4gTGF5b3V0OjpjcmVhdGUocnVucywgc3RydXRzLCBsaW5l Q291bnQsIGlzUGFnaW5hdGVkKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPExheW91dD4gTGF5b3V0 OjpjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiBydW5WZWN0b3IsIFNpbXBsZVBhZ2luYXRpb25TdHJ1 dHMmIHN0cnV0cywgdW5zaWduZWQgbGluZUNvdW50LCBib29sIGlzUGFnaW5hdGVkKQorc3RkOjp1 bmlxdWVfcHRyPExheW91dD4gTGF5b3V0OjpjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiBydW5WZWN0 b3IsIFNpbXBsZUxpbmVTdHJ1dHMmIHN0cnV0cywgdW5zaWduZWQgbGluZUNvdW50LCBib29sIGlz UGFnaW5hdGVkKQogewogICAgIHZvaWQqIHNsb3QgPSBXVEY6OmZhc3RNYWxsb2Moc2l6ZW9mKExh eW91dCkgKyBzaXplb2YoUnVuKSAqIHJ1blZlY3Rvci5zaXplKCkpOwogICAgIHJldHVybiBzdGQ6 OnVuaXF1ZV9wdHI8TGF5b3V0PihuZXcgKE5vdE51bGwsIHNsb3QpIExheW91dChydW5WZWN0b3Is IHN0cnV0cywgbGluZUNvdW50LCBpc1BhZ2luYXRlZCkpOwogfQogCi1MYXlvdXQ6OkxheW91dChj b25zdCBSdW5WZWN0b3ImIHJ1blZlY3RvciwgU2ltcGxlUGFnaW5hdGlvblN0cnV0cyYgc3RydXRz LCB1bnNpZ25lZCBsaW5lQ291bnQsIGJvb2wgaXNQYWdpbmF0ZWQpCitMYXlvdXQ6OkxheW91dChj b25zdCBSdW5WZWN0b3ImIHJ1blZlY3RvciwgU2ltcGxlTGluZVN0cnV0cyYgc3RydXRzLCB1bnNp Z25lZCBsaW5lQ291bnQsIGJvb2wgaXNQYWdpbmF0ZWQpCiAgICAgOiBtX2xpbmVDb3VudChsaW5l Q291bnQpCiAgICAgLCBtX3J1bkNvdW50KHJ1blZlY3Rvci5zaXplKCkpCiAgICAgLCBtX2lzUGFn aW5hdGVkKGlzUGFnaW5hdGVkKQotICAgICwgbV9wYWdpbmF0aW9uU3RydXRzKFdURk1vdmUoc3Ry dXRzKSkKKyAgICAsIG1fbGluZVN0cnV0cyhXVEZNb3ZlKHN0cnV0cykpCiB7CiAgICAgbWVtY3B5 KG1fcnVucywgcnVuVmVjdG9yLmRhdGEoKSwgbV9ydW5Db3VudCAqIHNpemVvZihSdW4pKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5oCmluZGV4IDEzZTU5 NTY0MWE1NDdjODZlZWU2ZDJlYzcxNWI0MDNkMThmYTYzNzAuLjViZDQxMDI2NWE5YjA5MWE2ZWFm NjIzMzJkOGQwNmI2MjY3YjdmYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXQuaApAQCAtNjYsNyArNjYsNyBAQCBzdHJ1Y3QgUnVuIHsKICAgICBFeHBhbnNp b25CZWhhdmlvciBleHBhbnNpb25CZWhhdmlvciB7IEZvcmJpZExlYWRpbmdFeHBhbnNpb24gfCBG b3JiaWRUcmFpbGluZ0V4cGFuc2lvbiB9OwogfTsKIAotc3RydWN0IFNpbXBsZVBhZ2luYXRpb25T dHJ1dCB7CitzdHJ1Y3QgU2ltcGxlTGluZVN0cnV0IHsKICAgICB1bnNpZ25lZCBsaW5lQnJlYWs7 CiAgICAgZmxvYXQgb2Zmc2V0OwogfTsKQEAgLTc1LDggKzc1LDggQEAgY2xhc3MgTGF5b3V0IHsK ICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICB1c2luZyBSdW5WZWN0 b3IgPSBWZWN0b3I8UnVuLCAxMD47Ci0gICAgdXNpbmcgU2ltcGxlUGFnaW5hdGlvblN0cnV0cyA9 IFZlY3RvcjxTaW1wbGVQYWdpbmF0aW9uU3RydXQsIDQ+OwotICAgIHN0YXRpYyBzdGQ6OnVuaXF1 ZV9wdHI8TGF5b3V0PiBjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiwgU2ltcGxlUGFnaW5hdGlvblN0 cnV0cyYsIHVuc2lnbmVkIGxpbmVDb3VudCwgYm9vbCBpc1BhZ2luYXRlZCk7CisgICAgdXNpbmcg U2ltcGxlTGluZVN0cnV0cyA9IFZlY3RvcjxTaW1wbGVMaW5lU3RydXQsIDQ+OworICAgIHN0YXRp YyBzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0PiBjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiwgU2ltcGxl TGluZVN0cnV0cyYsIHVuc2lnbmVkIGxpbmVDb3VudCwgYm9vbCBpc1BhZ2luYXRlZCk7CiAKICAg ICB1bnNpZ25lZCBsaW5lQ291bnQoKSBjb25zdCB7IHJldHVybiBtX2xpbmVDb3VudDsgfQogCkBA IC04NCwxNSArODQsMTUgQEAgcHVibGljOgogICAgIGNvbnN0IFJ1biYgcnVuQXQodW5zaWduZWQg aSkgY29uc3QgeyByZXR1cm4gbV9ydW5zW2ldOyB9CiAKICAgICBib29sIGlzUGFnaW5hdGVkKCkg Y29uc3QgeyByZXR1cm4gbV9pc1BhZ2luYXRlZDsgfQotICAgIGJvb2wgaGFzUGFnaW5hdGlvblN0 cnV0cygpIGNvbnN0IHsgcmV0dXJuICFtX3BhZ2luYXRpb25TdHJ1dHMuaXNFbXB0eSgpOyB9Ci0g ICAgY29uc3QgU2ltcGxlUGFnaW5hdGlvblN0cnV0cyYgc3RydXRzKCkgY29uc3QgeyByZXR1cm4g bV9wYWdpbmF0aW9uU3RydXRzOyB9CisgICAgYm9vbCBoYXNMaW5lU3RydXRzKCkgY29uc3QgeyBy ZXR1cm4gIW1fbGluZVN0cnV0cy5pc0VtcHR5KCk7IH0KKyAgICBjb25zdCBTaW1wbGVMaW5lU3Ry dXRzJiBzdHJ1dHMoKSBjb25zdCB7IHJldHVybiBtX2xpbmVTdHJ1dHM7IH0KIHByaXZhdGU6Ci0g ICAgTGF5b3V0KGNvbnN0IFJ1blZlY3RvciYsIFNpbXBsZVBhZ2luYXRpb25TdHJ1dHMmLCB1bnNp Z25lZCBsaW5lQ291bnQsIGJvb2wgaXNQYWdpbmF0ZWQpOworICAgIExheW91dChjb25zdCBSdW5W ZWN0b3ImLCBTaW1wbGVMaW5lU3RydXRzJiwgdW5zaWduZWQgbGluZUNvdW50LCBib29sIGlzUGFn aW5hdGVkKTsKIAogICAgIHVuc2lnbmVkIG1fbGluZUNvdW50OwogICAgIHVuc2lnbmVkIG1fcnVu Q291bnQ7CiAgICAgYm9vbCBtX2lzUGFnaW5hdGVkOwotICAgIFNpbXBsZVBhZ2luYXRpb25TdHJ1 dHMgbV9wYWdpbmF0aW9uU3RydXRzOworICAgIFNpbXBsZUxpbmVTdHJ1dHMgbV9saW5lU3RydXRz OwogICAgIFJ1biBtX3J1bnNbMF07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHAKaW5kZXggNWQwYWUzN2U2YjAw ZDU0MWNmNTAzMGIzNzljOGM3MzYwNTQ2MTMxOS4uNjBlYmMxMTA5ZDE5M2VmZjIzYjVjMmRjNjA3 ZjhjZjc3MzgxZWFiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXRGdW5jdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmNwcApAQCAtODgsNyArODgsNyBAQCB2b2lkIHBhaW50 Rmxvdyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIGNvbnN0IExheW91dCYgbGF5b3V0LCBQ YWludEluZm8mIHBhaQogICAgIGlmIChzdHlsZS52aXNpYmlsaXR5KCkgIT0gVklTSUJMRSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgYm9vbCBkZWJ1Z0JvcmRlcnNFbmFibGVkID0gZmxvdy5zZXR0 aW5ncygpLnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkKCk7CisgICAgYm9vbCBk ZWJ1Z0JvcmRlcnNFbmFibGVkID0gdHJ1ZSB8IGZsb3cuc2V0dGluZ3MoKS5zaW1wbGVMaW5lTGF5 b3V0RGVidWdCb3JkZXJzRW5hYmxlZCgpOwogCiAgICAgVGV4dFBhaW50ZXIgdGV4dFBhaW50ZXIo cGFpbnRJbmZvLmNvbnRleHQoKSk7CiAgICAgdGV4dFBhaW50ZXIuc2V0Rm9udChzdHlsZS5mb250 Q2FzY2FkZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVM aW5lTGF5b3V0RnVuY3Rpb25zLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dEZ1bmN0aW9ucy5oCmluZGV4IDdiMzA4MzljYTIxNjRjYTM3ZDgxZDYyMjQ5OWFhNzgw MzYzMmIyOWMuLmNlNjVhMjlhZTMxZmM4NzI2NTA3Yzg2NTMyYzQ5YTJjNjA0MWQyZWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25z LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlv bnMuaApAQCAtNzQsNyArNzQsNyBAQCBuYW1lc3BhY2UgU2ltcGxlTGluZUxheW91dCB7CiBpbmxp bmUgTGF5b3V0VW5pdCBjb21wdXRlRmxvd0hlaWdodChjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZs b3csIGNvbnN0IExheW91dCYgbGF5b3V0KQogewogICAgIGF1dG8gZmxvd0hlaWdodCA9IGxpbmVI ZWlnaHRGcm9tRmxvdyhmbG93KSAqIGxheW91dC5saW5lQ291bnQoKTsKLSAgICBpZiAoIWxheW91 dC5oYXNQYWdpbmF0aW9uU3RydXRzKCkpCisgICAgaWYgKCFsYXlvdXQuaGFzTGluZVN0cnV0cygp KQogICAgICAgICByZXR1cm4gZmxvd0hlaWdodDsKICAgICBmb3IgKGF1dG8mIHN0cnV0RW50cnkg OiBsYXlvdXQuc3RydXRzKCkpCiAgICAgICAgIGZsb3dIZWlnaHQgKz0gc3RydXRFbnRyeS5vZmZz ZXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91 dFJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJl c29sdmVyLmgKaW5kZXggY2UyNDJjYjk5NjcwOTAyM2M1ZTI4ZjZkNTEwNzNhMDExNzdkNjk2Ni4u NDcyYTFkMmM4OGE1Y2M5NTMwZWExY2JjZDg0ZDM2N2E4ZjQ2ZWY0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaApAQCAtMjIx LDcgKzIyMSw3IEBAIGlubGluZSBmbG9hdCBSdW5SZXNvbHZlcjo6UnVuOjpjb21wdXRlQmFzZWxp bmVQb3NpdGlvbigpIGNvbnN0CiB7CiAgICAgYXV0byYgcmVzb2x2ZXIgPSBtX2l0ZXJhdG9yLnJl c29sdmVyKCk7CiAgICAgYXV0byBvZmZzZXQgPSByZXNvbHZlci5tX2JvcmRlckFuZFBhZGRpbmdC ZWZvcmUgKyByZXNvbHZlci5tX2xpbmVIZWlnaHQgKiBsaW5lSW5kZXgoKTsKLSAgICBpZiAoIXJl c29sdmVyLm1fbGF5b3V0Lmhhc1BhZ2luYXRpb25TdHJ1dHMoKSkKKyAgICBpZiAoIXJlc29sdmVy Lm1fbGF5b3V0Lmhhc0xpbmVTdHJ1dHMoKSkKICAgICAgICAgcmV0dXJuIG9mZnNldCArIHJlc29s dmVyLm1fYmFzZWxpbmU7CiAgICAgZm9yIChhdXRvJiBzdHJ1dEVudHJ5IDogcmVzb2x2ZXIubV9s YXlvdXQuc3RydXRzKCkpIHsKICAgICAgICAgaWYgKHN0cnV0RW50cnkubGluZUJyZWFrID4gbGlu ZUluZGV4KCkpCg== 302434 2017-02-22 13:45:25 -0800 2017-02-22 14:39:28 -0800 Patch bug-168738-20170222134238.patch text/plain 12338 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyODQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NmM2ZjMTMwYzM5ZTYw YjMzMzRjNDZhODI2MTI4OWQ4ZjdhNDk1MC4uZmE5MTFiODk4YjIyZmZiNzhlODYxZWVlY2Q1OTFm NmI2MDgzYTdhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDE3LTAyLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBTZXQgdGhlIHBhZ2luYXRpb24gc3RydXQgb24gdGhlIGZsb3cgd2hlbiB0aGUgZmlyc3QgbGlu ZSBkb2VzIG5vdCBmaXQgdGhlIHBhZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjg3MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNjU5NDY5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBw YWdpbmF0aW9uIHN0cnV0IGZvciB0aGUgZmlyc3QgbGluZSBpcyB0cmFja2VkIGJ5IHRoZSBwYXJl bnQgUmVuZGVyQmxvY2tGbG93IGFuZCBub3QgYnkKKyAgICAgICAgdGhlIGxpbmUgaXRzZWxmIChz ZWUgUmVuZGVyQmxvY2tGbG93OjphZGp1c3RMaW5lUG9zaXRpb25Gb3JQYWdpbmF0aW9uKCkpLiBB bHNvIHJlbmFtZWQgKlBhZ2luYXRpb25TdHJ1dCogdG8KKyAgICAgICAgKkxpbmVTdHJ1dCogdG8g bWFrZSBzdXJlIHdlIGRvbid0IGNvbmZ1c2UgaXQgd2l0aCB0aGUgYmxvY2sgbGV2ZWwgc3RydXQu CisKKyAgICAgICAgTm90IGVuYWJsZWQgeWV0LgorCisgICAgICAgICogcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y29t cHV0ZUxpbmVUb3BBbmRCb3R0b21XaXRoT3ZlcmZsb3cpOgorICAgICAgICAoV2ViQ29yZTo6U2lt cGxlTGluZUxheW91dDo6Y29tcHV0ZUxpbmVCcmVha0luZGV4KToKKyAgICAgICAgKFdlYkNvcmU6 OlNpbXBsZUxpbmVMYXlvdXQ6OnNldFBhZ2VCcmVha0ZvckxpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6U2ltcGxlTGluZUxheW91dDo6YWRqdXN0TGluZVBvc2l0aW9uc0ZvclBhZ2luYXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y3JlYXRlKToKKyAgICAgICAgKFdl YkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkxheW91dDo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNv cmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkxheW91dDo6TGF5b3V0KToKKyAgICAgICAgKiByZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dC5oOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91 dDo6TGF5b3V0OjpoYXNMaW5lU3RydXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVM YXlvdXQ6OkxheW91dDo6c3RydXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlv dXQ6OkxheW91dDo6aGFzUGFnaW5hdGlvblN0cnV0cyk6IERlbGV0ZWQuCisgICAgICAgICogcmVu ZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlTGluZUxheW91dDo6cGFpbnRGbG93KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxl TGluZUxheW91dEZ1bmN0aW9ucy5oOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91 dDo6Y29tcHV0ZUZsb3dIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5 b3V0UmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJl c29sdmVyOjpSdW46OmNvbXB1dGVCYXNlbGluZVBvc2l0aW9uKToKKworMjAxNy0wMi0yMiAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCiAgICAgICAgIFNpbXBsZSBsaW5lIGxheW91 dDogZW5zdXJlTGluZUJveGVzIGZvciBwYWdpbmF0ZWQgY29udGVudC4KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODcyOQogICAgICAgICA8cmRhcjov L3Byb2JsZW0vMzA2NTQ0MDA+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv U2ltcGxlTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dC5jcHAKaW5kZXggNGI4ZDlhN2QxMzRjNTVmNzZkZDllNjQyNjllMzQzOTAzNzg0NmFh ZC4uZjM5MGIzNzk4ZTIxNDYxZTdhMzQ1YWEyZGRhYmFmY2NkYWQyYjBjZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcApAQCAtOTE0LDcgKzkxNCw3 IEBAIHN0cnVjdCBQYWdpbmF0ZWRMaW5lIHsKIH07CiB1c2luZyBQYWdpbmF0ZWRMaW5lcyA9IFZl Y3RvcjxQYWdpbmF0ZWRMaW5lLCAyMD47CiAKLXN0YXRpYyBQYWdpbmF0ZWRMaW5lIGNvbXB1dGVM aW5lVG9wQW5kQm90dG9tV2l0aE92ZXJmbG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywg dW5zaWduZWQgbGluZUluZGV4LCBMYXlvdXQ6OlNpbXBsZVBhZ2luYXRpb25TdHJ1dHMmIHN0cnV0 cykKK3N0YXRpYyBQYWdpbmF0ZWRMaW5lIGNvbXB1dGVMaW5lVG9wQW5kQm90dG9tV2l0aE92ZXJm bG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgdW5zaWduZWQgbGluZUluZGV4LCBMYXlv dXQ6OlNpbXBsZUxpbmVTdHJ1dHMmIHN0cnV0cykKIHsKICAgICAvLyBGSVhNRTogQWRkIHZpc3Vh bE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMuCiAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBmbG93LnN0 eWxlKCkuZm9udENhc2NhZGUoKS5mb250TWV0cmljcygpOwpAQCAtOTM3LDcgKzkzNyw3IEBAIHN0 YXRpYyBQYWdpbmF0ZWRMaW5lIGNvbXB1dGVMaW5lVG9wQW5kQm90dG9tV2l0aE92ZXJmbG93KGNv bnN0IFJlbmRlckJsb2NrRmxvdyYKICAgICByZXR1cm4geyB0b3BQb3NpdGlvbiwgYm90dG9tUG9z aXRpb24sIGJvdHRvbVBvc2l0aW9uIC0gdG9wUG9zaXRpb24gfTsKIH0KIAotc3RhdGljIHVuc2ln bmVkIGNvbXB1dGVMaW5lQnJlYWtJbmRleCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwgdW5zaWdu ZWQgbGluZUNvdW50LCB1bnNpZ25lZCB3aWRvd3MsIGNvbnN0IExheW91dDo6U2ltcGxlUGFnaW5h dGlvblN0cnV0cyYgc3RydXRzKQorc3RhdGljIHVuc2lnbmVkIGNvbXB1dGVMaW5lQnJlYWtJbmRl eCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwgdW5zaWduZWQgbGluZUNvdW50LCB1bnNpZ25lZCB3 aWRvd3MsIGNvbnN0IExheW91dDo6U2ltcGxlTGluZVN0cnV0cyYgc3RydXRzKQogewogICAgIC8v IEZpcnN0IGxpbmUgZG9lcyBub3QgZml0IHRoZSBjdXJyZW50IHBhZ2UuCiAgICAgaWYgKCFicmVh a0NhbmRpZGF0ZSkKQEAgLTk1NiwxOSArOTU2LDYgQEAgc3RhdGljIHVuc2lnbmVkIGNvbXB1dGVM aW5lQnJlYWtJbmRleCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwgdW5zaWduZWQgbGluZUNvdW4K ICAgICByZXR1cm4gc3RkOjptYXg8dW5zaWduZWQ+KHN0cnV0cy5sYXN0KCkubGluZUJyZWFrICsg MSwgbGluZUJyZWFrKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0UGFnZUJyZWFrRm9yTGluZSh1bnNp Z25lZCBsaW5lQnJlYWssIFBhZ2luYXRlZExpbmVzJiBsaW5lcywgUmVuZGVyQmxvY2tGbG93JiBm bG93KQotewotICAgIGlmICghbGluZUJyZWFrKSB7Ci0gICAgICAgIC8vIFdoZW4gdGhlIGxpbmUg ZG9lcyBub3QgZml0IHRoZSBjdXJyZW50IHBhZ2UsIGp1c3QgYWRkIGEgcGFnZSBicmVhayBpbiBm cm9udC4KLSAgICAgICAgYXV0byBsaW5lID0gbGluZXMuZmlyc3QoKTsKLSAgICAgICAgZmxvdy5z ZXRQYWdlQnJlYWsobGluZS50b3AsIGZsb3cucGFnZVJlbWFpbmluZ0xvZ2ljYWxIZWlnaHRGb3JP ZmZzZXQobGluZS50b3AsIFJlbmRlckJsb2NrRmxvdzo6RXhjbHVkZVBhZ2VCb3VuZGFyeSkpOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIGF1dG8gYmVmb3JlTGluZUJyZWFrID0gbGluZXMu YXQobGluZUJyZWFrIC0gMSk7Ci0gICAgYXV0byBzcGFjZVNob3J0YWdlID0gZmxvdy5wYWdlUmVt YWluaW5nTG9naWNhbEhlaWdodEZvck9mZnNldChiZWZvcmVMaW5lQnJlYWsudG9wLCBSZW5kZXJC bG9ja0Zsb3c6OkV4Y2x1ZGVQYWdlQm91bmRhcnkpIC0gYmVmb3JlTGluZUJyZWFrLmhlaWdodDsK LSAgICBmbG93LnNldFBhZ2VCcmVhayhiZWZvcmVMaW5lQnJlYWsuYm90dG9tLCBzcGFjZVNob3J0 YWdlKTsKLX0KLQogc3RhdGljIExheW91dFVuaXQgY29tcHV0ZU9mZnNldEFmdGVyTGluZUJyZWFr KExheW91dFVuaXQgbGluZUJyZWFrUG9zaXRpb24sIGJvb2wgaXNGaXJzdExpbmUsIGJvb2wgYXRU aGVUb3BPZkNvbHVtbk9yUGFnZSwgY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93KQogewogICAg IC8vIE5vIG9mZnNldCBmb3IgdG9wIG9mIHRoZSBwYWdlIGxpbmVzIHVubGVzcyB3aWRvd3MgcHVz aGVkIHRoZSBsaW5lIGJyZWFrLgpAQCAtOTc4LDYgKzk2NSwyMyBAQCBzdGF0aWMgTGF5b3V0VW5p dCBjb21wdXRlT2Zmc2V0QWZ0ZXJMaW5lQnJlYWsoTGF5b3V0VW5pdCBsaW5lQnJlYWtQb3NpdGlv biwgYm9vbAogICAgIHJldHVybiBvZmZzZXQgKyBmbG93LnBhZ2VSZW1haW5pbmdMb2dpY2FsSGVp Z2h0Rm9yT2Zmc2V0KGxpbmVCcmVha1Bvc2l0aW9uLCBSZW5kZXJCbG9ja0Zsb3c6OkV4Y2x1ZGVQ YWdlQm91bmRhcnkpOwogfQogCitzdGF0aWMgdm9pZCBzZXRQYWdlQnJlYWtGb3JMaW5lKHVuc2ln bmVkIGxpbmVCcmVha0luZGV4LCBQYWdpbmF0ZWRMaW5lcyYgbGluZXMsIFJlbmRlckJsb2NrRmxv dyYgZmxvdywgTGF5b3V0OjpTaW1wbGVMaW5lU3RydXRzJiBzdHJ1dHMsCisgICAgYm9vbCBhdFRo ZVRvcE9mQ29sdW1uT3JQYWdlKQoreworICAgIGlmICghbGluZUJyZWFrSW5kZXgpIHsKKyAgICAg ICAgLy8gV2hlbiB0aGUgZmlyc3QgbGluZSBkb2VzIG5vdCBmaXQgdGhlIGN1cnJlbnQgcGFnZSwg anVzdCBhZGQgYSBwYWdlIGJyZWFrIGluIGZyb250IGFuZCBzZXQgdGhlIHN0cnV0IG9uIHRoZSBi bG9jay4KKyAgICAgICAgYXV0byBsaW5lID0gbGluZXMuZmlyc3QoKTsKKyAgICAgICAgYXV0byBy ZW1haW5pbmdMb2dpY2FsSGVpZ2h0ID0gZmxvdy5wYWdlUmVtYWluaW5nTG9naWNhbEhlaWdodEZv ck9mZnNldChsaW5lLnRvcCwgUmVuZGVyQmxvY2tGbG93OjpFeGNsdWRlUGFnZUJvdW5kYXJ5KTsK KyAgICAgICAgZmxvdy5zZXRQYWdlQnJlYWsobGluZS50b3AsIGxpbmUuaGVpZ2h0IC0gcmVtYWlu aW5nTG9naWNhbEhlaWdodCk7CisgICAgICAgIGZsb3cuc2V0UGFnaW5hdGlvblN0cnV0KHJlbWFp bmluZ0xvZ2ljYWxIZWlnaHQpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGF1dG8gYmVm b3JlTGluZUJyZWFrID0gbGluZXMuYXQobGluZUJyZWFrSW5kZXggLSAxKTsKKyAgICBhdXRvIHNw YWNlU2hvcnRhZ2UgPSBmbG93LnBhZ2VSZW1haW5pbmdMb2dpY2FsSGVpZ2h0Rm9yT2Zmc2V0KGJl Zm9yZUxpbmVCcmVhay50b3AsIFJlbmRlckJsb2NrRmxvdzo6RXhjbHVkZVBhZ2VCb3VuZGFyeSkg LSBiZWZvcmVMaW5lQnJlYWsuaGVpZ2h0OworICAgIGZsb3cuc2V0UGFnZUJyZWFrKGJlZm9yZUxp bmVCcmVhay5ib3R0b20sIHNwYWNlU2hvcnRhZ2UpOworICAgIHN0cnV0cy5hcHBlbmQoeyBsaW5l QnJlYWtJbmRleCwgY29tcHV0ZU9mZnNldEFmdGVyTGluZUJyZWFrKGxpbmVzW2xpbmVCcmVha0lu ZGV4XS50b3AsICFsaW5lQnJlYWtJbmRleCwgYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSwgZmxvdykg fSk7Cit9CisKIHN0YXRpYyB2b2lkIHVwZGF0ZU1pbmltdW1QYWdlSGVpZ2h0KFJlbmRlckJsb2Nr RmxvdyYgZmxvdywgdW5zaWduZWQgbGluZUNvdW50KQogewogICAgIGF1dG8mIHN0eWxlID0gZmxv dy5zdHlsZSgpOwpAQCAtOTg3LDcgKzk5MSw3IEBAIHN0YXRpYyB2b2lkIHVwZGF0ZU1pbmltdW1Q YWdlSGVpZ2h0KFJlbmRlckJsb2NrRmxvdyYgZmxvdywgdW5zaWduZWQgbGluZUNvdW50KQogICAg IGZsb3cudXBkYXRlTWluaW11bVBhZ2VIZWlnaHQoMCwgbWluaW11bUxpbmVDb3VudCAqIGxpbmVI ZWlnaHRGcm9tRmxvdyhmbG93KSk7CiB9CiAKLXN0YXRpYyB2b2lkIGFkanVzdExpbmVQb3NpdGlv bnNGb3JQYWdpbmF0aW9uKExheW91dDo6UnVuVmVjdG9yJiBydW5zLCBMYXlvdXQ6OlNpbXBsZVBh Z2luYXRpb25TdHJ1dHMmIHN0cnV0cywKK3N0YXRpYyB2b2lkIGFkanVzdExpbmVQb3NpdGlvbnNG b3JQYWdpbmF0aW9uKExheW91dDo6UnVuVmVjdG9yJiBydW5zLCBMYXlvdXQ6OlNpbXBsZUxpbmVT dHJ1dHMmIHN0cnV0cywKICAgICBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIHVuc2lnbmVkIGxpbmVD b3VudCkKIHsKICAgICB1cGRhdGVNaW5pbXVtUGFnZUhlaWdodChmbG93LCBsaW5lQ291bnQpOwpA QCAtMTAwOSw4ICsxMDEzLDcgQEAgc3RhdGljIHZvaWQgYWRqdXN0TGluZVBvc2l0aW9uc0ZvclBh Z2luYXRpb24oTGF5b3V0OjpSdW5WZWN0b3ImIHJ1bnMsIExheW91dDo6U2kKICAgICAgICAgICAg IGF1dG8gbGluZUJyZWFrSW5kZXggPSBjb21wdXRlTGluZUJyZWFrSW5kZXgobGluZUluZGV4LCBs aW5lQ291bnQsIHdpZG93cywgc3RydXRzKTsKICAgICAgICAgICAgIC8vIEFyZSB3ZSBzdGlsbCBh dCB0aGUgdG9wIG9mIHRoZSBjb2x1bW4vcGFnZT8KICAgICAgICAgICAgIGF0VGhlVG9wT2ZDb2x1 bW5PclBhZ2UgPSBhdFRoZVRvcE9mQ29sdW1uT3JQYWdlID8gbGluZUluZGV4ID09IGxpbmVCcmVh a0luZGV4IDogZmFsc2U7Ci0gICAgICAgICAgICBzZXRQYWdlQnJlYWtGb3JMaW5lKGxpbmVCcmVh a0luZGV4LCBsaW5lcywgZmxvdyk7Ci0gICAgICAgICAgICBzdHJ1dHMuYXBwZW5kKHsgbGluZUJy ZWFrSW5kZXgsIGNvbXB1dGVPZmZzZXRBZnRlckxpbmVCcmVhayhsaW5lc1tsaW5lQnJlYWtJbmRl eF0udG9wLCAhbGluZUJyZWFrSW5kZXgsIGF0VGhlVG9wT2ZDb2x1bW5PclBhZ2UsIGZsb3cpIH0p OworICAgICAgICAgICAgc2V0UGFnZUJyZWFrRm9yTGluZShsaW5lQnJlYWtJbmRleCwgbGluZXMs IGZsb3csIHN0cnV0cywgYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSk7CiAgICAgICAgICAgICAvLyBS ZWNvbXB1dGUgbGluZSBwb3NpdGlvbnMgdGhhdCB3ZSBhbHJlYWR5IHZpc2l0ZWQgYnV0IHdpbmRv dyBicmVhayBwdXNoZWQgdGhlbSB0byBhIG5ldyBwYWdlLgogICAgICAgICAgICAgZm9yIChhdXRv IGkgPSBsaW5lQnJlYWtJbmRleDsgaSA8IGxpbmVzLnNpemUoKTsgKytpKQogICAgICAgICAgICAg ICAgIGxpbmVzLmF0KGkpID0gY29tcHV0ZUxpbmVUb3BBbmRCb3R0b21XaXRoT3ZlcmZsb3coZmxv dywgaSwgc3RydXRzKTsKQEAgLTEwNDQsMjQgKzEwNDcsMjQgQEAgc3RkOjp1bmlxdWVfcHRyPExh eW91dD4gY3JlYXRlKFJlbmRlckJsb2NrRmxvdyYgZmxvdykKICAgICB1bnNpZ25lZCBsaW5lQ291 bnQgPSAwOwogICAgIExheW91dDo6UnVuVmVjdG9yIHJ1bnM7CiAgICAgY3JlYXRlVGV4dFJ1bnMo cnVucywgZmxvdywgbGluZUNvdW50KTsKLSAgICBMYXlvdXQ6OlNpbXBsZVBhZ2luYXRpb25TdHJ1 dHMgc3RydXRzOworICAgIExheW91dDo6U2ltcGxlTGluZVN0cnV0cyBzdHJ1dHM7CiAgICAgYXV0 byBpc1BhZ2luYXRlZCA9IGZsb3cudmlldygpLmxheW91dFN0YXRlKCkgJiYgZmxvdy52aWV3KCku bGF5b3V0U3RhdGUoKS0+aXNQYWdpbmF0ZWQoKTsKICAgICBpZiAoaXNQYWdpbmF0ZWQpCiAgICAg ICAgIGFkanVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0aW9uKHJ1bnMsIHN0cnV0cywgZmxvdywg bGluZUNvdW50KTsKICAgICByZXR1cm4gTGF5b3V0OjpjcmVhdGUocnVucywgc3RydXRzLCBsaW5l Q291bnQsIGlzUGFnaW5hdGVkKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPExheW91dD4gTGF5b3V0 OjpjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiBydW5WZWN0b3IsIFNpbXBsZVBhZ2luYXRpb25TdHJ1 dHMmIHN0cnV0cywgdW5zaWduZWQgbGluZUNvdW50LCBib29sIGlzUGFnaW5hdGVkKQorc3RkOjp1 bmlxdWVfcHRyPExheW91dD4gTGF5b3V0OjpjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiBydW5WZWN0 b3IsIFNpbXBsZUxpbmVTdHJ1dHMmIHN0cnV0cywgdW5zaWduZWQgbGluZUNvdW50LCBib29sIGlz UGFnaW5hdGVkKQogewogICAgIHZvaWQqIHNsb3QgPSBXVEY6OmZhc3RNYWxsb2Moc2l6ZW9mKExh eW91dCkgKyBzaXplb2YoUnVuKSAqIHJ1blZlY3Rvci5zaXplKCkpOwogICAgIHJldHVybiBzdGQ6 OnVuaXF1ZV9wdHI8TGF5b3V0PihuZXcgKE5vdE51bGwsIHNsb3QpIExheW91dChydW5WZWN0b3Is IHN0cnV0cywgbGluZUNvdW50LCBpc1BhZ2luYXRlZCkpOwogfQogCi1MYXlvdXQ6OkxheW91dChj b25zdCBSdW5WZWN0b3ImIHJ1blZlY3RvciwgU2ltcGxlUGFnaW5hdGlvblN0cnV0cyYgc3RydXRz LCB1bnNpZ25lZCBsaW5lQ291bnQsIGJvb2wgaXNQYWdpbmF0ZWQpCitMYXlvdXQ6OkxheW91dChj b25zdCBSdW5WZWN0b3ImIHJ1blZlY3RvciwgU2ltcGxlTGluZVN0cnV0cyYgc3RydXRzLCB1bnNp Z25lZCBsaW5lQ291bnQsIGJvb2wgaXNQYWdpbmF0ZWQpCiAgICAgOiBtX2xpbmVDb3VudChsaW5l Q291bnQpCiAgICAgLCBtX3J1bkNvdW50KHJ1blZlY3Rvci5zaXplKCkpCiAgICAgLCBtX2lzUGFn aW5hdGVkKGlzUGFnaW5hdGVkKQotICAgICwgbV9wYWdpbmF0aW9uU3RydXRzKFdURk1vdmUoc3Ry dXRzKSkKKyAgICAsIG1fbGluZVN0cnV0cyhXVEZNb3ZlKHN0cnV0cykpCiB7CiAgICAgbWVtY3B5 KG1fcnVucywgcnVuVmVjdG9yLmRhdGEoKSwgbV9ydW5Db3VudCAqIHNpemVvZihSdW4pKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5oCmluZGV4IDEzZTU5 NTY0MWE1NDdjODZlZWU2ZDJlYzcxNWI0MDNkMThmYTYzNzAuLjViZDQxMDI2NWE5YjA5MWE2ZWFm NjIzMzJkOGQwNmI2MjY3YjdmYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXQuaApAQCAtNjYsNyArNjYsNyBAQCBzdHJ1Y3QgUnVuIHsKICAgICBFeHBhbnNp b25CZWhhdmlvciBleHBhbnNpb25CZWhhdmlvciB7IEZvcmJpZExlYWRpbmdFeHBhbnNpb24gfCBG b3JiaWRUcmFpbGluZ0V4cGFuc2lvbiB9OwogfTsKIAotc3RydWN0IFNpbXBsZVBhZ2luYXRpb25T dHJ1dCB7CitzdHJ1Y3QgU2ltcGxlTGluZVN0cnV0IHsKICAgICB1bnNpZ25lZCBsaW5lQnJlYWs7 CiAgICAgZmxvYXQgb2Zmc2V0OwogfTsKQEAgLTc1LDggKzc1LDggQEAgY2xhc3MgTGF5b3V0IHsK ICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICB1c2luZyBSdW5WZWN0 b3IgPSBWZWN0b3I8UnVuLCAxMD47Ci0gICAgdXNpbmcgU2ltcGxlUGFnaW5hdGlvblN0cnV0cyA9 IFZlY3RvcjxTaW1wbGVQYWdpbmF0aW9uU3RydXQsIDQ+OwotICAgIHN0YXRpYyBzdGQ6OnVuaXF1 ZV9wdHI8TGF5b3V0PiBjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiwgU2ltcGxlUGFnaW5hdGlvblN0 cnV0cyYsIHVuc2lnbmVkIGxpbmVDb3VudCwgYm9vbCBpc1BhZ2luYXRlZCk7CisgICAgdXNpbmcg U2ltcGxlTGluZVN0cnV0cyA9IFZlY3RvcjxTaW1wbGVMaW5lU3RydXQsIDQ+OworICAgIHN0YXRp YyBzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0PiBjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiwgU2ltcGxl TGluZVN0cnV0cyYsIHVuc2lnbmVkIGxpbmVDb3VudCwgYm9vbCBpc1BhZ2luYXRlZCk7CiAKICAg ICB1bnNpZ25lZCBsaW5lQ291bnQoKSBjb25zdCB7IHJldHVybiBtX2xpbmVDb3VudDsgfQogCkBA IC04NCwxNSArODQsMTUgQEAgcHVibGljOgogICAgIGNvbnN0IFJ1biYgcnVuQXQodW5zaWduZWQg aSkgY29uc3QgeyByZXR1cm4gbV9ydW5zW2ldOyB9CiAKICAgICBib29sIGlzUGFnaW5hdGVkKCkg Y29uc3QgeyByZXR1cm4gbV9pc1BhZ2luYXRlZDsgfQotICAgIGJvb2wgaGFzUGFnaW5hdGlvblN0 cnV0cygpIGNvbnN0IHsgcmV0dXJuICFtX3BhZ2luYXRpb25TdHJ1dHMuaXNFbXB0eSgpOyB9Ci0g ICAgY29uc3QgU2ltcGxlUGFnaW5hdGlvblN0cnV0cyYgc3RydXRzKCkgY29uc3QgeyByZXR1cm4g bV9wYWdpbmF0aW9uU3RydXRzOyB9CisgICAgYm9vbCBoYXNMaW5lU3RydXRzKCkgY29uc3QgeyBy ZXR1cm4gIW1fbGluZVN0cnV0cy5pc0VtcHR5KCk7IH0KKyAgICBjb25zdCBTaW1wbGVMaW5lU3Ry dXRzJiBzdHJ1dHMoKSBjb25zdCB7IHJldHVybiBtX2xpbmVTdHJ1dHM7IH0KIHByaXZhdGU6Ci0g ICAgTGF5b3V0KGNvbnN0IFJ1blZlY3RvciYsIFNpbXBsZVBhZ2luYXRpb25TdHJ1dHMmLCB1bnNp Z25lZCBsaW5lQ291bnQsIGJvb2wgaXNQYWdpbmF0ZWQpOworICAgIExheW91dChjb25zdCBSdW5W ZWN0b3ImLCBTaW1wbGVMaW5lU3RydXRzJiwgdW5zaWduZWQgbGluZUNvdW50LCBib29sIGlzUGFn aW5hdGVkKTsKIAogICAgIHVuc2lnbmVkIG1fbGluZUNvdW50OwogICAgIHVuc2lnbmVkIG1fcnVu Q291bnQ7CiAgICAgYm9vbCBtX2lzUGFnaW5hdGVkOwotICAgIFNpbXBsZVBhZ2luYXRpb25TdHJ1 dHMgbV9wYWdpbmF0aW9uU3RydXRzOworICAgIFNpbXBsZUxpbmVTdHJ1dHMgbV9saW5lU3RydXRz OwogICAgIFJ1biBtX3J1bnNbMF07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuaAppbmRleCA3YjMwODM5Y2EyMTY0Y2Ez N2Q4MWQ2MjI0OTlhYTc4MDM2MzJiMjljLi5jZTY1YTI5YWUzMWZjODcyNjUwN2M4NjUzMmM0OWEy YzYwNDFkMmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dEZ1bmN0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVM aW5lTGF5b3V0RnVuY3Rpb25zLmgKQEAgLTc0LDcgKzc0LDcgQEAgbmFtZXNwYWNlIFNpbXBsZUxp bmVMYXlvdXQgewogaW5saW5lIExheW91dFVuaXQgY29tcHV0ZUZsb3dIZWlnaHQoY29uc3QgUmVu ZGVyQmxvY2tGbG93JiBmbG93LCBjb25zdCBMYXlvdXQmIGxheW91dCkKIHsKICAgICBhdXRvIGZs b3dIZWlnaHQgPSBsaW5lSGVpZ2h0RnJvbUZsb3coZmxvdykgKiBsYXlvdXQubGluZUNvdW50KCk7 Ci0gICAgaWYgKCFsYXlvdXQuaGFzUGFnaW5hdGlvblN0cnV0cygpKQorICAgIGlmICghbGF5b3V0 Lmhhc0xpbmVTdHJ1dHMoKSkKICAgICAgICAgcmV0dXJuIGZsb3dIZWlnaHQ7CiAgICAgZm9yIChh dXRvJiBzdHJ1dEVudHJ5IDogbGF5b3V0LnN0cnV0cygpKQogICAgICAgICBmbG93SGVpZ2h0ICs9 IHN0cnV0RW50cnkub2Zmc2V0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Np bXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oCmluZGV4IGNlMjQyY2I5OTY3MDkwMjNjNWUyOGY2ZDUx MDczYTAxMTc3ZDY5NjYuLjQ3MmExZDJjODhhNWNjOTUzMGVhMWNiY2Q4NGQzNjdhOGY0NmVmNGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVz b2x2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJl c29sdmVyLmgKQEAgLTIyMSw3ICsyMjEsNyBAQCBpbmxpbmUgZmxvYXQgUnVuUmVzb2x2ZXI6OlJ1 bjo6Y29tcHV0ZUJhc2VsaW5lUG9zaXRpb24oKSBjb25zdAogewogICAgIGF1dG8mIHJlc29sdmVy ID0gbV9pdGVyYXRvci5yZXNvbHZlcigpOwogICAgIGF1dG8gb2Zmc2V0ID0gcmVzb2x2ZXIubV9i b3JkZXJBbmRQYWRkaW5nQmVmb3JlICsgcmVzb2x2ZXIubV9saW5lSGVpZ2h0ICogbGluZUluZGV4 KCk7Ci0gICAgaWYgKCFyZXNvbHZlci5tX2xheW91dC5oYXNQYWdpbmF0aW9uU3RydXRzKCkpCisg ICAgaWYgKCFyZXNvbHZlci5tX2xheW91dC5oYXNMaW5lU3RydXRzKCkpCiAgICAgICAgIHJldHVy biBvZmZzZXQgKyByZXNvbHZlci5tX2Jhc2VsaW5lOwogICAgIGZvciAoYXV0byYgc3RydXRFbnRy eSA6IHJlc29sdmVyLm1fbGF5b3V0LnN0cnV0cygpKSB7CiAgICAgICAgIGlmIChzdHJ1dEVudHJ5 LmxpbmVCcmVhayA+IGxpbmVJbmRleCgpKQo=