135235 2014-07-24 03:06:01 -0700 Incorrect selection clearing in regions 2014-07-24 08:32:35 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 stavila stavila commit-queue WebkitBugTracker oldest_to_newest 1024480 0 stavila 2014-07-24 03:06:01 -0700 Incorrect selection clearing in regions 1024481 1 235421 stavila 2014-07-24 03:09:49 -0700 Created attachment 235421 WIP 1024482 2 commit-queue 2014-07-24 03:12:04 -0700 Attachment 235421 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderView.h:309: The parameter name "end" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1024518 3 stavila 2014-07-24 08:32:35 -0700 Style error is false positive: https://bugs.webkit.org/show_bug.cgi?id=134743 235421 2014-07-24 03:09:49 -0700 2014-07-24 03:09:49 -0700 WIP 134303.patch text/plain 24155 stavila ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkOGMwODQ4Li5mMjVlNTQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDct MjQgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIxNjkxMDUpOiBDcmFzaCBpbiBzZWxlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDMwMworCisgICAgICAgIEFkZGVkIHRlc3QgZm9y IHRoZSBjcmFzaCB0aGF0IG9jY3VycmVkIGluIHNvbWUgY2FzZXMgd2hlbiBzZWxlY3RpbmcuCisK KyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvc2VsZWN0aW9uL2NyYXNoLWRlc2VsZWN0LWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9yZWdpb25zL3NlbGVjdGlvbi9jcmFzaC1kZXNl bGVjdC5odG1sOiBBZGRlZC4KKwogMjAxNC0wNy0yMyAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mu d2FzaGluZ3Rvbi5lZHU+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVjdG9yQmFja2Vu ZCdzIHByb21pc2UtYmFzZWQgYWdlbnQgQVBJIGRvZXMgbm90IHN1cHBvcnQgbXVsdGlwbGUgcmV0 dXJuIHZhbHVlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3NlbGVjdGlv bi9jcmFzaC1kZXNlbGVjdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMv c2VsZWN0aW9uL2NyYXNoLWRlc2VsZWN0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi40ZjIxZTIxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9yZWdpb25zL3NlbGVjdGlvbi9jcmFzaC1kZXNlbGVjdC1leHBlY3RlZC50eHQKQEAgLTAs MCArMSw1IEBACitDT05TT0xFIE1FU1NBR0U6IGxpbmUgNjY6IEhpZXJhcmNoeVJlcXVlc3RFcnJv cjogRE9NIEV4Y2VwdGlvbiAzOiBBIE5vZGUgd2FzIGluc2VydGVkIHNvbWV3aGVyZSBpdCBkb2Vz bid0IGJlbG9uZy4KKworRXJybG9nIHNlbGVjdGlvblRlc3Q6IEhpZXJhcmNoeVJlcXVlc3RFcnJv cjogSGllcmFyY2h5UmVxdWVzdEVycm9yOiBET00gRXhjZXB0aW9uIDMgOiBpbmRleCAxIAorRXJy bG9nIHdlYnRlc3RfZm5fMjQ6IAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lv bnMvc2VsZWN0aW9uL2NyYXNoLWRlc2VsZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lv bnMvc2VsZWN0aW9uL2NyYXNoLWRlc2VsZWN0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMC4uYTFhOTI0OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv cmVnaW9ucy9zZWxlY3Rpb24vY3Jhc2gtZGVzZWxlY3QuaHRtbApAQCAtMCwwICsxLDcyIEBACis8 IURPQ1RZUEUgaHRtbD4KKzxodG1sIGlkPSJ3ZWJ0ZXN0MCI+CisgICAgPGhlYWQgaWQ9IndlYnRl c3QxIj4KKyAgICAgICAgPHN0eWxlIGlkPSJ3ZWJ0ZXN0MiI+PC9zdHlsZT4KKyAgICAgICAgPHN0 eWxlPgorICAgICAgICAgICAgOmxhc3QtY2hpbGQgeyAtd2Via2l0LWZsb3ctaW50bzogZm9vOyB9 CisgICAgICAgIDwvc3R5bGU+CisgICAgICAgIAorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBpZD0i d2VidGVzdDMiPgorICAgICAgICA8c2NyaXB0IGlkPSJleGFtcGxlIj48L3NjcmlwdD4KKworICAg ICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgICAgICAgICAgICBpZiAod2lu ZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KGZh bHNlKTsKKyAgICAgICAgPC9zY3JpcHQ+CisKKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAg IHZhciBuZXdfZWxlbSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNhbnZhcyIpOworICAgICAg ICAgICAgbmV3X2VsZW0uc2V0QXR0cmlidXRlKCJpZCIsICJ3ZWJ0ZXN0MTEiKTsKKyAgICAgICAg ICAgIGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiN3ZWJ0ZXN0MCIpLmFwcGVuZENoaWxkKG5ld19l bGVtKTsKKworICAgICAgICAgICAgZG9jdW1lbnQud3JpdGUoIjxicj48c3VtbWFyeT4iKTsKKyAg ICAgICAgPC9zY3JpcHQ+CisgICAgICAgIDxzdW1tYXJ5PgorICAgICAgICAgICAgPG1hdGhtbCBp ZD0id2VidGVzdDEyIj4KKyAgICAgICAgICAgICAgICA8ZmVtZXJnZT48L2ZlbWVyZ2U+CisgICAg ICAgICAgICA8L21hdGhtbD4KKworICAgICAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgICAg ICBmdW5jdGlvbiBzZWxlY3Rpb25UZXN0KCkgeworICAgICAgICAgICAgICAgICAgICB0cnkgewor ICAgICAgICAgICAgICAgICAgICAgICAgd2ZfaSA9IDA7CisgICAgICAgICAgICAgICAgICAgICAg ICBmb3IgKDsgd2ZfaTw0MDsgd2ZfaSsrKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg dmFyIHJhbmdlID0gZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKKworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJhbmdlLnNldFN0YXJ0QmVmb3JlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ3 ZWJ0ZXN0MyIpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByYW5nZS5zZXRFbmRBZnRl cihkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgid2VidGVzdDIiKSk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmFuZ2UuZGVsZXRlQ29udGVudHMoKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YXIgbWFya0VsZW1lbnQgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgid2VidGVzdDEiKS5hcHBlbmRDaGlsZChkb2N1bWVudC5j cmVhdGVFbGVtZW50TlMoIiIsICJtYXJrIikpOworICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJhbmdlLnNldFN0YXJ0QWZ0ZXIobWFya0VsZW1lbnQpOworCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdmFyIGFwcGxldEVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZXhh bXBsZSIpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImFwcGxldCIpKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICByYW5nZS5zZXRFbmRBZnRlcihhcHBsZXRFbGVtZW50 KTsKKworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJhbmdlLmluc2VydE5vZGUoZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoImV4YW1wbGUiKSk7CisgICAgICAgICAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgICAgIH0gY2F0Y2goZSkgeworICAgICAgICAgICAgICAgICAgICAg IGRvY3VtZW50LndyaXRlKCJFcnJsb2cgc2VsZWN0aW9uVGVzdDogIiArIGUubmFtZSArICI6ICIg KyBlLm1lc3NhZ2UgKyAiIDogaW5kZXggIiArIHdmX2kgKyAiIDxicj48dGFibGUvPiIpOworICAg ICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHNl bGVjdGlvblRlc3QoKTsKKyAgICAgICAgICAgIDwvc2NyaXB0PgorICAgICAgICAgICAgPHN1Yj4K KworICAgICAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgICAgICBkb2N1bWVudC5kZXNpZ25N b2RlID0gIm9uIjsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5leGVjQ29tbWFuZCgiU2VsZWN0 QWxsIik7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQud3JpdGUoIkVycmxvZyB3ZWJ0ZXN0X2Zu XzI0OiA8YnI+PG5vYnI+Iik7CisKKyAgICAgICAgICAgICAgICB2YXIgZmVtZXJnZUVsZW1lbnQg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgid2VidGVzdDEyIikuYXBwZW5kQ2hpbGQoZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZmVtZXJnZSIpKTsKKyAgICAgICAgICAgICAgICB2YXIgYXBwbGV0 RWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJleGFtcGxlIikuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYXBwbGV0IikpOworICAgICAgICAgICAgICAgIHZhciBn cmFkaWVudEVsZW1lbnQgPSBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImdyYWRpZW50IikpOworICAgICAgICAgICAgICAgICAgICAgICAgCisgICAgICAg ICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIndlYnRlc3QyIikuaXNFcXVhbE5vZGUo ZmVtZXJnZUVsZW1lbnQuaW5zZXJ0QmVmb3JlKGRvY3VtZW50LmRvY3VtZW50RWxlbWVudCwgZ3Jh ZGllbnRFbGVtZW50KSk7CisgICAgICAgICAgICA8L3NjcmlwdD4KKworICAgICAgICAgICAgPHRh YmxlPjwvdGFibGU+CisgICAgICAgIDwvc3VtbWFyeT4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggZTdhYmUwMy4uZmY5Y2I1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBA CisyMDE0LTA3LTI0ICBSYWR1IFN0YXZpbGEgIDxzdGF2aWxhQGFkb2JlLmNvbT4KKworICAgICAg ICBSRUdSRVNTSU9OIChyMTY5MTA1KTogQ3Jhc2ggaW4gc2VsZWN0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQzMDMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHNwbGl0dGluZyB0aGUgc2Vs ZWN0aW9uIGJldHdlZW4gZGlmZmVyZW50IHN1YnRyZWVzLCBhbGwgc3VidHJlZXMgbXVzdCBoYXZl IHRoZWlyIHNlbGVjdGlvbiBjbGVhcmVkIGJlZm9yZQorICAgICAgICBzdGFydGluZyB0byBhcHBs eSB0aGUgbmV3IHNlbGVjdGlvbi4gT3RoZXJ3aXNlLCB3aGVuIHNlbGVjdGluZyBvYmplY3RzIGlu IGEgbmFtZWQgZmxvdyB0aHJlYWQgYW5kIGdvaW5nIHVwCisgICAgICAgIGl0cyBjb250YWluaW5n IGJsb2NrIGNoYWluLCB3ZSBjYW4gZW5kIHVwIGluIHRoZSB2aWV3J3Mgc2VsZWN0aW9uIHJvb3Qs IHdoaWNoIGhhcyBub3QgeWV0IGJlZW4gdXBkYXRlZCBhbmQgc28KKyAgICAgICAgd2UgZ2V0IGlu Y29uc2lzdGVudCBkYXRhLgorCisgICAgICAgIFRvIGFjaGlldmUgdGhpcyBnb2FsLCB0aGUgc2Vs ZWN0aW9uIHVwZGF0ZSB3YXMgc3BsaXQgaW50byBhICJjbGVhciIgYW5kIGFuICJhcHBseSIgbWV0 aG9kLiBUaGUgdXBkYXRlU2VsZWN0aW9uRm9yU3VidHJlZXMKKyAgICAgICAgbWV0aG9kIGZpcnN0 IGl0ZXJhdGVzIHRocm91Z2ggYWxsIHN1YnRyZWVzIGFuZCBwZXJmb3JtcyB0aGUgImNsZWFyIiBt ZXRob2QgYW5kIHRoZW4gc3RhcnRzIGFsbCBvdmVyIGFnYWluCisgICAgICAgIGFuZCBwZXJmb3Jt cyB0aGUgImFwcGx5IiBtZXRob2QuCisKKyAgICAgICAgQWxzbywgdGhlIHNlbGVjdGlvblN0YXJ0 L0VuZCBtZW1iZXJzIGluIFJlbmRlclZpZXcgaGF2ZSBiZWVuIHJlbmFtZWQgdG8gZml4IHByb2Js ZW1zIGNhdXNlZCBieSB0aGUgZmFjdCB0aGF0CisgICAgICAgIFJlbmRlclZpZXcgaW5oZXJpdHMg U2VsZWN0aW9uU3VidHJlZVJvb3QsIHdoaWNoIGFsc28gaGFzIHRoZSBzYW1lIHNlbGVjdGlvblN0 YXJ0L0VuZCBtZW1iZXJzLgorCisgICAgICAgIFRlc3Q6IGZhc3QvcmVnaW9ucy9zZWxlY3Rpb24v Y3Jhc2gtZGVzZWxlY3QuaHRtbAorCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJTZWxlY3Rpb25JbmZvLmg6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVmlldzo6c2V0U2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnNw bGl0U2VsZWN0aW9uQmV0d2VlblN1YnRyZWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZp ZXc6OnVwZGF0ZVNlbGVjdGlvbkZvclN1YnRyZWVzKTogQWRkZWQsIGNsZWFycyBhbmQgcmUtYXBw bGllcyBzZWxlY3Rpb24gZm9yIGFsbCBzZWxlY3Rpb24gc3VidHJlZXMuCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJWaWV3OjpjbGVhclN1YnRyZWVTZWxlY3Rpb24pOiBBZGRlZCwgY2xlYXJzIHNl bGVjdGlvbiBhbmQgcmV0dXJucyBwcmV2aW91c2x5IHNlbGVjdGVkIGluZm9ybWF0aW9uLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6YXBwbHlTdWJ0cmVlU2VsZWN0aW9uKTogQWRkZWQs IHVwZGF0ZXMgdGhlIHNlbGVjdGlvbiBzdGF0dXMgb2YgYWxsIG9iamVjdHMgaW5zaWRlIHRoZSBz ZWxlY3Rpb24gdHJlZSwgY29tcGFyZXMgb2xkIGFuZCBuZXcgZGF0YSBhbmQgcmVwYWludHMgYWNj b3JkaW5nbHkuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2VsZWN0 aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5oOgorICAgICAg ICAqIHJlbmRlcmluZy9TZWxlY3Rpb25TdWJ0cmVlUm9vdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTZWxlY3Rpb25TdWJ0cmVlUm9vdDo6U2VsZWN0aW9uU3VidHJlZVJvb3QpOgorICAgICAgICAq IHJlbmRlcmluZy9TZWxlY3Rpb25TdWJ0cmVlUm9vdC5oOgorICAgICAgICAoV2ViQ29yZTo6U2Vs ZWN0aW9uU3VidHJlZVJvb3Q6Ok9sZFNlbGVjdGlvbkRhdGE6Ok9sZFNlbGVjdGlvbkRhdGEpOgor CiAyMDE0LTA3LTIzICBKZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KIAogICAgICAg ICBUcmFuc3BhcmVudCBmdWxsc2NyZWVuIGJhY2tncm91bmQgd2hlbiB2aWRlbyBpcyBub3QgcHJl c2VudC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagppbmRleCAxNGQyZTRkLi41ZjZjOWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC00NjYsNyArNDY2LDcgQEAKIAkJMEYw OTA4N0YxNDQ0RkRCMjAwMDI4OTE3IC8qIFNjcm9sbGJhclRoZW1lLmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGRTcxNDE1MTQyMTg5RkMwMERCMzNC QSAvKiBTY3JvbGxiYXJUaGVtZS5jcHAgKi87IH07CiAJCTBGMDk5RDA4MTdCOTY4QTEwMEZGODRC OSAvKiBXZWJDb3JlVHlwZWRBcnJheUNvbnRyb2xsZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYwOTlEMDYxN0I5NjhBMTAwRkY4NEI5IC8qIFdl YkNvcmVUeXBlZEFycmF5Q29udHJvbGxlci5jcHAgKi87IH07CiAJCTBGMDk5RDA5MTdCOTY4QTEw MEZGODRCOSAvKiBXZWJDb3JlVHlwZWRBcnJheUNvbnRyb2xsZXIuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGMDk5RDA3MTdCOTY4QTEwMEZGODRCOSAv KiBXZWJDb3JlVHlwZWRBcnJheUNvbnRyb2xsZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRF UyA9IChQcml2YXRlLCApOyB9OyB9OwotCQkwRjExQTU0RjBGMzkyMzMxMDBDMzc4ODQgLyogUmVu ZGVyU2VsZWN0aW9uSW5mby5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMEYxMUE1NEUwRjM5MjMzMTAwQzM3ODg0IC8qIFJlbmRlclNlbGVjdGlvbkluZm8u aCAqLzsgfTsKKwkJMEYxMUE1NEYwRjM5MjMzMTAwQzM3ODg0IC8qIFJlbmRlclNlbGVjdGlvbklu Zm8uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGMTFB NTRFMEYzOTIzMzEwMEMzNzg4NCAvKiBSZW5kZXJTZWxlY3Rpb25JbmZvLmggKi87IHNldHRpbmdz ID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMEYxMzE2M0UxNkVEMENDODAw MzVDQzA0IC8qIFBsYXRmb3JtQ0FGaWx0ZXJzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAwRjEzMTYzRDE2RUQwQ0M4MDAzNUNDMDQgLyogUGxhdGZvcm1D QUZpbHRlcnMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9 OwogCQkwRjEzMTY0MDE2RUQwQ0RFMDAzNUNDMDQgLyogUGxhdGZvcm1DQUZpbHRlcnNNYWMubW0g aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjEzMTYzRjE2 RUQwQ0RFMDAzNUNDMDQgLyogUGxhdGZvcm1DQUZpbHRlcnNNYWMubW0gKi87IH07CiAJCTBGMTVE QThBMEYzQUFFRTcwMDAwQ0U0NyAvKiBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZS5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYxNURBODkwRjNBQUVF NzAwMDBDRTQ3IC8qIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlLmggKi87IH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2VsZWN0aW9uSW5mby5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNlbGVjdGlvbkluZm8uaAppbmRleCA0NmU4ODZm Li45M2FlN2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Vs ZWN0aW9uSW5mby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTZWxlY3Rp b25JbmZvLmgKQEAgLTI1LDggKzI1LDkgQEAKICNpZm5kZWYgUmVuZGVyU2VsZWN0aW9uSW5mb19o CiAjZGVmaW5lIFJlbmRlclNlbGVjdGlvbkluZm9faAogCisjaW5jbHVkZSAiR2FwUmVjdHMuaCIK ICNpbmNsdWRlICJJbnRSZWN0LmgiCi0jaW5jbHVkZSAiUmVuZGVyQm94LmgiCisjaW5jbHVkZSAi UmVuZGVyQmxvY2suaCIKICNpbmNsdWRlICJSZW5kZXJUZXh0LmgiCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAppbmRleCAwNDQ0NGEy Li5kOGVjYjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmll dy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCkBAIC04 NTQsNyArODU0LDkgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0 KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIGUKIAogICAgIC8vIElmIHRoZXJl IGlzIG5vIFJlbmRlck5hbWVkRmxvd1RocmVhZHMgd2UgZm9sbG93IHRoZSByZWd1bGFyIHNlbGVj dGlvbi4KICAgICBpZiAoIWhhc1JlbmRlck5hbWVkRmxvd1RocmVhZHMoKSkgewotICAgICAgICBz ZXRTdWJ0cmVlU2VsZWN0aW9uKCp0aGlzLCBzdGFydCwgc3RhcnRQb3MsIGVuZCwgZW5kUG9zLCBi bG9ja1JlcGFpbnRNb2RlKTsKKyAgICAgICAgUmVuZGVyU3VidHJlZXNNYXAgc2luZ2xlU3VidHJl ZU1hcDsKKyAgICAgICAgc2luZ2xlU3VidHJlZU1hcC5zZXQodGhpcywgU2VsZWN0aW9uU3VidHJl ZVJvb3Qoc3RhcnQsIHN0YXJ0UG9zLCBlbmQsIGVuZFBvcykpOworICAgICAgICB1cGRhdGVTZWxl Y3Rpb25Gb3JTdWJ0cmVlcyhzaW5nbGVTdWJ0cmVlTWFwLCBibG9ja1JlcGFpbnRNb2RlKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtODY0LDcgKzg2Niw2IEBAIHZvaWQgUmVuZGVyVmll dzo6c2V0U2VsZWN0aW9uKFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcywgUmVuZGVy T2JqZWN0KiBlCiB2b2lkIFJlbmRlclZpZXc6OnNwbGl0U2VsZWN0aW9uQmV0d2VlblN1YnRyZWVz KFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlbmQsIGlu dCBlbmRQb3MsIFNlbGVjdGlvblJlcGFpbnRNb2RlIGJsb2NrUmVwYWludE1vZGUpCiB7CiAgICAg Ly8gQ29tcHV0ZSB0aGUgdmlzaWJsZSBzZWxlY3Rpb24gZW5kIHBvaW50cyBmb3IgZWFjaCBvZiB0 aGUgc3VidHJlZXMuCi0gICAgdHlwZWRlZiBIYXNoTWFwPFNlbGVjdGlvblN1YnRyZWVSb290Kiwg U2VsZWN0aW9uU3VidHJlZVJvb3Q+IFJlbmRlclN1YnRyZWVzTWFwOwogICAgIFJlbmRlclN1YnRy ZWVzTWFwIHJlbmRlclN1YnRyZWVzTWFwOwogCiAgICAgU2VsZWN0aW9uU3VidHJlZVJvb3QgaW5p dGlhbFNlbGVjdGlvbjsKQEAgLTg5OCwzMyArODk5LDQ5IEBAIHZvaWQgUmVuZGVyVmlldzo6c3Bs aXRTZWxlY3Rpb25CZXR3ZWVuU3VidHJlZXMoUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0 UG9zCiAgICAgICAgICAgICByZW5kZXJTdWJ0cmVlc01hcC5zZXQoJnJvb3QsIHNlbGVjdGlvbkRh dGEpOwogICAgICAgICB9CiAgICAgfQorICAgIAorICAgIHVwZGF0ZVNlbGVjdGlvbkZvclN1YnRy ZWVzKHJlbmRlclN1YnRyZWVzTWFwLCBibG9ja1JlcGFpbnRNb2RlKTsKK30KIAotICAgIGZvciAo UmVuZGVyU3VidHJlZXNNYXA6Oml0ZXJhdG9yIGkgPSByZW5kZXJTdWJ0cmVlc01hcC5iZWdpbigp OyBpICE9IHJlbmRlclN1YnRyZWVzTWFwLmVuZCgpOyArK2kpIHsKLSAgICAgICAgU2VsZWN0aW9u U3VidHJlZVJvb3Qgc3VidHJlZVNlbGVjdGlvbkRhdGEgPSBpLT52YWx1ZTsKK3ZvaWQgUmVuZGVy Vmlldzo6dXBkYXRlU2VsZWN0aW9uRm9yU3VidHJlZXMoUmVuZGVyU3VidHJlZXNNYXAmIHJlbmRl clN1YnRyZWVzTWFwLCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFpbnRNb2RlKQorewor ICAgIFN1YnRyZWVPbGRTZWxlY3Rpb25EYXRhTWFwIG9sZFNlbGVjdGlvbkRhdGFNYXA7CisgICAg Zm9yIChhdXRvIGl0ID0gcmVuZGVyU3VidHJlZXNNYXAuYmVnaW4oKTsgaXQgIT0gcmVuZGVyU3Vi dHJlZXNNYXAuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgc3RkOjp1bmlxdWVfcHRyPE9sZFNlbGVj dGlvbkRhdGE+IG9sZFNlbGVjdGlvbkRhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPE9sZFNlbGVjdGlv bkRhdGE+KCk7CisgICAgICAgIGNsZWFyU3VidHJlZVNlbGVjdGlvbigqaXQtPmtleSwgYmxvY2tS ZXBhaW50TW9kZSwgKm9sZFNlbGVjdGlvbkRhdGEpOworICAgICAgICBvbGRTZWxlY3Rpb25EYXRh TWFwLnNldChpdC0+a2V5LCBXVEY6Om1vdmUob2xkU2VsZWN0aW9uRGF0YSkpOworCisgICAgICAg IFNlbGVjdGlvblN1YnRyZWVSb290JiBzdWJ0cmVlU2VsZWN0aW9uRGF0YSA9IGl0LT52YWx1ZTsK ICAgICAgICAgc3VidHJlZVNlbGVjdGlvbkRhdGEuYWRqdXN0Rm9yVmlzaWJsZVNlbGVjdGlvbihk b2N1bWVudCgpKTsKLSAgICAgICAgc2V0U3VidHJlZVNlbGVjdGlvbigqaS0+a2V5LCBzdWJ0cmVl U2VsZWN0aW9uRGF0YS5zZWxlY3Rpb25TdGFydCgpLCBzdWJ0cmVlU2VsZWN0aW9uRGF0YS5zZWxl Y3Rpb25TdGFydFBvcygpLAotICAgICAgICAgICAgc3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0 aW9uRW5kKCksIHN1YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlvbkVuZFBvcygpLCBibG9ja1Jl cGFpbnRNb2RlKTsKKyAgICAgICAgCisgICAgICAgIFNlbGVjdGlvblN1YnRyZWVSb290JiByb290 ID0gKml0LT5rZXk7CisgICAgICAgIHJvb3Quc2V0U2VsZWN0aW9uU3RhcnQoc3VidHJlZVNlbGVj dGlvbkRhdGEuc2VsZWN0aW9uU3RhcnQoKSk7CisgICAgICAgIHJvb3Quc2V0U2VsZWN0aW9uU3Rh cnRQb3Moc3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uU3RhcnRQb3MoKSk7CisgICAgICAg IHJvb3Quc2V0U2VsZWN0aW9uRW5kKHN1YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlvbkVuZCgp KTsKKyAgICAgICAgcm9vdC5zZXRTZWxlY3Rpb25FbmRQb3Moc3VidHJlZVNlbGVjdGlvbkRhdGEu c2VsZWN0aW9uRW5kUG9zKCkpOworICAgIH0KKworICAgIC8vIFVwZGF0ZSBzZWxlY3Rpb24gc3Rh dHVzIGZvciB0aGUgb2JqZWN0cyBpbnNpZGUgdGhlIHNlbGVjdGlvbiBzdWJ0cmVlcy4KKyAgICAv LyBUaGlzIG5lZWRzIHRvIGJlIGRvbmUgYWZ0ZXIgdGhlIHByZXZpb3VzIGxvb3AgdXBkYXRlZCB0 aGUgc2VsZWN0aW9uU3RhcnQvRW5kCisgICAgLy8gcGFyYW1ldGVycyBvZiBhbGwgc3VidHJlZXMg YmVjYXVzZSB3ZSdyZSBnb2luZyB0byBiZSBjbGltYmluZyB1cCB0aGUgY29udGFpbmluZworICAg IC8vIGJsb2NrIGNoYWluIGFuZCB3ZSBtaWdodCBlbmQgdXAgaW4gYSBkaWZmZXJlbnQgc2VsZWN0 aW9uIHN1YnRyZWUuCisgICAgZm9yIChhdXRvIGl0ID0gcmVuZGVyU3VidHJlZXNNYXAuYmVnaW4o KTsgaXQgIT0gcmVuZGVyU3VidHJlZXNNYXAuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgU2VsZWN0 aW9uU3VidHJlZVJvb3Qgc3VidHJlZVNlbGVjdGlvbkRhdGEgPSBpdC0+dmFsdWU7CisgICAgICAg IE9sZFNlbGVjdGlvbkRhdGEmIG9sZFNlbGVjdGlvbkRhdGEgPSAqb2xkU2VsZWN0aW9uRGF0YU1h cC5nZXQoaXQtPmtleSk7CisgICAgICAgIGFwcGx5U3VidHJlZVNlbGVjdGlvbigqaXQtPmtleSwg c3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uU3RhcnQoKSwgc3VidHJlZVNlbGVjdGlvbkRh dGEuc2VsZWN0aW9uRW5kKCksIHN1YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlvbkVuZFBvcygp LCBibG9ja1JlcGFpbnRNb2RlLCBvbGRTZWxlY3Rpb25EYXRhKTsKICAgICB9CiB9CiAKLXZvaWQg UmVuZGVyVmlldzo6c2V0U3VidHJlZVNlbGVjdGlvbihTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9v dCwgUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIGVuZCwg aW50IGVuZFBvcywgU2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSkKK3ZvaWQg UmVuZGVyVmlldzo6Y2xlYXJTdWJ0cmVlU2VsZWN0aW9uKGNvbnN0IFNlbGVjdGlvblN1YnRyZWVS b290JiByb290LCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFpbnRNb2RlLCBPbGRTZWxl Y3Rpb25EYXRhJiBvbGRTZWxlY3Rpb25EYXRhKQogewogICAgIC8vIFJlY29yZCB0aGUgb2xkIHNl bGVjdGVkIG9iamVjdHMuICBUaGVzZSB3aWxsIGJlIHVzZWQgbGF0ZXIKICAgICAvLyB3aGVuIHdl IGNvbXBhcmUgYWdhaW5zdCB0aGUgbmV3IHNlbGVjdGVkIG9iamVjdHMuCi0gICAgaW50IG9sZFN0 YXJ0UG9zID0gcm9vdC5zZWxlY3Rpb25TdGFydFBvcygpOwotICAgIGludCBvbGRFbmRQb3MgPSBy b290LnNlbGVjdGlvbkVuZFBvcygpOwotCi0gICAgLy8gT2JqZWN0cyBlYWNoIGhhdmUgYSBzaW5n bGUgc2VsZWN0aW9uIHJlY3QgdG8gZXhhbWluZS4KLSAgICB0eXBlZGVmIEhhc2hNYXA8UmVuZGVy T2JqZWN0Kiwgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclNlbGVjdGlvbkluZm8+PiBTZWxlY3RlZE9i amVjdE1hcDsKLSAgICBTZWxlY3RlZE9iamVjdE1hcCBvbGRTZWxlY3RlZE9iamVjdHM7Ci0gICAg U2VsZWN0ZWRPYmplY3RNYXAgbmV3U2VsZWN0ZWRPYmplY3RzOwotCisgICAgb2xkU2VsZWN0aW9u RGF0YS5zZWxlY3Rpb25TdGFydFBvcyA9IHJvb3Quc2VsZWN0aW9uU3RhcnRQb3MoKTsKKyAgICBv bGRTZWxlY3Rpb25EYXRhLnNlbGVjdGlvbkVuZFBvcyA9IHJvb3Quc2VsZWN0aW9uRW5kUG9zKCk7 CisgICAgCiAgICAgLy8gQmxvY2tzIGNvbnRhaW4gc2VsZWN0ZWQgb2JqZWN0cyBhbmQgZmlsbCBn YXBzIGJldHdlZW4gdGhlbSwgZWl0aGVyIG9uIHRoZSBsZWZ0LCByaWdodCwgb3IgaW4gYmV0d2Vl biBsaW5lcyBhbmQgYmxvY2tzLgogICAgIC8vIEluIG9yZGVyIHRvIGdldCB0aGUgcmVwYWludCBy ZWN0IHJpZ2h0LCB3ZSBoYXZlIHRvIGV4YW1pbmUgbGVmdCwgbWlkZGxlLCBhbmQgcmlnaHQgcmVj dHMgaW5kaXZpZHVhbGx5LCBzaW5jZSBvdGhlcndpc2UKICAgICAvLyB0aGUgdW5pb24gb2YgdGhv c2UgcmVjdHMgbWlnaHQgcmVtYWluIHRoZSBzYW1lIGV2ZW4gd2hlbiBjaGFuZ2VzIGhhdmUgb2Nj dXJyZWQuCi0gICAgdHlwZWRlZiBIYXNoTWFwPFJlbmRlckJsb2NrKiwgc3RkOjp1bmlxdWVfcHRy PFJlbmRlckJsb2NrU2VsZWN0aW9uSW5mbz4+IFNlbGVjdGVkQmxvY2tNYXA7Ci0gICAgU2VsZWN0 ZWRCbG9ja01hcCBvbGRTZWxlY3RlZEJsb2NrczsKLSAgICBTZWxlY3RlZEJsb2NrTWFwIG5ld1Nl bGVjdGVkQmxvY2tzOwogCiAgICAgUmVuZGVyT2JqZWN0KiBvcyA9IHJvb3Quc2VsZWN0aW9uU3Rh cnQoKTsKICAgICBSZW5kZXJPYmplY3QqIHN0b3AgPSByZW5kZXJlckFmdGVyUG9zaXRpb24ocm9v dC5zZWxlY3Rpb25FbmQoKSwgcm9vdC5zZWxlY3Rpb25FbmRQb3MoKSk7CkBAIC05MzMsMTEgKzk1 MCwxMSBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3Vi dHJlZVJvb3QmIHJvb3QsIFJlbmRlck9iamVjdCogcwogICAgICAgICBpZiAoKG9zLT5jYW5CZVNl bGVjdGlvbkxlYWYoKSB8fCBvcyA9PSByb290LnNlbGVjdGlvblN0YXJ0KCkgfHwgb3MgPT0gcm9v dC5zZWxlY3Rpb25FbmQoKSkKICAgICAgICAgICAgICYmIG9zLT5zZWxlY3Rpb25TdGF0ZSgpICE9 IFNlbGVjdGlvbk5vbmUpIHsKICAgICAgICAgICAgIC8vIEJsb2NrcyBhcmUgcmVzcG9uc2libGUg Zm9yIHBhaW50aW5nIGxpbmUgZ2FwcyBhbmQgbWFyZ2luIGdhcHMuICBUaGV5IG11c3QgYmUgZXhh bWluZWQgYXMgd2VsbC4KLSAgICAgICAgICAgIG9sZFNlbGVjdGVkT2JqZWN0cy5zZXQob3MsIHN0 ZDo6bWFrZV91bmlxdWU8UmVuZGVyU2VsZWN0aW9uSW5mbz4ob3MsIHRydWUpKTsKKyAgICAgICAg ICAgIG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0ZWRPYmplY3RzLnNldChvcywgc3RkOjptYWtlX3Vu aXF1ZTxSZW5kZXJTZWxlY3Rpb25JbmZvPihvcywgdHJ1ZSkpOwogICAgICAgICAgICAgaWYgKGJs b2NrUmVwYWludE1vZGUgPT0gUmVwYWludE5ld1hPUk9sZCkgewogICAgICAgICAgICAgICAgIFJl bmRlckJsb2NrKiBjYiA9IG9zLT5jb250YWluaW5nQmxvY2soKTsKICAgICAgICAgICAgICAgICB3 aGlsZSAoY2IgJiYgIWNiLT5pc1JlbmRlclZpZXcoKSkgewotICAgICAgICAgICAgICAgICAgICBz dGQ6OnVuaXF1ZV9wdHI8UmVuZGVyQmxvY2tTZWxlY3Rpb25JbmZvPiYgYmxvY2tJbmZvID0gb2xk U2VsZWN0ZWRCbG9ja3MuYWRkKGNiLCBudWxscHRyKS5pdGVyYXRvci0+dmFsdWU7CisgICAgICAg ICAgICAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJCbG9ja1NlbGVjdGlvbkluZm8+JiBi bG9ja0luZm8gPSBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGVkQmxvY2tzLmFkZChjYiwgbnVsbHB0 cikuaXRlcmF0b3ItPnZhbHVlOwogICAgICAgICAgICAgICAgICAgICBpZiAoYmxvY2tJbmZvKQog ICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIGJsb2Nr SW5mbyA9IHN0ZDo6bWFrZV91bmlxdWU8UmVuZGVyQmxvY2tTZWxlY3Rpb25JbmZvPihjYik7CkBA IC05NDksMTcgKzk2NiwxMyBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24o U2VsZWN0aW9uU3VidHJlZVJvb3QmIHJvb3QsIFJlbmRlck9iamVjdCogcwogICAgICAgICBvcyA9 IHNlbGVjdGlvbkl0ZXJhdG9yLm5leHQoKTsKICAgICB9CiAKLSAgICAvLyBOb3cgY2xlYXIgdGhl IHNlbGVjdGlvbi4KLSAgICBTZWxlY3RlZE9iamVjdE1hcDo6aXRlcmF0b3Igb2xkT2JqZWN0c0Vu ZCA9IG9sZFNlbGVjdGVkT2JqZWN0cy5lbmQoKTsKLSAgICBmb3IgKFNlbGVjdGVkT2JqZWN0TWFw OjppdGVyYXRvciBpID0gb2xkU2VsZWN0ZWRPYmplY3RzLmJlZ2luKCk7IGkgIT0gb2xkT2JqZWN0 c0VuZDsgKytpKQorICAgIGF1dG8gb2xkT2JqZWN0c0VuZCA9IG9sZFNlbGVjdGlvbkRhdGEuc2Vs ZWN0ZWRPYmplY3RzLmVuZCgpOworICAgIGZvciAoYXV0byBpID0gb2xkU2VsZWN0aW9uRGF0YS5z ZWxlY3RlZE9iamVjdHMuYmVnaW4oKTsgaSAhPSBvbGRPYmplY3RzRW5kOyArK2kpCiAgICAgICAg IGktPmtleS0+c2V0U2VsZWN0aW9uU3RhdGVJZk5lZWRlZChTZWxlY3Rpb25Ob25lKTsKK30KIAot ICAgIC8vIHNldCBzZWxlY3Rpb24gc3RhcnQgYW5kIGVuZAotICAgIHJvb3Quc2V0U2VsZWN0aW9u U3RhcnQoc3RhcnQpOwotICAgIHJvb3Quc2V0U2VsZWN0aW9uU3RhcnRQb3Moc3RhcnRQb3MpOwot ICAgIHJvb3Quc2V0U2VsZWN0aW9uRW5kKGVuZCk7Ci0gICAgcm9vdC5zZXRTZWxlY3Rpb25FbmRQ b3MoZW5kUG9zKTsKLQordm9pZCBSZW5kZXJWaWV3OjphcHBseVN1YnRyZWVTZWxlY3Rpb24oU2Vs ZWN0aW9uU3VidHJlZVJvb3QmIHJvb3QsIFJlbmRlck9iamVjdCogc3RhcnQsIFJlbmRlck9iamVj dCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFpbnRNb2Rl LCBjb25zdCBPbGRTZWxlY3Rpb25EYXRhJiBvbGRTZWxlY3Rpb25EYXRhKQorewogICAgIC8vIFVw ZGF0ZSB0aGUgc2VsZWN0aW9uIHN0YXR1cyBvZiBhbGwgb2JqZWN0cyBiZXR3ZWVuIHNlbGVjdGlv blN0YXJ0IGFuZCBzZWxlY3Rpb25FbmQKICAgICBpZiAoc3RhcnQgJiYgc3RhcnQgPT0gZW5kKQog ICAgICAgICBzdGFydC0+c2V0U2VsZWN0aW9uU3RhdGVJZk5lZWRlZChTZWxlY3Rpb25Cb3RoKTsK QEAgLTk3MSw4ICs5ODQsOCBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24o U2VsZWN0aW9uU3VidHJlZVJvb3QmIHJvb3QsIFJlbmRlck9iamVjdCogcwogICAgIH0KIAogICAg IFJlbmRlck9iamVjdCogbyA9IHN0YXJ0OwotICAgIHN0b3AgPSByZW5kZXJlckFmdGVyUG9zaXRp b24oZW5kLCBlbmRQb3MpOwotICAgIHNlbGVjdGlvbkl0ZXJhdG9yID0gU2VsZWN0aW9uSXRlcmF0 b3Iobyk7CisgICAgUmVuZGVyT2JqZWN0KiBzdG9wID0gcmVuZGVyZXJBZnRlclBvc2l0aW9uKGVu ZCwgZW5kUG9zKTsKKyAgICBTZWxlY3Rpb25JdGVyYXRvciBzZWxlY3Rpb25JdGVyYXRvcihvKTsK ICAgICAKICAgICB3aGlsZSAobyAmJiBvICE9IHN0b3ApIHsKICAgICAgICAgaWYgKG8gIT0gc3Rh cnQgJiYgbyAhPSBlbmQgJiYgby0+Y2FuQmVTZWxlY3Rpb25MZWFmKCkpCkBAIC05ODUsNiArOTk4 LDggQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlvblN1YnRy ZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqIHMKIAogICAgIC8vIE5vdyB0aGF0IHRoZSBzZWxl Y3Rpb24gc3RhdGUgaGFzIGJlZW4gdXBkYXRlZCBmb3IgdGhlIG5ldyBvYmplY3RzLCB3YWxrIHRo ZW0gYWdhaW4gYW5kCiAgICAgLy8gcHV0IHRoZW0gaW4gdGhlIG5ldyBvYmplY3RzIGxpc3QuCisg ICAgU2VsZWN0ZWRPYmplY3RNYXAgbmV3U2VsZWN0ZWRPYmplY3RzOworICAgIFNlbGVjdGVkQmxv Y2tNYXAgbmV3U2VsZWN0ZWRCbG9ja3M7CiAgICAgbyA9IHN0YXJ0OwogICAgIHNlbGVjdGlvbkl0 ZXJhdG9yID0gU2VsZWN0aW9uSXRlcmF0b3Iobyk7CiAgICAgd2hpbGUgKG8gJiYgbyAhPSBzdG9w KSB7CkBAIC0xMDE5LDEzICsxMDM0LDE0IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U3VidHJlZVNl bGVjdGlvbihTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9vdCwgUmVuZGVyT2JqZWN0KiBzCiAgICAg ICAgIHJldHVybjsKIAogICAgIC8vIEhhdmUgYW55IG9mIHRoZSBvbGQgc2VsZWN0ZWQgb2JqZWN0 cyBjaGFuZ2VkIGNvbXBhcmVkIHRvIHRoZSBuZXcgc2VsZWN0aW9uPwotICAgIGZvciAoU2VsZWN0 ZWRPYmplY3RNYXA6Oml0ZXJhdG9yIGkgPSBvbGRTZWxlY3RlZE9iamVjdHMuYmVnaW4oKTsgaSAh PSBvbGRPYmplY3RzRW5kOyArK2kpIHsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiBvYmogPSBpLT5r ZXk7CisgICAgYXV0byBvbGRPYmplY3RzRW5kID0gb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3RlZE9i amVjdHMuZW5kKCk7CisgICAgZm9yIChhdXRvIGl0ID0gb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3Rl ZE9iamVjdHMuYmVnaW4oKTsgaXQgIT0gb2xkT2JqZWN0c0VuZDsgKytpdCkgeworICAgICAgICBS ZW5kZXJPYmplY3QqIG9iaiA9IGl0LT5rZXk7CiAgICAgICAgIFJlbmRlclNlbGVjdGlvbkluZm8q IG5ld0luZm8gPSBuZXdTZWxlY3RlZE9iamVjdHMuZ2V0KG9iaik7Ci0gICAgICAgIFJlbmRlclNl bGVjdGlvbkluZm8qIG9sZEluZm8gPSBpLT52YWx1ZS5nZXQoKTsKKyAgICAgICAgUmVuZGVyU2Vs ZWN0aW9uSW5mbyogb2xkSW5mbyA9IGl0LT52YWx1ZS5nZXQoKTsKICAgICAgICAgaWYgKCFuZXdJ bmZvIHx8IG9sZEluZm8tPnJlY3QoKSAhPSBuZXdJbmZvLT5yZWN0KCkgfHwgb2xkSW5mby0+c3Rh dGUoKSAhPSBuZXdJbmZvLT5zdGF0ZSgpCi0gICAgICAgICAgICB8fCAocm9vdC5zZWxlY3Rpb25T dGFydCgpID09IG9iaiAmJiBvbGRTdGFydFBvcyAhPSByb290LnNlbGVjdGlvblN0YXJ0UG9zKCkp Ci0gICAgICAgICAgICB8fCAocm9vdC5zZWxlY3Rpb25FbmQoKSA9PSBvYmogJiYgb2xkRW5kUG9z ICE9IHJvb3Quc2VsZWN0aW9uRW5kUG9zKCkpKSB7CisgICAgICAgICAgICB8fCAocm9vdC5zZWxl Y3Rpb25TdGFydCgpID09IG9iaiAmJiBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGlvblN0YXJ0UG9z ICE9IHJvb3Quc2VsZWN0aW9uU3RhcnRQb3MoKSkKKyAgICAgICAgICAgIHx8IChyb290LnNlbGVj dGlvbkVuZCgpID09IG9iaiAmJiBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGlvbkVuZFBvcyAhPSBy b290LnNlbGVjdGlvbkVuZFBvcygpKSkgewogICAgICAgICAgICAgb2xkSW5mby0+cmVwYWludCgp OwogICAgICAgICAgICAgaWYgKG5ld0luZm8pIHsKICAgICAgICAgICAgICAgICBuZXdJbmZvLT5y ZXBhaW50KCk7CkBAIC0xMDM1LDE2ICsxMDUxLDE2IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U3Vi dHJlZVNlbGVjdGlvbihTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9vdCwgUmVuZGVyT2JqZWN0KiBz CiAgICAgfQogCiAgICAgLy8gQW55IG5ldyBvYmplY3RzIHRoYXQgcmVtYWluIHdlcmUgbm90IGZv dW5kIGluIHRoZSBvbGQgb2JqZWN0cyBkaWN0LCBhbmQgc28gdGhleSBuZWVkIHRvIGJlIHVwZGF0 ZWQuCi0gICAgU2VsZWN0ZWRPYmplY3RNYXA6Oml0ZXJhdG9yIG5ld09iamVjdHNFbmQgPSBuZXdT ZWxlY3RlZE9iamVjdHMuZW5kKCk7Ci0gICAgZm9yIChTZWxlY3RlZE9iamVjdE1hcDo6aXRlcmF0 b3IgaSA9IG5ld1NlbGVjdGVkT2JqZWN0cy5iZWdpbigpOyBpICE9IG5ld09iamVjdHNFbmQ7ICsr aSkKLSAgICAgICAgaS0+dmFsdWUtPnJlcGFpbnQoKTsKKyAgICBhdXRvIG5ld09iamVjdHNFbmQg PSBuZXdTZWxlY3RlZE9iamVjdHMuZW5kKCk7CisgICAgZm9yIChhdXRvIGl0ID0gbmV3U2VsZWN0 ZWRPYmplY3RzLmJlZ2luKCk7IGl0ICE9IG5ld09iamVjdHNFbmQ7ICsraXQpCisgICAgICAgIGl0 LT52YWx1ZS0+cmVwYWludCgpOwogCiAgICAgLy8gSGF2ZSBhbnkgb2YgdGhlIG9sZCBibG9ja3Mg Y2hhbmdlZD8KLSAgICBTZWxlY3RlZEJsb2NrTWFwOjppdGVyYXRvciBvbGRCbG9ja3NFbmQgPSBv bGRTZWxlY3RlZEJsb2Nrcy5lbmQoKTsKLSAgICBmb3IgKFNlbGVjdGVkQmxvY2tNYXA6Oml0ZXJh dG9yIGkgPSBvbGRTZWxlY3RlZEJsb2Nrcy5iZWdpbigpOyBpICE9IG9sZEJsb2Nrc0VuZDsgKytp KSB7Ci0gICAgICAgIFJlbmRlckJsb2NrKiBibG9jayA9IGktPmtleTsKKyAgICBhdXRvIG9sZEJs b2Nrc0VuZCA9IG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0ZWRCbG9ja3MuZW5kKCk7CisgICAgZm9y IChhdXRvIGl0ID0gb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3RlZEJsb2Nrcy5iZWdpbigpOyBpdCAh PSBvbGRCbG9ja3NFbmQ7ICsraXQpIHsKKyAgICAgICAgUmVuZGVyQmxvY2sqIGJsb2NrID0gaXQt PmtleTsKICAgICAgICAgUmVuZGVyQmxvY2tTZWxlY3Rpb25JbmZvKiBuZXdJbmZvID0gbmV3U2Vs ZWN0ZWRCbG9ja3MuZ2V0KGJsb2NrKTsKLSAgICAgICAgUmVuZGVyQmxvY2tTZWxlY3Rpb25JbmZv KiBvbGRJbmZvID0gaS0+dmFsdWUuZ2V0KCk7CisgICAgICAgIFJlbmRlckJsb2NrU2VsZWN0aW9u SW5mbyogb2xkSW5mbyA9IGl0LT52YWx1ZS5nZXQoKTsKICAgICAgICAgaWYgKCFuZXdJbmZvIHx8 IG9sZEluZm8tPnJlY3RzKCkgIT0gbmV3SW5mby0+cmVjdHMoKSB8fCBvbGRJbmZvLT5zdGF0ZSgp ICE9IG5ld0luZm8tPnN0YXRlKCkpIHsKICAgICAgICAgICAgIG9sZEluZm8tPnJlcGFpbnQoKTsK ICAgICAgICAgICAgIGlmIChuZXdJbmZvKSB7CkBAIC0xMDU1LDkgKzEwNzEsOSBAQCB2b2lkIFJl bmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3VidHJlZVJvb3QmIHJvb3Qs IFJlbmRlck9iamVjdCogcwogICAgIH0KIAogICAgIC8vIEFueSBuZXcgYmxvY2tzIHRoYXQgcmVt YWluIHdlcmUgbm90IGZvdW5kIGluIHRoZSBvbGQgYmxvY2tzIGRpY3QsIGFuZCBzbyB0aGV5IG5l ZWQgdG8gYmUgdXBkYXRlZC4KLSAgICBTZWxlY3RlZEJsb2NrTWFwOjppdGVyYXRvciBuZXdCbG9j a3NFbmQgPSBuZXdTZWxlY3RlZEJsb2Nrcy5lbmQoKTsKLSAgICBmb3IgKFNlbGVjdGVkQmxvY2tN YXA6Oml0ZXJhdG9yIGkgPSBuZXdTZWxlY3RlZEJsb2Nrcy5iZWdpbigpOyBpICE9IG5ld0Jsb2Nr c0VuZDsgKytpKQotICAgICAgICBpLT52YWx1ZS0+cmVwYWludCgpOworICAgIGF1dG8gbmV3Qmxv Y2tzRW5kID0gbmV3U2VsZWN0ZWRCbG9ja3MuZW5kKCk7CisgICAgZm9yIChhdXRvIGl0ID0gbmV3 U2VsZWN0ZWRCbG9ja3MuYmVnaW4oKTsgaXQgIT0gbmV3QmxvY2tzRW5kOyArK2l0KQorICAgICAg ICBpdC0+dmFsdWUtPnJlcGFpbnQoKTsKIH0KIAogdm9pZCBSZW5kZXJWaWV3OjpnZXRTZWxlY3Rp b24oUmVuZGVyT2JqZWN0KiYgc3RhcnRSZW5kZXJlciwgaW50JiBzdGFydE9mZnNldCwgUmVuZGVy T2JqZWN0KiYgZW5kUmVuZGVyZXIsIGludCYgZW5kT2Zmc2V0KSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmgKaW5kZXggMGMyNmI2OC4uNGVkNjgzMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCkBAIC0zMDQsNyArMzA0LDkgQEAgcHJpdmF0ZToKICAg ICBmcmllbmQgY2xhc3MgTGF5b3V0U3RhdGVEaXNhYmxlcjsKIAogICAgIHZvaWQgc3BsaXRTZWxl Y3Rpb25CZXR3ZWVuU3VidHJlZXMoUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBS ZW5kZXJPYmplY3QqIGVuZCwgaW50IGVuZFBvcywgU2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tS ZXBhaW50TW9kZSk7Ci0gICAgdm9pZCBzZXRTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlvblN1YnRy ZWVSb290JiwgUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3Qq IGVuZCwgaW50IGVuZFBvcywgU2VsZWN0aW9uUmVwYWludE1vZGUpOworICAgIHZvaWQgY2xlYXJT dWJ0cmVlU2VsZWN0aW9uKGNvbnN0IFNlbGVjdGlvblN1YnRyZWVSb290JiwgU2VsZWN0aW9uUmVw YWludE1vZGUsIE9sZFNlbGVjdGlvbkRhdGEmKTsKKyAgICB2b2lkIHVwZGF0ZVNlbGVjdGlvbkZv clN1YnRyZWVzKFJlbmRlclN1YnRyZWVzTWFwJiwgU2VsZWN0aW9uUmVwYWludE1vZGUpOworICAg IHZvaWQgYXBwbHlTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlvblN1YnRyZWVSb290JiwgUmVuZGVy T2JqZWN0KiBzdGFydCwgUmVuZGVyT2JqZWN0KiBlbmQsIGludCBlbmRQb3MsIFNlbGVjdGlvblJl cGFpbnRNb2RlLCBjb25zdCBPbGRTZWxlY3Rpb25EYXRhJik7CiAgICAgTGF5b3V0UmVjdCBzdWJ0 cmVlU2VsZWN0aW9uQm91bmRzKGNvbnN0IFNlbGVjdGlvblN1YnRyZWVSb290JiwgYm9vbCBjbGlw VG9WaXNpYmxlQ29udGVudCA9IHRydWUpIGNvbnN0OwogICAgIHZvaWQgcmVwYWludFN1YnRyZWVT ZWxlY3Rpb24oY29uc3QgU2VsZWN0aW9uU3VidHJlZVJvb3QmKSBjb25zdDsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NlbGVjdGlvblN1YnRyZWVSb290LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TZWxlY3Rpb25TdWJ0cmVlUm9vdC5jcHAKaW5kZXggNWNm ZDNmYy4uZmFmYWVlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NlbGVj dGlvblN1YnRyZWVSb290LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2VsZWN0 aW9uU3VidHJlZVJvb3QuY3BwCkBAIC00NSw2ICs0NSwxNCBAQCBTZWxlY3Rpb25TdWJ0cmVlUm9v dDo6U2VsZWN0aW9uU3VidHJlZVJvb3QoKQogewogfQogCitTZWxlY3Rpb25TdWJ0cmVlUm9vdDo6 U2VsZWN0aW9uU3VidHJlZVJvb3QoUmVuZGVyT2JqZWN0KiBzZWxlY3Rpb25TdGFydCwgaW50IHNl bGVjdGlvblN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIHNlbGVjdGlvbkVuZCwgaW50IHNlbGVjdGlv bkVuZFBvcykKKyAgICA6IG1fc2VsZWN0aW9uU3RhcnQoc2VsZWN0aW9uU3RhcnQpCisgICAgLCBt X3NlbGVjdGlvblN0YXJ0UG9zKHNlbGVjdGlvblN0YXJ0UG9zKQorICAgICwgbV9zZWxlY3Rpb25F bmQoc2VsZWN0aW9uRW5kKQorICAgICwgbV9zZWxlY3Rpb25FbmRQb3Moc2VsZWN0aW9uRW5kUG9z KQoreworfQorCiB2b2lkIFNlbGVjdGlvblN1YnRyZWVSb290OjphZGp1c3RGb3JWaXNpYmxlU2Vs ZWN0aW9uKERvY3VtZW50JiBkb2N1bWVudCkKIHsKICAgICBpZiAoc2VsZWN0aW9uQ2xlYXIoKSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TZWxlY3Rpb25TdWJ0cmVlUm9v dC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NlbGVjdGlvblN1YnRyZWVSb290LmgKaW5k ZXggMzVjZWYxMS4uNDJjNWM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NlbGVjdGlvblN1YnRyZWVSb290LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Nl bGVjdGlvblN1YnRyZWVSb290LmgKQEAgLTMxLDYgKzMxLDcgQEAKICNkZWZpbmUgU2VsZWN0aW9u U3VidHJlZVJvb3RfaAogCiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCisjaW5jbHVkZSAiUmVu ZGVyU2VsZWN0aW9uSW5mby5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTM4LDggKzM5 LDI4IEBAIGNsYXNzIERvY3VtZW50OwogCiBjbGFzcyBTZWxlY3Rpb25TdWJ0cmVlUm9vdCB7CiBw dWJsaWM6CisgICAgCisgICAgdHlwZWRlZiBIYXNoTWFwPFJlbmRlck9iamVjdCosIHN0ZDo6dW5p cXVlX3B0cjxSZW5kZXJTZWxlY3Rpb25JbmZvPj4gU2VsZWN0ZWRPYmplY3RNYXA7CisgICAgdHlw ZWRlZiBIYXNoTWFwPFJlbmRlckJsb2NrKiwgc3RkOjp1bmlxdWVfcHRyPFJlbmRlckJsb2NrU2Vs ZWN0aW9uSW5mbz4+IFNlbGVjdGVkQmxvY2tNYXA7CisgICAgdHlwZWRlZiBIYXNoTWFwPFNlbGVj dGlvblN1YnRyZWVSb290KiwgU2VsZWN0aW9uU3VidHJlZVJvb3Q+IFJlbmRlclN1YnRyZWVzTWFw OworCisgICAgc3RydWN0IE9sZFNlbGVjdGlvbkRhdGEgeworICAgICAgICBPbGRTZWxlY3Rpb25E YXRhKCkKKyAgICAgICAgICAgIDogc2VsZWN0aW9uU3RhcnRQb3MoLTEpCisgICAgICAgICAgICAs IHNlbGVjdGlvbkVuZFBvcygtMSkKKyAgICAgICAgeworICAgICAgICB9CisKKyAgICAgICAgaW50 IHNlbGVjdGlvblN0YXJ0UG9zOworICAgICAgICBpbnQgc2VsZWN0aW9uRW5kUG9zOworICAgICAg ICBTZWxlY3RlZE9iamVjdE1hcCBzZWxlY3RlZE9iamVjdHM7CisgICAgICAgIFNlbGVjdGVkQmxv Y2tNYXAgc2VsZWN0ZWRCbG9ja3M7CisgICAgfTsKKyAgICAKKyAgICB0eXBlZGVmIEhhc2hNYXA8 U2VsZWN0aW9uU3VidHJlZVJvb3QqLCBzdGQ6OnVuaXF1ZV9wdHI8T2xkU2VsZWN0aW9uRGF0YT4+ IFN1YnRyZWVPbGRTZWxlY3Rpb25EYXRhTWFwOwogCiAgICAgU2VsZWN0aW9uU3VidHJlZVJvb3Qo KTsKKyAgICBTZWxlY3Rpb25TdWJ0cmVlUm9vdChSZW5kZXJPYmplY3QqIHNlbGVjdGlvblN0YXJ0 LCBpbnQgc2VsZWN0aW9uU3RhcnRQb3MsIFJlbmRlck9iamVjdCogc2VsZWN0aW9uRW5kLCBpbnQg c2VsZWN0aW9uRW5kUG9zKTsKIAogICAgIFJlbmRlck9iamVjdCogc2VsZWN0aW9uU3RhcnQoKSBj b25zdCB7IHJldHVybiBtX3NlbGVjdGlvblN0YXJ0OyB9CiAgICAgaW50IHNlbGVjdGlvblN0YXJ0 UG9zKCkgY29uc3QgeyByZXR1cm4gbV9zZWxlY3Rpb25TdGFydFBvczsgfQo=