135337 2014-07-28 04:06:17 -0700 Selection problem 2014-07-28 05:08:18 -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 1025126 0 stavila 2014-07-28 04:06:17 -0700 Selection problem 1025127 1 235592 stavila 2014-07-28 04:06:36 -0700 Created attachment 235592 WIP 1025128 2 commit-queue 2014-07-28 04:08:32 -0700 Attachment 235592 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. 235592 2014-07-28 04:06:36 -0700 2014-07-28 04:06:36 -0700 WIP 134303.patch text/plain 24376 stavila ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjY2YxYzNlLi5hOTkxNzlkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDct MjggIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIxNjkxMDUpOiBDcmFzaCBpbiBzZWxlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDMwMworCisgICAgICAgIEFkZGVkIHRlc3QgZm9y IHRoZSBjcmFzaCB0aGF0IG9jY3VycmVkIGluIHNvbWUgY2FzZXMgd2hlbiBzZWxlY3RpbmcuCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3Jl Z2lvbnMvc2VsZWN0aW9uL2NyYXNoLWRlc2VsZWN0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogZmFzdC9yZWdpb25zL3NlbGVjdGlvbi9jcmFzaC1kZXNlbGVjdC5odG1sOiBBZGRlZC4K KwogMjAxNC0wNy0yNyAgQnJ1bm8gZGUgT2xpdmVpcmEgQWJpbmFkZXIgIDxicnVuby5kQHBhcnRu ZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAgU3VwcG9ydCBmb3IgOmVuYWJsZWQgc2VsZWN0b3Ig b24gQW5jaG9yICYgQXJlYSBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9y ZWdpb25zL3NlbGVjdGlvbi9jcmFzaC1kZXNlbGVjdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L3JlZ2lvbnMvc2VsZWN0aW9uL2NyYXNoLWRlc2VsZWN0LWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40ZjIxZTIxCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3NlbGVjdGlvbi9jcmFzaC1kZXNlbGVjdC1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitDT05TT0xFIE1FU1NBR0U6IGxpbmUgNjY6IEhpZXJh cmNoeVJlcXVlc3RFcnJvcjogRE9NIEV4Y2VwdGlvbiAzOiBBIE5vZGUgd2FzIGluc2VydGVkIHNv bWV3aGVyZSBpdCBkb2Vzbid0IGJlbG9uZy4KKworRXJybG9nIHNlbGVjdGlvblRlc3Q6IEhpZXJh cmNoeVJlcXVlc3RFcnJvcjogSGllcmFyY2h5UmVxdWVzdEVycm9yOiBET00gRXhjZXB0aW9uIDMg OiBpbmRleCAxIAorRXJybG9nIHdlYnRlc3RfZm5fMjQ6IAorCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L3JlZ2lvbnMvc2VsZWN0aW9uL2NyYXNoLWRlc2VsZWN0Lmh0bWwgYi9MYXlvdXRU ZXN0cy9mYXN0L3JlZ2lvbnMvc2VsZWN0aW9uL2NyYXNoLWRlc2VsZWN0Lmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTFhOTI0OAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zZWxlY3Rpb24vY3Jhc2gtZGVzZWxlY3QuaHRtbApAQCAt MCwwICsxLDcyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sIGlkPSJ3ZWJ0ZXN0MCI+CisgICAg PGhlYWQgaWQ9IndlYnRlc3QxIj4KKyAgICAgICAgPHN0eWxlIGlkPSJ3ZWJ0ZXN0MiI+PC9zdHls ZT4KKyAgICAgICAgPHN0eWxlPgorICAgICAgICAgICAgOmxhc3QtY2hpbGQgeyAtd2Via2l0LWZs b3ctaW50bzogZm9vOyB9CisgICAgICAgIDwvc3R5bGU+CisgICAgICAgIAorICAgIDwvaGVhZD4K KyAgICA8Ym9keSBpZD0id2VidGVzdDMiPgorICAgICAgICA8c2NyaXB0IGlkPSJleGFtcGxlIj48 L3NjcmlwdD4KKworICAgICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgICAg ICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgdGVzdFJ1bm5l ci5kdW1wQXNUZXh0KGZhbHNlKTsKKyAgICAgICAgPC9zY3JpcHQ+CisKKyAgICAgICAgPHNjcmlw dD4KKyAgICAgICAgICAgIHZhciBuZXdfZWxlbSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNh bnZhcyIpOworICAgICAgICAgICAgbmV3X2VsZW0uc2V0QXR0cmlidXRlKCJpZCIsICJ3ZWJ0ZXN0 MTEiKTsKKyAgICAgICAgICAgIGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiN3ZWJ0ZXN0MCIpLmFw cGVuZENoaWxkKG5ld19lbGVtKTsKKworICAgICAgICAgICAgZG9jdW1lbnQud3JpdGUoIjxicj48 c3VtbWFyeT4iKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgICAgIDxzdW1tYXJ5PgorICAgICAg ICAgICAgPG1hdGhtbCBpZD0id2VidGVzdDEyIj4KKyAgICAgICAgICAgICAgICA8ZmVtZXJnZT48 L2ZlbWVyZ2U+CisgICAgICAgICAgICA8L21hdGhtbD4KKworICAgICAgICAgICAgPHNjcmlwdD4K KyAgICAgICAgICAgICAgICBmdW5jdGlvbiBzZWxlY3Rpb25UZXN0KCkgeworICAgICAgICAgICAg ICAgICAgICB0cnkgeworICAgICAgICAgICAgICAgICAgICAgICAgd2ZfaSA9IDA7CisgICAgICAg ICAgICAgICAgICAgICAgICBmb3IgKDsgd2ZfaTw0MDsgd2ZfaSsrKSB7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdmFyIHJhbmdlID0gZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKKworICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJhbmdlLnNldFN0YXJ0QmVmb3JlKGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJ3ZWJ0ZXN0MyIpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBy YW5nZS5zZXRFbmRBZnRlcihkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgid2VidGVzdDIiKSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmFuZ2UuZGVsZXRlQ29udGVudHMoKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YXIg bWFya0VsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgid2VidGVzdDEiKS5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50TlMoIiIsICJtYXJrIikpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJhbmdlLnNldFN0YXJ0QWZ0ZXIobWFya0VsZW1lbnQpOworCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGFwcGxldEVsZW1lbnQgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiZXhhbXBsZSIpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImFwcGxldCIpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByYW5nZS5zZXRFbmRBZnRl cihhcHBsZXRFbGVtZW50KTsKKworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJhbmdlLmlu c2VydE5vZGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImV4YW1wbGUiKSk7CisgICAgICAgICAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIH0gY2F0Y2goZSkgeworICAgICAg ICAgICAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKCJFcnJsb2cgc2VsZWN0aW9uVGVzdDogIiAr IGUubmFtZSArICI6ICIgKyBlLm1lc3NhZ2UgKyAiIDogaW5kZXggIiArIHdmX2kgKyAiIDxicj48 dGFibGUvPiIpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgIHNlbGVjdGlvblRlc3QoKTsKKyAgICAgICAgICAgIDwvc2NyaXB0PgorICAg ICAgICAgICAgPHN1Yj4KKworICAgICAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgICAgICBk b2N1bWVudC5kZXNpZ25Nb2RlID0gIm9uIjsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5leGVj Q29tbWFuZCgiU2VsZWN0QWxsIik7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQud3JpdGUoIkVy cmxvZyB3ZWJ0ZXN0X2ZuXzI0OiA8YnI+PG5vYnI+Iik7CisKKyAgICAgICAgICAgICAgICB2YXIg ZmVtZXJnZUVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgid2VidGVzdDEyIikuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZmVtZXJnZSIpKTsKKyAgICAgICAgICAg ICAgICB2YXIgYXBwbGV0RWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJleGFtcGxl IikuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYXBwbGV0IikpOworICAgICAg ICAgICAgICAgIHZhciBncmFkaWVudEVsZW1lbnQgPSBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImdyYWRpZW50IikpOworICAgICAgICAgICAgICAgICAg ICAgICAgCisgICAgICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIndlYnRlc3Qy IikuaXNFcXVhbE5vZGUoZmVtZXJnZUVsZW1lbnQuaW5zZXJ0QmVmb3JlKGRvY3VtZW50LmRvY3Vt ZW50RWxlbWVudCwgZ3JhZGllbnRFbGVtZW50KSk7CisgICAgICAgICAgICA8L3NjcmlwdD4KKwor ICAgICAgICAgICAgPHRhYmxlPjwvdGFibGU+CisgICAgICAgIDwvc3VtbWFyeT4KKyAgICA8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWE1Zjg5ZS4uYjU4NjY3ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM2IEBACisyMDE0LTA3LTI4ICBSYWR1IFN0YXZpbGEgIDxzdGF2aWxhQGFkb2Jl LmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTY5MTA1KTogQ3Jhc2ggaW4gc2VsZWN0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQzMDMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHNw bGl0dGluZyB0aGUgc2VsZWN0aW9uIGJldHdlZW4gZGlmZmVyZW50IHN1YnRyZWVzLCBhbGwgc3Vi dHJlZXMgbXVzdCBoYXZlIHRoZWlyIHNlbGVjdGlvbiBjbGVhcmVkIGJlZm9yZQorICAgICAgICBz dGFydGluZyB0byBhcHBseSB0aGUgbmV3IHNlbGVjdGlvbi4gT3RoZXJ3aXNlLCB3aGVuIHNlbGVj dGluZyBvYmplY3RzIGluIGEgbmFtZWQgZmxvdyB0aHJlYWQgYW5kIGdvaW5nIHVwCisgICAgICAg IGl0cyBjb250YWluaW5nIGJsb2NrIGNoYWluLCB3ZSBjYW4gZW5kIHVwIGluIHRoZSB2aWV3J3Mg c2VsZWN0aW9uIHJvb3QsIHdoaWNoIGhhcyBub3QgeWV0IGJlZW4gdXBkYXRlZCBhbmQgc28KKyAg ICAgICAgd2UgZ2V0IGluY29uc2lzdGVudCBkYXRhLgorCisgICAgICAgIFRvIGFjaGlldmUgdGhp cyBnb2FsLCB0aGUgc2VsZWN0aW9uIHVwZGF0ZSB3YXMgc3BsaXQgaW50byBhICJjbGVhciIgYW5k IGFuICJhcHBseSIgbWV0aG9kLiBUaGUgdXBkYXRlU2VsZWN0aW9uRm9yU3VidHJlZXMKKyAgICAg ICAgbWV0aG9kIGZpcnN0IGl0ZXJhdGVzIHRocm91Z2ggYWxsIHN1YnRyZWVzIGFuZCBwZXJmb3Jt cyB0aGUgImNsZWFyIiBtZXRob2QgYW5kIHRoZW4gc3RhcnRzIGFsbCBvdmVyIGFnYWluCisgICAg ICAgIGFuZCBwZXJmb3JtcyB0aGUgImFwcGx5IiBtZXRob2QuCisKKyAgICAgICAgVGVzdDogZmFz dC9yZWdpb25zL3NlbGVjdGlvbi9jcmFzaC1kZXNlbGVjdC5odG1sCisKKyAgICAgICAgKiBXZWJD b3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clNlbGVjdGlvbkluZm8uaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpzZXRTZWxlY3Rpb24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVmlldzo6c3BsaXRTZWxlY3Rpb25CZXR3ZWVuU3VidHJlZXMpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6dXBkYXRlU2VsZWN0aW9uRm9yU3VidHJlZXMpOiBBZGRl ZCwgY2xlYXJzIGFuZCByZS1hcHBsaWVzIHNlbGVjdGlvbiBmb3IgYWxsIHNlbGVjdGlvbiBzdWJ0 cmVlcy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OmNsZWFyU3VidHJlZVNlbGVjdGlv bik6IEFkZGVkLCBjbGVhcnMgc2VsZWN0aW9uIGFuZCByZXR1cm5zIHByZXZpb3VzbHkgc2VsZWN0 ZWQgaW5mb3JtYXRpb24uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjphcHBseVN1YnRy ZWVTZWxlY3Rpb24pOiBBZGRlZCwgdXBkYXRlcyB0aGUgc2VsZWN0aW9uIHN0YXR1cyBvZiBhbGwg b2JqZWN0cyBpbnNpZGUgdGhlIHNlbGVjdGlvbiB0cmVlLCBjb21wYXJlcyBvbGQgYW5kIG5ldyBk YXRhIGFuZCByZXBhaW50cyBhY2NvcmRpbmdseS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZp ZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24pOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJWaWV3Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1NlbGVjdGlvblN1YnRyZWVSb290LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdGlvblN1YnRyZWVSb290OjpTZWxlY3Rpb25TdWJ0 cmVlUm9vdCk6CisgICAgICAgICogcmVuZGVyaW5nL1NlbGVjdGlvblN1YnRyZWVSb290Lmg6Cisg ICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25TdWJ0cmVlUm9vdDo6T2xkU2VsZWN0aW9uRGF0YTo6 T2xkU2VsZWN0aW9uRGF0YSk6CisKIDIwMTQtMDctMjcgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9p QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJlbW92ZSBHcmFwaGljc1N1cmZhY2VHTFguY3BwCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5k ZXggMmIyNGFiOC4uOWEwOTM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNDY2LDcgKzQ2Niw3IEBACiAJCTBGMDkwODdGMTQ0 NEZEQjIwMDAyODkxNyAvKiBTY3JvbGxiYXJUaGVtZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRkU3MTQxNTE0MjE4OUZDMDBEQjMzQkEgLyogU2Ny b2xsYmFyVGhlbWUuY3BwICovOyB9OwogCQkwRjA5OUQwODE3Qjk2OEExMDBGRjg0QjkgLyogV2Vi Q29yZVR5cGVkQXJyYXlDb250cm9sbGVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDBGMDk5RDA2MTdCOTY4QTEwMEZGODRCOSAvKiBXZWJDb3JlVHlw ZWRBcnJheUNvbnRyb2xsZXIuY3BwICovOyB9OwogCQkwRjA5OUQwOTE3Qjk2OEExMDBGRjg0Qjkg LyogV2ViQ29yZVR5cGVkQXJyYXlDb250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjA5OUQwNzE3Qjk2OEExMDBGRjg0QjkgLyogV2ViQ29y ZVR5cGVkQXJyYXlDb250cm9sbGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJp dmF0ZSwgKTsgfTsgfTsKLQkJMEYxMUE1NEYwRjM5MjMzMTAwQzM3ODg0IC8qIFJlbmRlclNlbGVj dGlvbkluZm8uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDBGMTFBNTRFMEYzOTIzMzEwMEMzNzg4NCAvKiBSZW5kZXJTZWxlY3Rpb25JbmZvLmggKi87IH07 CisJCTBGMTFBNTRGMEYzOTIzMzEwMEMzNzg4NCAvKiBSZW5kZXJTZWxlY3Rpb25JbmZvLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjExQTU0RTBGMzky MzMxMDBDMzc4ODQgLyogUmVuZGVyU2VsZWN0aW9uSW5mby5oICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTBGMTMxNjNFMTZFRDBDQzgwMDM1Q0MwNCAv KiBQbGF0Zm9ybUNBRmlsdGVycy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMEYxMzE2M0QxNkVEMENDODAwMzVDQzA0IC8qIFBsYXRmb3JtQ0FGaWx0ZXJz LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMEYx MzE2NDAxNkVEMENERTAwMzVDQzA0IC8qIFBsYXRmb3JtQ0FGaWx0ZXJzTWFjLm1tIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYxMzE2M0YxNkVEMENERTAw MzVDQzA0IC8qIFBsYXRmb3JtQ0FGaWx0ZXJzTWFjLm1tICovOyB9OwogCQkwRjE1REE4QTBGM0FB RUU3MDAwMENFNDcgLyogQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGMTVEQTg5MEYzQUFFRTcwMDAwQ0U0 NyAvKiBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZS5oICovOyB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNlbGVjdGlvbkluZm8uaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJTZWxlY3Rpb25JbmZvLmgKaW5kZXggNDZlODg2Zi4uOTNhZTdk OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNlbGVjdGlvbklu Zm8uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2VsZWN0aW9uSW5mby5o CkBAIC0yNSw4ICsyNSw5IEBACiAjaWZuZGVmIFJlbmRlclNlbGVjdGlvbkluZm9faAogI2RlZmlu ZSBSZW5kZXJTZWxlY3Rpb25JbmZvX2gKIAorI2luY2x1ZGUgIkdhcFJlY3RzLmgiCiAjaW5jbHVk ZSAiSW50UmVjdC5oIgotI2luY2x1ZGUgIlJlbmRlckJveC5oIgorI2luY2x1ZGUgIlJlbmRlckJs b2NrLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGV4dC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXggN2I5OThiNi4uMmIxMTBi MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcApAQCAtODU3LDcgKzg1 Nyw5IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0aW9uKFJlbmRlck9iamVjdCogc3RhcnQs IGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlCiAKICAgICAvLyBJZiB0aGVyZSBpcyBubyBS ZW5kZXJOYW1lZEZsb3dUaHJlYWRzIHdlIGZvbGxvdyB0aGUgcmVndWxhciBzZWxlY3Rpb24uCiAg ICAgaWYgKCFoYXNSZW5kZXJOYW1lZEZsb3dUaHJlYWRzKCkpIHsKLSAgICAgICAgc2V0U3VidHJl ZVNlbGVjdGlvbigqdGhpcywgc3RhcnQsIHN0YXJ0UG9zLCBlbmQsIGVuZFBvcywgYmxvY2tSZXBh aW50TW9kZSk7CisgICAgICAgIFJlbmRlclN1YnRyZWVzTWFwIHNpbmdsZVN1YnRyZWVNYXA7Cisg ICAgICAgIHNpbmdsZVN1YnRyZWVNYXAuc2V0KHRoaXMsIFNlbGVjdGlvblN1YnRyZWVSb290KHN0 YXJ0LCBzdGFydFBvcywgZW5kLCBlbmRQb3MpKTsKKyAgICAgICAgdXBkYXRlU2VsZWN0aW9uRm9y U3VidHJlZXMoc2luZ2xlU3VidHJlZU1hcCwgYmxvY2tSZXBhaW50TW9kZSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKQEAgLTg2Nyw3ICs4NjksNiBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFNl bGVjdGlvbihSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCog ZQogdm9pZCBSZW5kZXJWaWV3OjpzcGxpdFNlbGVjdGlvbkJldHdlZW5TdWJ0cmVlcyhSZW5kZXJP YmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCogZW5kLCBpbnQgZW5kUG9z LCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFpbnRNb2RlKQogewogICAgIC8vIENvbXB1 dGUgdGhlIHZpc2libGUgc2VsZWN0aW9uIGVuZCBwb2ludHMgZm9yIGVhY2ggb2YgdGhlIHN1YnRy ZWVzLgotICAgIHR5cGVkZWYgSGFzaE1hcDxTZWxlY3Rpb25TdWJ0cmVlUm9vdCosIFNlbGVjdGlv blN1YnRyZWVSb290PiBSZW5kZXJTdWJ0cmVlc01hcDsKICAgICBSZW5kZXJTdWJ0cmVlc01hcCBy ZW5kZXJTdWJ0cmVlc01hcDsKIAogICAgIFNlbGVjdGlvblN1YnRyZWVSb290IGluaXRpYWxTZWxl Y3Rpb247CkBAIC05MDEsMzMgKzkwMiw1NSBAQCB2b2lkIFJlbmRlclZpZXc6OnNwbGl0U2VsZWN0 aW9uQmV0d2VlblN1YnRyZWVzKFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcwogICAg ICAgICAgICAgcmVuZGVyU3VidHJlZXNNYXAuc2V0KCZyb290LCBzZWxlY3Rpb25EYXRhKTsKICAg ICAgICAgfQogICAgIH0KKyAgICAKKyAgICB1cGRhdGVTZWxlY3Rpb25Gb3JTdWJ0cmVlcyhyZW5k ZXJTdWJ0cmVlc01hcCwgYmxvY2tSZXBhaW50TW9kZSk7Cit9CisKK3ZvaWQgUmVuZGVyVmlldzo6 dXBkYXRlU2VsZWN0aW9uRm9yU3VidHJlZXMoUmVuZGVyU3VidHJlZXNNYXAmIHJlbmRlclN1YnRy ZWVzTWFwLCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFpbnRNb2RlKQoreworICAgIFN1 YnRyZWVPbGRTZWxlY3Rpb25EYXRhTWFwIG9sZFNlbGVjdGlvbkRhdGFNYXA7CisgICAgZm9yIChh dXRvIGl0ID0gcmVuZGVyU3VidHJlZXNNYXAuYmVnaW4oKTsgaXQgIT0gcmVuZGVyU3VidHJlZXNN YXAuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgU2VsZWN0aW9uU3VidHJlZVJvb3QmIHN1YnRyZWVT ZWxlY3Rpb25EYXRhID0gaXQtPnZhbHVlOworCisgICAgICAgIC8vIEZJWE1FOiBJIHRoaW5rIHRo aXMgc2hvdWxkIGFsc28gYmUgdXNlZCBmb3IgdGhlIG5vLWZsb3ctdGhyZWFkcyBzY2VuYXJpbyBi dXQKKyAgICAgICAgLy8gaXQgY2F1c2VzIGZhc3QvZG9tL0hUTUxPYmplY3RFbGVtZW50L2JlZm9y ZWxvYWQtc2V0LXRleHQtY3Jhc2gueGh0bWwgdG8gY3Jhc2guCisgICAgICAgIC8vIEkgYmVsaWV2 ZSBpZiB0aGF0IHRlc3Qgd2FzIG1vZGlmaWVkIHRvIHVzZSBmbG93IHRocmVhZHMsIGl0IHdvdWxk IGFsc28gY3Jhc2guCisgICAgICAgIC8vIEZvciBtb3JlIGRldGFpbHM6IGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUxNTcKKyAgICAgICAgaWYgKGhhc1JlbmRlck5h bWVkRmxvd1RocmVhZHMoKSkKKyAgICAgICAgICAgIHN1YnRyZWVTZWxlY3Rpb25EYXRhLmFkanVz dEZvclZpc2libGVTZWxlY3Rpb24oZG9jdW1lbnQoKSk7CiAKLSAgICBmb3IgKFJlbmRlclN1YnRy ZWVzTWFwOjppdGVyYXRvciBpID0gcmVuZGVyU3VidHJlZXNNYXAuYmVnaW4oKTsgaSAhPSByZW5k ZXJTdWJ0cmVlc01hcC5lbmQoKTsgKytpKSB7Ci0gICAgICAgIFNlbGVjdGlvblN1YnRyZWVSb290 IHN1YnRyZWVTZWxlY3Rpb25EYXRhID0gaS0+dmFsdWU7Ci0gICAgICAgIHN1YnRyZWVTZWxlY3Rp b25EYXRhLmFkanVzdEZvclZpc2libGVTZWxlY3Rpb24oZG9jdW1lbnQoKSk7Ci0gICAgICAgIHNl dFN1YnRyZWVTZWxlY3Rpb24oKmktPmtleSwgc3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0aW9u U3RhcnQoKSwgc3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uU3RhcnRQb3MoKSwKLSAgICAg ICAgICAgIHN1YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlvbkVuZCgpLCBzdWJ0cmVlU2VsZWN0 aW9uRGF0YS5zZWxlY3Rpb25FbmRQb3MoKSwgYmxvY2tSZXBhaW50TW9kZSk7CisgICAgICAgIHN0 ZDo6dW5pcXVlX3B0cjxPbGRTZWxlY3Rpb25EYXRhPiBvbGRTZWxlY3Rpb25EYXRhID0gc3RkOjpt YWtlX3VuaXF1ZTxPbGRTZWxlY3Rpb25EYXRhPigpOworICAgICAgICBjbGVhclN1YnRyZWVTZWxl Y3Rpb24oKml0LT5rZXksIGJsb2NrUmVwYWludE1vZGUsICpvbGRTZWxlY3Rpb25EYXRhKTsKKyAg ICAgICAgb2xkU2VsZWN0aW9uRGF0YU1hcC5zZXQoaXQtPmtleSwgV1RGOjptb3ZlKG9sZFNlbGVj dGlvbkRhdGEpKTsKKworICAgICAgICBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9vdCA9ICppdC0+ a2V5OworICAgICAgICByb290LnNldFNlbGVjdGlvblN0YXJ0KHN1YnRyZWVTZWxlY3Rpb25EYXRh LnNlbGVjdGlvblN0YXJ0KCkpOworICAgICAgICByb290LnNldFNlbGVjdGlvblN0YXJ0UG9zKHN1 YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlvblN0YXJ0UG9zKCkpOworICAgICAgICByb290LnNl dFNlbGVjdGlvbkVuZChzdWJ0cmVlU2VsZWN0aW9uRGF0YS5zZWxlY3Rpb25FbmQoKSk7CisgICAg ICAgIHJvb3Quc2V0U2VsZWN0aW9uRW5kUG9zKHN1YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlv bkVuZFBvcygpKTsKKyAgICB9CisKKyAgICAvLyBVcGRhdGUgc2VsZWN0aW9uIHN0YXR1cyBmb3Ig dGhlIG9iamVjdHMgaW5zaWRlIHRoZSBzZWxlY3Rpb24gc3VidHJlZXMuCisgICAgLy8gVGhpcyBu ZWVkcyB0byBiZSBkb25lIGFmdGVyIHRoZSBwcmV2aW91cyBsb29wIHVwZGF0ZWQgdGhlIHNlbGVj dGlvblN0YXJ0L0VuZAorICAgIC8vIHBhcmFtZXRlcnMgb2YgYWxsIHN1YnRyZWVzIGJlY2F1c2Ug d2UncmUgZ29pbmcgdG8gYmUgY2xpbWJpbmcgdXAgdGhlIGNvbnRhaW5pbmcKKyAgICAvLyBibG9j ayBjaGFpbiBhbmQgd2UgbWlnaHQgZW5kIHVwIGluIGEgZGlmZmVyZW50IHNlbGVjdGlvbiBzdWJ0 cmVlLgorICAgIGZvciAoYXV0byBpdCA9IHJlbmRlclN1YnRyZWVzTWFwLmJlZ2luKCk7IGl0ICE9 IHJlbmRlclN1YnRyZWVzTWFwLmVuZCgpOyArK2l0KSB7CisgICAgICAgIFNlbGVjdGlvblN1YnRy ZWVSb290IHN1YnRyZWVTZWxlY3Rpb25EYXRhID0gaXQtPnZhbHVlOworICAgICAgICBPbGRTZWxl Y3Rpb25EYXRhJiBvbGRTZWxlY3Rpb25EYXRhID0gKm9sZFNlbGVjdGlvbkRhdGFNYXAuZ2V0KGl0 LT5rZXkpOworICAgICAgICBhcHBseVN1YnRyZWVTZWxlY3Rpb24oKml0LT5rZXksIHN1YnRyZWVT ZWxlY3Rpb25EYXRhLnNlbGVjdGlvblN0YXJ0KCksIHN1YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVj dGlvbkVuZCgpLCBzdWJ0cmVlU2VsZWN0aW9uRGF0YS5zZWxlY3Rpb25FbmRQb3MoKSwgYmxvY2tS ZXBhaW50TW9kZSwgb2xkU2VsZWN0aW9uRGF0YSk7CiAgICAgfQogfQogCi12b2lkIFJlbmRlclZp ZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3VidHJlZVJvb3QmIHJvb3QsIFJlbmRl ck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlbmQsIGludCBlbmRQ b3MsIFNlbGVjdGlvblJlcGFpbnRNb2RlIGJsb2NrUmVwYWludE1vZGUpCit2b2lkIFJlbmRlclZp ZXc6OmNsZWFyU3VidHJlZVNlbGVjdGlvbihjb25zdCBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9v dCwgU2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSwgT2xkU2VsZWN0aW9uRGF0 YSYgb2xkU2VsZWN0aW9uRGF0YSkKIHsKICAgICAvLyBSZWNvcmQgdGhlIG9sZCBzZWxlY3RlZCBv YmplY3RzLiAgVGhlc2Ugd2lsbCBiZSB1c2VkIGxhdGVyCiAgICAgLy8gd2hlbiB3ZSBjb21wYXJl IGFnYWluc3QgdGhlIG5ldyBzZWxlY3RlZCBvYmplY3RzLgotICAgIGludCBvbGRTdGFydFBvcyA9 IHJvb3Quc2VsZWN0aW9uU3RhcnRQb3MoKTsKLSAgICBpbnQgb2xkRW5kUG9zID0gcm9vdC5zZWxl Y3Rpb25FbmRQb3MoKTsKLQotICAgIC8vIE9iamVjdHMgZWFjaCBoYXZlIGEgc2luZ2xlIHNlbGVj dGlvbiByZWN0IHRvIGV4YW1pbmUuCi0gICAgdHlwZWRlZiBIYXNoTWFwPFJlbmRlck9iamVjdCos IHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTZWxlY3Rpb25JbmZvPj4gU2VsZWN0ZWRPYmplY3RNYXA7 Ci0gICAgU2VsZWN0ZWRPYmplY3RNYXAgb2xkU2VsZWN0ZWRPYmplY3RzOwotICAgIFNlbGVjdGVk T2JqZWN0TWFwIG5ld1NlbGVjdGVkT2JqZWN0czsKLQorICAgIG9sZFNlbGVjdGlvbkRhdGEuc2Vs ZWN0aW9uU3RhcnRQb3MgPSByb290LnNlbGVjdGlvblN0YXJ0UG9zKCk7CisgICAgb2xkU2VsZWN0 aW9uRGF0YS5zZWxlY3Rpb25FbmRQb3MgPSByb290LnNlbGVjdGlvbkVuZFBvcygpOworICAgIAog ICAgIC8vIEJsb2NrcyBjb250YWluIHNlbGVjdGVkIG9iamVjdHMgYW5kIGZpbGwgZ2FwcyBiZXR3 ZWVuIHRoZW0sIGVpdGhlciBvbiB0aGUgbGVmdCwgcmlnaHQsIG9yIGluIGJldHdlZW4gbGluZXMg YW5kIGJsb2Nrcy4KICAgICAvLyBJbiBvcmRlciB0byBnZXQgdGhlIHJlcGFpbnQgcmVjdCByaWdo dCwgd2UgaGF2ZSB0byBleGFtaW5lIGxlZnQsIG1pZGRsZSwgYW5kIHJpZ2h0IHJlY3RzIGluZGl2 aWR1YWxseSwgc2luY2Ugb3RoZXJ3aXNlCiAgICAgLy8gdGhlIHVuaW9uIG9mIHRob3NlIHJlY3Rz IG1pZ2h0IHJlbWFpbiB0aGUgc2FtZSBldmVuIHdoZW4gY2hhbmdlcyBoYXZlIG9jY3VycmVkLgot ICAgIHR5cGVkZWYgSGFzaE1hcDxSZW5kZXJCbG9jayosIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJC bG9ja1NlbGVjdGlvbkluZm8+PiBTZWxlY3RlZEJsb2NrTWFwOwotICAgIFNlbGVjdGVkQmxvY2tN YXAgb2xkU2VsZWN0ZWRCbG9ja3M7Ci0gICAgU2VsZWN0ZWRCbG9ja01hcCBuZXdTZWxlY3RlZEJs b2NrczsKIAogICAgIFJlbmRlck9iamVjdCogb3MgPSByb290LnNlbGVjdGlvblN0YXJ0KCk7CiAg ICAgUmVuZGVyT2JqZWN0KiBzdG9wID0gcmVuZGVyZXJBZnRlclBvc2l0aW9uKHJvb3Quc2VsZWN0 aW9uRW5kKCksIHJvb3Quc2VsZWN0aW9uRW5kUG9zKCkpOwpAQCAtOTM2LDExICs5NTksMTEgQEAg dm9pZCBSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlvblN1YnRyZWVSb290 JiByb290LCBSZW5kZXJPYmplY3QqIHMKICAgICAgICAgaWYgKChvcy0+Y2FuQmVTZWxlY3Rpb25M ZWFmKCkgfHwgb3MgPT0gcm9vdC5zZWxlY3Rpb25TdGFydCgpIHx8IG9zID09IHJvb3Quc2VsZWN0 aW9uRW5kKCkpCiAgICAgICAgICAgICAmJiBvcy0+c2VsZWN0aW9uU3RhdGUoKSAhPSBTZWxlY3Rp b25Ob25lKSB7CiAgICAgICAgICAgICAvLyBCbG9ja3MgYXJlIHJlc3BvbnNpYmxlIGZvciBwYWlu dGluZyBsaW5lIGdhcHMgYW5kIG1hcmdpbiBnYXBzLiAgVGhleSBtdXN0IGJlIGV4YW1pbmVkIGFz IHdlbGwuCi0gICAgICAgICAgICBvbGRTZWxlY3RlZE9iamVjdHMuc2V0KG9zLCBzdGQ6Om1ha2Vf dW5pcXVlPFJlbmRlclNlbGVjdGlvbkluZm8+KG9zLCB0cnVlKSk7CisgICAgICAgICAgICBvbGRT ZWxlY3Rpb25EYXRhLnNlbGVjdGVkT2JqZWN0cy5zZXQob3MsIHN0ZDo6bWFrZV91bmlxdWU8UmVu ZGVyU2VsZWN0aW9uSW5mbz4ob3MsIHRydWUpKTsKICAgICAgICAgICAgIGlmIChibG9ja1JlcGFp bnRNb2RlID09IFJlcGFpbnROZXdYT1JPbGQpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJCbG9j ayogY2IgPSBvcy0+Y29udGFpbmluZ0Jsb2NrKCk7CiAgICAgICAgICAgICAgICAgd2hpbGUgKGNi ICYmICFjYi0+aXNSZW5kZXJWaWV3KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3RkOjp1bmlx dWVfcHRyPFJlbmRlckJsb2NrU2VsZWN0aW9uSW5mbz4mIGJsb2NrSW5mbyA9IG9sZFNlbGVjdGVk QmxvY2tzLmFkZChjYiwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOworICAgICAgICAgICAgICAg ICAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyQmxvY2tTZWxlY3Rpb25JbmZvPiYgYmxvY2tJbmZv ID0gb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3RlZEJsb2Nrcy5hZGQoY2IsIG51bGxwdHIpLml0ZXJh dG9yLT52YWx1ZTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGJsb2NrSW5mbykKICAgICAgICAg ICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBibG9ja0luZm8gPSBz dGQ6Om1ha2VfdW5pcXVlPFJlbmRlckJsb2NrU2VsZWN0aW9uSW5mbz4oY2IpOwpAQCAtOTUyLDE3 ICs5NzUsMTMgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlv blN1YnRyZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqIHMKICAgICAgICAgb3MgPSBzZWxlY3Rp b25JdGVyYXRvci5uZXh0KCk7CiAgICAgfQogCi0gICAgLy8gTm93IGNsZWFyIHRoZSBzZWxlY3Rp b24uCi0gICAgU2VsZWN0ZWRPYmplY3RNYXA6Oml0ZXJhdG9yIG9sZE9iamVjdHNFbmQgPSBvbGRT ZWxlY3RlZE9iamVjdHMuZW5kKCk7Ci0gICAgZm9yIChTZWxlY3RlZE9iamVjdE1hcDo6aXRlcmF0 b3IgaSA9IG9sZFNlbGVjdGVkT2JqZWN0cy5iZWdpbigpOyBpICE9IG9sZE9iamVjdHNFbmQ7ICsr aSkKKyAgICBhdXRvIG9sZE9iamVjdHNFbmQgPSBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGVkT2Jq ZWN0cy5lbmQoKTsKKyAgICBmb3IgKGF1dG8gaSA9IG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0ZWRP YmplY3RzLmJlZ2luKCk7IGkgIT0gb2xkT2JqZWN0c0VuZDsgKytpKQogICAgICAgICBpLT5rZXkt PnNldFNlbGVjdGlvblN0YXRlSWZOZWVkZWQoU2VsZWN0aW9uTm9uZSk7Cit9CiAKLSAgICAvLyBz ZXQgc2VsZWN0aW9uIHN0YXJ0IGFuZCBlbmQKLSAgICByb290LnNldFNlbGVjdGlvblN0YXJ0KHN0 YXJ0KTsKLSAgICByb290LnNldFNlbGVjdGlvblN0YXJ0UG9zKHN0YXJ0UG9zKTsKLSAgICByb290 LnNldFNlbGVjdGlvbkVuZChlbmQpOwotICAgIHJvb3Quc2V0U2VsZWN0aW9uRW5kUG9zKGVuZFBv cyk7Ci0KK3ZvaWQgUmVuZGVyVmlldzo6YXBwbHlTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlvblN1 YnRyZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqIHN0YXJ0LCBSZW5kZXJPYmplY3QqIGVuZCwg aW50IGVuZFBvcywgU2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSwgY29uc3Qg T2xkU2VsZWN0aW9uRGF0YSYgb2xkU2VsZWN0aW9uRGF0YSkKK3sKICAgICAvLyBVcGRhdGUgdGhl IHNlbGVjdGlvbiBzdGF0dXMgb2YgYWxsIG9iamVjdHMgYmV0d2VlbiBzZWxlY3Rpb25TdGFydCBh bmQgc2VsZWN0aW9uRW5kCiAgICAgaWYgKHN0YXJ0ICYmIHN0YXJ0ID09IGVuZCkKICAgICAgICAg c3RhcnQtPnNldFNlbGVjdGlvblN0YXRlSWZOZWVkZWQoU2VsZWN0aW9uQm90aCk7CkBAIC05NzQs OCArOTkzLDggQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlv blN1YnRyZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqIHMKICAgICB9CiAKICAgICBSZW5kZXJP YmplY3QqIG8gPSBzdGFydDsKLSAgICBzdG9wID0gcmVuZGVyZXJBZnRlclBvc2l0aW9uKGVuZCwg ZW5kUG9zKTsKLSAgICBzZWxlY3Rpb25JdGVyYXRvciA9IFNlbGVjdGlvbkl0ZXJhdG9yKG8pOwor ICAgIFJlbmRlck9iamVjdCogc3RvcCA9IHJlbmRlcmVyQWZ0ZXJQb3NpdGlvbihlbmQsIGVuZFBv cyk7CisgICAgU2VsZWN0aW9uSXRlcmF0b3Igc2VsZWN0aW9uSXRlcmF0b3Iobyk7CiAgICAgCiAg ICAgd2hpbGUgKG8gJiYgbyAhPSBzdG9wKSB7CiAgICAgICAgIGlmIChvICE9IHN0YXJ0ICYmIG8g IT0gZW5kICYmIG8tPmNhbkJlU2VsZWN0aW9uTGVhZigpKQpAQCAtOTg4LDYgKzEwMDcsOCBAQCB2 b2lkIFJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3VidHJlZVJvb3Qm IHJvb3QsIFJlbmRlck9iamVjdCogcwogCiAgICAgLy8gTm93IHRoYXQgdGhlIHNlbGVjdGlvbiBz dGF0ZSBoYXMgYmVlbiB1cGRhdGVkIGZvciB0aGUgbmV3IG9iamVjdHMsIHdhbGsgdGhlbSBhZ2Fp biBhbmQKICAgICAvLyBwdXQgdGhlbSBpbiB0aGUgbmV3IG9iamVjdHMgbGlzdC4KKyAgICBTZWxl Y3RlZE9iamVjdE1hcCBuZXdTZWxlY3RlZE9iamVjdHM7CisgICAgU2VsZWN0ZWRCbG9ja01hcCBu ZXdTZWxlY3RlZEJsb2NrczsKICAgICBvID0gc3RhcnQ7CiAgICAgc2VsZWN0aW9uSXRlcmF0b3Ig PSBTZWxlY3Rpb25JdGVyYXRvcihvKTsKICAgICB3aGlsZSAobyAmJiBvICE9IHN0b3ApIHsKQEAg LTEwMjIsMTMgKzEwNDMsMTQgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2VsZWN0aW9u KFNlbGVjdGlvblN1YnRyZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqIHMKICAgICAgICAgcmV0 dXJuOwogCiAgICAgLy8gSGF2ZSBhbnkgb2YgdGhlIG9sZCBzZWxlY3RlZCBvYmplY3RzIGNoYW5n ZWQgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24/Ci0gICAgZm9yIChTZWxlY3RlZE9iamVj dE1hcDo6aXRlcmF0b3IgaSA9IG9sZFNlbGVjdGVkT2JqZWN0cy5iZWdpbigpOyBpICE9IG9sZE9i amVjdHNFbmQ7ICsraSkgewotICAgICAgICBSZW5kZXJPYmplY3QqIG9iaiA9IGktPmtleTsKKyAg ICBhdXRvIG9sZE9iamVjdHNFbmQgPSBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGVkT2JqZWN0cy5l bmQoKTsKKyAgICBmb3IgKGF1dG8gaXQgPSBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGVkT2JqZWN0 cy5iZWdpbigpOyBpdCAhPSBvbGRPYmplY3RzRW5kOyArK2l0KSB7CisgICAgICAgIFJlbmRlck9i amVjdCogb2JqID0gaXQtPmtleTsKICAgICAgICAgUmVuZGVyU2VsZWN0aW9uSW5mbyogbmV3SW5m byA9IG5ld1NlbGVjdGVkT2JqZWN0cy5nZXQob2JqKTsKLSAgICAgICAgUmVuZGVyU2VsZWN0aW9u SW5mbyogb2xkSW5mbyA9IGktPnZhbHVlLmdldCgpOworICAgICAgICBSZW5kZXJTZWxlY3Rpb25J bmZvKiBvbGRJbmZvID0gaXQtPnZhbHVlLmdldCgpOwogICAgICAgICBpZiAoIW5ld0luZm8gfHwg b2xkSW5mby0+cmVjdCgpICE9IG5ld0luZm8tPnJlY3QoKSB8fCBvbGRJbmZvLT5zdGF0ZSgpICE9 IG5ld0luZm8tPnN0YXRlKCkKLSAgICAgICAgICAgIHx8IChyb290LnNlbGVjdGlvblN0YXJ0KCkg PT0gb2JqICYmIG9sZFN0YXJ0UG9zICE9IHJvb3Quc2VsZWN0aW9uU3RhcnRQb3MoKSkKLSAgICAg ICAgICAgIHx8IChyb290LnNlbGVjdGlvbkVuZCgpID09IG9iaiAmJiBvbGRFbmRQb3MgIT0gcm9v dC5zZWxlY3Rpb25FbmRQb3MoKSkpIHsKKyAgICAgICAgICAgIHx8IChyb290LnNlbGVjdGlvblN0 YXJ0KCkgPT0gb2JqICYmIG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uU3RhcnRQb3MgIT0gcm9v dC5zZWxlY3Rpb25TdGFydFBvcygpKQorICAgICAgICAgICAgfHwgKHJvb3Quc2VsZWN0aW9uRW5k KCkgPT0gb2JqICYmIG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uRW5kUG9zICE9IHJvb3Quc2Vs ZWN0aW9uRW5kUG9zKCkpKSB7CiAgICAgICAgICAgICBvbGRJbmZvLT5yZXBhaW50KCk7CiAgICAg ICAgICAgICBpZiAobmV3SW5mbykgewogICAgICAgICAgICAgICAgIG5ld0luZm8tPnJlcGFpbnQo KTsKQEAgLTEwMzgsMTYgKzEwNjAsMTYgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2Vs ZWN0aW9uKFNlbGVjdGlvblN1YnRyZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqIHMKICAgICB9 CiAKICAgICAvLyBBbnkgbmV3IG9iamVjdHMgdGhhdCByZW1haW4gd2VyZSBub3QgZm91bmQgaW4g dGhlIG9sZCBvYmplY3RzIGRpY3QsIGFuZCBzbyB0aGV5IG5lZWQgdG8gYmUgdXBkYXRlZC4KLSAg ICBTZWxlY3RlZE9iamVjdE1hcDo6aXRlcmF0b3IgbmV3T2JqZWN0c0VuZCA9IG5ld1NlbGVjdGVk T2JqZWN0cy5lbmQoKTsKLSAgICBmb3IgKFNlbGVjdGVkT2JqZWN0TWFwOjppdGVyYXRvciBpID0g bmV3U2VsZWN0ZWRPYmplY3RzLmJlZ2luKCk7IGkgIT0gbmV3T2JqZWN0c0VuZDsgKytpKQotICAg ICAgICBpLT52YWx1ZS0+cmVwYWludCgpOworICAgIGF1dG8gbmV3T2JqZWN0c0VuZCA9IG5ld1Nl bGVjdGVkT2JqZWN0cy5lbmQoKTsKKyAgICBmb3IgKGF1dG8gaXQgPSBuZXdTZWxlY3RlZE9iamVj dHMuYmVnaW4oKTsgaXQgIT0gbmV3T2JqZWN0c0VuZDsgKytpdCkKKyAgICAgICAgaXQtPnZhbHVl LT5yZXBhaW50KCk7CiAKICAgICAvLyBIYXZlIGFueSBvZiB0aGUgb2xkIGJsb2NrcyBjaGFuZ2Vk PwotICAgIFNlbGVjdGVkQmxvY2tNYXA6Oml0ZXJhdG9yIG9sZEJsb2Nrc0VuZCA9IG9sZFNlbGVj dGVkQmxvY2tzLmVuZCgpOwotICAgIGZvciAoU2VsZWN0ZWRCbG9ja01hcDo6aXRlcmF0b3IgaSA9 IG9sZFNlbGVjdGVkQmxvY2tzLmJlZ2luKCk7IGkgIT0gb2xkQmxvY2tzRW5kOyArK2kpIHsKLSAg ICAgICAgUmVuZGVyQmxvY2sqIGJsb2NrID0gaS0+a2V5OworICAgIGF1dG8gb2xkQmxvY2tzRW5k ID0gb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3RlZEJsb2Nrcy5lbmQoKTsKKyAgICBmb3IgKGF1dG8g aXQgPSBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGVkQmxvY2tzLmJlZ2luKCk7IGl0ICE9IG9sZEJs b2Nrc0VuZDsgKytpdCkgeworICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSBpdC0+a2V5Owog ICAgICAgICBSZW5kZXJCbG9ja1NlbGVjdGlvbkluZm8qIG5ld0luZm8gPSBuZXdTZWxlY3RlZEJs b2Nrcy5nZXQoYmxvY2spOwotICAgICAgICBSZW5kZXJCbG9ja1NlbGVjdGlvbkluZm8qIG9sZElu Zm8gPSBpLT52YWx1ZS5nZXQoKTsKKyAgICAgICAgUmVuZGVyQmxvY2tTZWxlY3Rpb25JbmZvKiBv bGRJbmZvID0gaXQtPnZhbHVlLmdldCgpOwogICAgICAgICBpZiAoIW5ld0luZm8gfHwgb2xkSW5m by0+cmVjdHMoKSAhPSBuZXdJbmZvLT5yZWN0cygpIHx8IG9sZEluZm8tPnN0YXRlKCkgIT0gbmV3 SW5mby0+c3RhdGUoKSkgewogICAgICAgICAgICAgb2xkSW5mby0+cmVwYWludCgpOwogICAgICAg ICAgICAgaWYgKG5ld0luZm8pIHsKQEAgLTEwNTgsOSArMTA4MCw5IEBAIHZvaWQgUmVuZGVyVmll dzo6c2V0U3VidHJlZVNlbGVjdGlvbihTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9vdCwgUmVuZGVy T2JqZWN0KiBzCiAgICAgfQogCiAgICAgLy8gQW55IG5ldyBibG9ja3MgdGhhdCByZW1haW4gd2Vy ZSBub3QgZm91bmQgaW4gdGhlIG9sZCBibG9ja3MgZGljdCwgYW5kIHNvIHRoZXkgbmVlZCB0byBi ZSB1cGRhdGVkLgotICAgIFNlbGVjdGVkQmxvY2tNYXA6Oml0ZXJhdG9yIG5ld0Jsb2Nrc0VuZCA9 IG5ld1NlbGVjdGVkQmxvY2tzLmVuZCgpOwotICAgIGZvciAoU2VsZWN0ZWRCbG9ja01hcDo6aXRl cmF0b3IgaSA9IG5ld1NlbGVjdGVkQmxvY2tzLmJlZ2luKCk7IGkgIT0gbmV3QmxvY2tzRW5kOyAr K2kpCi0gICAgICAgIGktPnZhbHVlLT5yZXBhaW50KCk7CisgICAgYXV0byBuZXdCbG9ja3NFbmQg PSBuZXdTZWxlY3RlZEJsb2Nrcy5lbmQoKTsKKyAgICBmb3IgKGF1dG8gaXQgPSBuZXdTZWxlY3Rl ZEJsb2Nrcy5iZWdpbigpOyBpdCAhPSBuZXdCbG9ja3NFbmQ7ICsraXQpCisgICAgICAgIGl0LT52 YWx1ZS0+cmVwYWludCgpOwogfQogCiB2b2lkIFJlbmRlclZpZXc6OmdldFNlbGVjdGlvbihSZW5k ZXJPYmplY3QqJiBzdGFydFJlbmRlcmVyLCBpbnQmIHN0YXJ0T2Zmc2V0LCBSZW5kZXJPYmplY3Qq JiBlbmRSZW5kZXJlciwgaW50JiBlbmRPZmZzZXQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZXcuaAppbmRleCAwYzI2YjY4Li40ZWQ2ODMwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJWaWV3LmgKQEAgLTMwNCw3ICszMDQsOSBAQCBwcml2YXRlOgogICAgIGZyaWVu ZCBjbGFzcyBMYXlvdXRTdGF0ZURpc2FibGVyOwogCiAgICAgdm9pZCBzcGxpdFNlbGVjdGlvbkJl dHdlZW5TdWJ0cmVlcyhSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9i amVjdCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFpbnRN b2RlKTsKLSAgICB2b2lkIHNldFN1YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3VidHJlZVJvb3Qm LCBSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCogZW5kLCBp bnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSk7CisgICAgdm9pZCBjbGVhclN1YnRyZWVT ZWxlY3Rpb24oY29uc3QgU2VsZWN0aW9uU3VidHJlZVJvb3QmLCBTZWxlY3Rpb25SZXBhaW50TW9k ZSwgT2xkU2VsZWN0aW9uRGF0YSYpOworICAgIHZvaWQgdXBkYXRlU2VsZWN0aW9uRm9yU3VidHJl ZXMoUmVuZGVyU3VidHJlZXNNYXAmLCBTZWxlY3Rpb25SZXBhaW50TW9kZSk7CisgICAgdm9pZCBh cHBseVN1YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3VidHJlZVJvb3QmLCBSZW5kZXJPYmplY3Qq IHN0YXJ0LCBSZW5kZXJPYmplY3QqIGVuZCwgaW50IGVuZFBvcywgU2VsZWN0aW9uUmVwYWludE1v ZGUsIGNvbnN0IE9sZFNlbGVjdGlvbkRhdGEmKTsKICAgICBMYXlvdXRSZWN0IHN1YnRyZWVTZWxl Y3Rpb25Cb3VuZHMoY29uc3QgU2VsZWN0aW9uU3VidHJlZVJvb3QmLCBib29sIGNsaXBUb1Zpc2li bGVDb250ZW50ID0gdHJ1ZSkgY29uc3Q7CiAgICAgdm9pZCByZXBhaW50U3VidHJlZVNlbGVjdGlv bihjb25zdCBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvU2VsZWN0aW9uU3VidHJlZVJvb3QuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1NlbGVjdGlvblN1YnRyZWVSb290LmNwcAppbmRleCA1Y2ZkM2ZjLi5m YWZhZWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2VsZWN0aW9uU3Vi dHJlZVJvb3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TZWxlY3Rpb25TdWJ0 cmVlUm9vdC5jcHAKQEAgLTQ1LDYgKzQ1LDE0IEBAIFNlbGVjdGlvblN1YnRyZWVSb290OjpTZWxl Y3Rpb25TdWJ0cmVlUm9vdCgpCiB7CiB9CiAKK1NlbGVjdGlvblN1YnRyZWVSb290OjpTZWxlY3Rp b25TdWJ0cmVlUm9vdChSZW5kZXJPYmplY3QqIHNlbGVjdGlvblN0YXJ0LCBpbnQgc2VsZWN0aW9u U3RhcnRQb3MsIFJlbmRlck9iamVjdCogc2VsZWN0aW9uRW5kLCBpbnQgc2VsZWN0aW9uRW5kUG9z KQorICAgIDogbV9zZWxlY3Rpb25TdGFydChzZWxlY3Rpb25TdGFydCkKKyAgICAsIG1fc2VsZWN0 aW9uU3RhcnRQb3Moc2VsZWN0aW9uU3RhcnRQb3MpCisgICAgLCBtX3NlbGVjdGlvbkVuZChzZWxl Y3Rpb25FbmQpCisgICAgLCBtX3NlbGVjdGlvbkVuZFBvcyhzZWxlY3Rpb25FbmRQb3MpCit7Cit9 CisKIHZvaWQgU2VsZWN0aW9uU3VidHJlZVJvb3Q6OmFkanVzdEZvclZpc2libGVTZWxlY3Rpb24o RG9jdW1lbnQmIGRvY3VtZW50KQogewogICAgIGlmIChzZWxlY3Rpb25DbGVhcigpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NlbGVjdGlvblN1YnRyZWVSb290LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2VsZWN0aW9uU3VidHJlZVJvb3QuaAppbmRleCAzNWNl ZjExLi40MmM1YzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2VsZWN0 aW9uU3VidHJlZVJvb3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2VsZWN0aW9u U3VidHJlZVJvb3QuaApAQCAtMzEsNiArMzEsNyBAQAogI2RlZmluZSBTZWxlY3Rpb25TdWJ0cmVl Um9vdF9oCiAKICNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKKyNpbmNsdWRlICJSZW5kZXJTZWxl Y3Rpb25JbmZvLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMzgsOCArMzksMjggQEAg Y2xhc3MgRG9jdW1lbnQ7CiAKIGNsYXNzIFNlbGVjdGlvblN1YnRyZWVSb290IHsKIHB1YmxpYzoK KyAgICAKKyAgICB0eXBlZGVmIEhhc2hNYXA8UmVuZGVyT2JqZWN0Kiwgc3RkOjp1bmlxdWVfcHRy PFJlbmRlclNlbGVjdGlvbkluZm8+PiBTZWxlY3RlZE9iamVjdE1hcDsKKyAgICB0eXBlZGVmIEhh c2hNYXA8UmVuZGVyQmxvY2sqLCBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyQmxvY2tTZWxlY3Rpb25J bmZvPj4gU2VsZWN0ZWRCbG9ja01hcDsKKyAgICB0eXBlZGVmIEhhc2hNYXA8U2VsZWN0aW9uU3Vi dHJlZVJvb3QqLCBTZWxlY3Rpb25TdWJ0cmVlUm9vdD4gUmVuZGVyU3VidHJlZXNNYXA7CisKKyAg ICBzdHJ1Y3QgT2xkU2VsZWN0aW9uRGF0YSB7CisgICAgICAgIE9sZFNlbGVjdGlvbkRhdGEoKQor ICAgICAgICAgICAgOiBzZWxlY3Rpb25TdGFydFBvcygtMSkKKyAgICAgICAgICAgICwgc2VsZWN0 aW9uRW5kUG9zKC0xKQorICAgICAgICB7CisgICAgICAgIH0KKworICAgICAgICBpbnQgc2VsZWN0 aW9uU3RhcnRQb3M7CisgICAgICAgIGludCBzZWxlY3Rpb25FbmRQb3M7CisgICAgICAgIFNlbGVj dGVkT2JqZWN0TWFwIHNlbGVjdGVkT2JqZWN0czsKKyAgICAgICAgU2VsZWN0ZWRCbG9ja01hcCBz ZWxlY3RlZEJsb2NrczsKKyAgICB9OworICAgIAorICAgIHR5cGVkZWYgSGFzaE1hcDxTZWxlY3Rp b25TdWJ0cmVlUm9vdCosIHN0ZDo6dW5pcXVlX3B0cjxPbGRTZWxlY3Rpb25EYXRhPj4gU3VidHJl ZU9sZFNlbGVjdGlvbkRhdGFNYXA7CiAKICAgICBTZWxlY3Rpb25TdWJ0cmVlUm9vdCgpOworICAg IFNlbGVjdGlvblN1YnRyZWVSb290KFJlbmRlck9iamVjdCogc2VsZWN0aW9uU3RhcnQsIGludCBz ZWxlY3Rpb25TdGFydFBvcywgUmVuZGVyT2JqZWN0KiBzZWxlY3Rpb25FbmQsIGludCBzZWxlY3Rp b25FbmRQb3MpOwogCiAgICAgUmVuZGVyT2JqZWN0KiBzZWxlY3Rpb25TdGFydCgpIGNvbnN0IHsg cmV0dXJuIG1fc2VsZWN0aW9uU3RhcnQ7IH0KICAgICBpbnQgc2VsZWN0aW9uU3RhcnRQb3MoKSBj b25zdCB7IHJldHVybiBtX3NlbGVjdGlvblN0YXJ0UG9zOyB9Cg==