123577 2013-10-31 10:50:01 -0700 Web Inspector: CSS Regions: Removing a content node of a ContentFlow from the DOM will send a 0 nodeId 2013-11-07 10:04:01 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 57312 1 achicu achicu commit-queue graouts joepeck timothy webkit-bug-importer WebkitBugTracker oldest_to_newest 945584 0 achicu 2013-10-31 10:50:01 -0700 This happens because the inspector protocol will send the remove event before the element is actually going to be removed and the CSS Regions API will not be able to find the nodeId for the removed node. 945585 1 webkit-bug-importer 2013-10-31 10:50:09 -0700 <rdar://problem/15363312> 948007 2 216248 achicu 2013-11-06 17:17:17 -0800 Created attachment 216248 Patch V1 948037 3 216248 timothy 2013-11-06 19:29:17 -0800 Comment on attachment 216248 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=216248&action=review > Source/WebInspectorUI/UserInterface/ContentFlowTreeContentView.js:186 > - this._nodesMap.remove(event.data.node.id); > + this._nodesMap.delete(event.data.node.id); Opps, good catch. > Source/WebInspectorUI/UserInterface/DOMTreeManager.js:43 > + this._contentNodesToFlowsMap = new Map(); No () is our style. 948294 4 216308 achicu 2013-11-07 09:17:19 -0800 Created attachment 216308 Patch for landing 948296 5 216308 commit-queue 2013-11-07 09:18:16 -0800 Comment on attachment 216308 Patch for landing Rejecting attachment 216308 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 216308, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in LayoutTests/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/22638240 948317 6 216308 commit-queue 2013-11-07 10:03:56 -0800 Comment on attachment 216308 Patch for landing Clearing flags on attachment: 216308 Committed r158854: <http://trac.webkit.org/changeset/158854> 948318 7 commit-queue 2013-11-07 10:04:01 -0800 All reviewed patches have been landed. Closing bug. 216248 2013-11-06 17:17:17 -0800 2013-11-07 09:17:19 -0800 Patch V1 bug123577.v1.patch text/plain 12208 achicu ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlOTA2MWVmLi5kYjAyMzdlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMTEt MDYgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IENTUyBSZWdpb25zOiBSZW1vdmluZyBhIGNvbnRlbnQgbm9kZSBvZiBhIENv bnRlbnRGbG93IGZyb20gdGhlIERPTSB3aWxsIHNlbmQgYSAwIG5vZGVJZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNTc3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdGVzdCB0byBjaGVjayB0 aGF0IHRoZSBub3RpZmljYXRpb24gdGhhdCBhbiBlbGVtZW50IHdhcyByZW1vdmVkIGZyb20gdGhl IENvbnRlbnRGbG93IGlzIGhhbmRsZWQKKyAgICAgICAgY29ycmVjdGx5IGluIHRoZSBXZWJJbnNw ZWN0b3IgZXZlbiBpZiB0aGUgZWxlbWVudCBpcyBub3QgcGFydCBvZiB0aGUgRE9NIGFueW1vcmUu CisKKyAgICAgICAgKiBpbnNwZWN0b3ItcHJvdG9jb2wvbW9kZWwvY29udGVudC1mbG93LWNvbnRl bnQtcmVtb3ZhbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci1wcm90 b2NvbC9tb2RlbC9jb250ZW50LWZsb3ctY29udGVudC1yZW1vdmFsLmh0bWw6IEFkZGVkLgorCiAy MDEzLTExLTA2ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4 IHRlc3QgY2FzZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL21v ZGVsL2NvbnRlbnQtZmxvdy1jb250ZW50LXJlbW92YWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yLXByb3RvY29sL21vZGVsL2NvbnRlbnQtZmxvdy1jb250ZW50LXJlbW92YWwt ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY3ODdhMDQK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3ItcHJvdG9jb2wvbW9kZWwv Y29udGVudC1mbG93LWNvbnRlbnQtcmVtb3ZhbC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw5IEBA CitUZXN0aW5nIHRoYXQgdGhlIENvbnRlbnRGbG93cyBldmVudHMgYXJlIGNvcnJlY3RseSBkaXNw YXRjaGVkIHdoZW4gY29udGVudCBub2RlcyBhcmUgZGV0YWNoZWQgZnJvbSB0aGUgRE9NLgorCitQ QVNTOiBDb250ZW50RmxvdyB3YXMgYWRkZWQuCitQQVNTOiBDb250ZW50Rmxvdy5jb250ZW50Tm9k ZXMgaGFzIGEgbGVuZ3RoIG9mIDIuCitQQVNTOiBDb250ZW50Rmxvdy5jb250ZW50Tm9kZXNbMF0u aWQgaXMgIiNjb250ZW50U3RhdGljIi4KK1BBU1M6IENvbnRlbnRGbG93LmNvbnRlbnROb2Rlc1sx XS5pZCBpcyAiI2NvbnRlbnRSZW1vdmVkIi4KK1BBU1M6ICIjY29udGVudFJlbW92ZWQiIHdhcyBy ZW1vdmVkLgorUEFTUzogIiNjb250ZW50UmVtb3ZlZCIgY2Fubm90IGJlIGZvdW5kIGluIHRoZSBj b250ZW50Tm9kZXMgbGlzdC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXBy b3RvY29sL21vZGVsL2NvbnRlbnQtZmxvdy1jb250ZW50LXJlbW92YWwuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci1wcm90b2NvbC9tb2RlbC9jb250ZW50LWZsb3ctY29udGVudC1yZW1vdmFs Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNmRkYTA1NgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9tb2RlbC9jb250ZW50 LWZsb3ctY29udGVudC1yZW1vdmFsLmh0bWwKQEAgLTAsMCArMSw2NCBAQAorPCFkb2N0eXBlIGh0 bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLmNvbnRlbnQKK3sKKyAgICAtd2Via2l0LWZs b3ctaW50bzogZmxvdzsKK30KKzwvc3R5bGU+Cis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlw dCIgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9yZXNvdXJjZXMvcHJv dG9jb2wtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gY2hhbmdlRmxvd0Nv bnRlbnQoKQoreworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb250ZW50UmVtb3ZlZCIp LnJlbW92ZSgpOworfQorCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0Lmlt cG9ydEluc3BlY3RvclNjcmlwdHMoKTsKKworICAgIHZhciBjb250ZW50RmxvdzsKKworICAgIFdl Ykluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5GcmFtZVJlc291cmNlTWFuYWdlci5FdmVudC5NYWluRnJhbWVEaWRDaGFuZ2UsIGZ1bmN0 aW9uKGV2ZW50KSB7CisgICAgICAgIHZhciBkb21UcmVlID0gV2ViSW5zcGVjdG9yLmZyYW1lUmVz b3VyY2VNYW5hZ2VyLm1haW5GcmFtZS5kb21UcmVlOworICAgICAgICBkb21UcmVlLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTVRyZWUuRXZlbnQuUm9vdERPTU5vZGVJbnZhbGlkYXRl ZCwgb25Sb290RE9NTm9kZUludmFsaWRhdGVkLCBudWxsKTsKKyAgICAgICAgZG9tVHJlZS5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01UcmVlLkV2ZW50LkNvbnRlbnRGbG93V2FzQWRk ZWQsIG9uQ29udGVudEZsb3dXYXNBZGRlZCwgbnVsbCk7CisgICAgICAgIGRvbVRyZWUucmVxdWVz dENvbnRlbnRGbG93TGlzdCgpOworICAgIH0pOworCisgICAgZnVuY3Rpb24gb25Sb290RE9NTm9k ZUludmFsaWRhdGVkKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNl TWFuYWdlci5tYWluRnJhbWUuZG9tVHJlZS5yZXF1ZXN0Q29udGVudEZsb3dMaXN0KCk7CisgICAg fQorCisgICAgZnVuY3Rpb24gb25Db250ZW50Rmxvd1dhc0FkZGVkKGV2ZW50KQorICAgIHsKKyAg ICAgICAgY29udGVudEZsb3cgPSBldmVudC5kYXRhLmZsb3c7CisgICAgICAgIEluc3BlY3RvclRl c3QuYXNzZXJ0KGNvbnRlbnRGbG93Lm5hbWUgPT09ICJmbG93IiwgIkNvbnRlbnRGbG93IHdhcyBh ZGRlZC4iKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoY29udGVudEZsb3cuY29udGVu dE5vZGVzLmxlbmd0aCA9PT0gMiwgIkNvbnRlbnRGbG93LmNvbnRlbnROb2RlcyBoYXMgYSBsZW5n dGggb2YgMi4iKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoY29udGVudEZsb3cuY29u dGVudE5vZGVzWzBdLmdldEF0dHJpYnV0ZSgiaWQiKSA9PT0gImNvbnRlbnRTdGF0aWMiLCAiQ29u dGVudEZsb3cuY29udGVudE5vZGVzWzBdLmlkIGlzIFwiI2NvbnRlbnRTdGF0aWNcIi4iKTsKKyAg ICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoY29udGVudEZsb3cuY29udGVudE5vZGVzWzFdLmdl dEF0dHJpYnV0ZSgiaWQiKSA9PT0gImNvbnRlbnRSZW1vdmVkIiwgIkNvbnRlbnRGbG93LmNvbnRl bnROb2Rlc1sxXS5pZCBpcyBcIiNjb250ZW50UmVtb3ZlZFwiLiIpOworCisgICAgICAgIGNvbnRl bnRGbG93LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRGbG93LkV2ZW50LkNv bnRlbnROb2RlV2FzUmVtb3ZlZCwgb25Db250ZW50Tm9kZVdhc1JlbW92ZWQsIG51bGwpOworCisg ICAgICAgIEluc3BlY3RvclRlc3Quc2VuZENvbW1hbmQoIlJ1bnRpbWUuZXZhbHVhdGUiLCB7ZXhw cmVzc2lvbjogImNoYW5nZUZsb3dDb250ZW50KCkifSk7CisgICAgfQorCisgICAgZnVuY3Rpb24g b25Db250ZW50Tm9kZVdhc1JlbW92ZWQoZXZlbnQpCisgICAgeworICAgICAgICBJbnNwZWN0b3JU ZXN0LmFzc2VydChldmVudC5kYXRhLm5vZGUuZ2V0QXR0cmlidXRlKCJpZCIpID09PSAiY29udGVu dFJlbW92ZWQiLCAiXCIjY29udGVudFJlbW92ZWRcIiB3YXMgcmVtb3ZlZC4iKTsKKyAgICAgICAg SW5zcGVjdG9yVGVzdC5hc3NlcnQoY29udGVudEZsb3cuY29udGVudE5vZGVzLmluZGV4T2YoZXZl bnQuZGF0YS5ub2RlKSA9PT0gLTEsICJcIiNjb250ZW50UmVtb3ZlZFwiIGNhbm5vdCBiZSBmb3Vu ZCBpbiB0aGUgY29udGVudE5vZGVzIGxpc3QuIik7CisgICAgICAgIEluc3BlY3RvclRlc3QuY29t cGxldGVUZXN0KCk7CisgICAgfQorfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9 InJ1blRlc3QoKSI+CisgICAgPHA+VGVzdGluZyB0aGF0IHRoZSBDb250ZW50Rmxvd3MgZXZlbnRz IGFyZSBjb3JyZWN0bHkgZGlzcGF0Y2hlZCB3aGVuIGNvbnRlbnQgbm9kZXMgYXJlIGRldGFjaGVk IGZyb20gdGhlIERPTS48L3A+CisKKyAgICA8ZGl2IGlkPSJjb250ZW50U3RhdGljIiBjbGFzcz0i Y29udGVudCI+PC9kaXY+CisgICAgPGRpdiBpZD0iY29udGVudFJlbW92ZWQiIGNsYXNzPSJjb250 ZW50Ij48L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGRiMDg3ZDAuLjE3 MzNkNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMy0xMS0wNiAgQWxleGFuZHJ1 IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog Q1NTIFJlZ2lvbnM6IFJlbW92aW5nIGEgY29udGVudCBub2RlIG9mIGEgQ29udGVudEZsb3cgZnJv bSB0aGUgRE9NIHdpbGwgc2VuZCBhIDAgbm9kZUlkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM1NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3ItcHJvdG9jb2wvbW9kZWwvY29u dGVudC1mbG93LWNvbnRlbnQtcmVtb3ZhbC5odG1sCisKKyAgICAgICAgRG8gbm90IHNlbmQgdW5y ZWdpc3RlciBldmVudHMgZm9yIHRoZSBjb250ZW50IG5vZGVzIG9mIGEgZmxvdyB3aGVuIHRoZSBl bGVtZW50IGlzIG5vdCBwYXJ0IG9mIHRoZSBET00KKyAgICAgICAgYW55bW9yZS4gV2UgYWxyZWFk eSBzZW5kIGFuIHVuYmluZCBldmVudCwgc28gdGhlIGluc3BlY3RvciBpcyBhbHJlYWR5IG5vdGlm aWVkIHRoYXQgdGhlIG5vZGUgd2FzIHJlbW92ZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6 OmRpZFVucmVnaXN0ZXJOYW1lZEZsb3dDb250ZW50RWxlbWVudCk6CisKIDIwMTMtMTEtMDYgIEJl bSBKb25lcy1CZXkgIDxiam9uZXNiZUBhZG9iZS5jb20+CiAKICAgICAgICAgUmVuYW1lIHJlZ2lv biBsaW5lIG9mZnNldCBtZXRob2RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNTU0FnZW50LmNwcAppbmRleCAyYmVhYjE0Li5lYmVkYzcyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKQEAgLTc3NSw2ICs3NzUsMTAg QEAgdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6ZGlkVW5yZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRF bGVtZW50KERvY3VtZW50KiBkb2N1bWVudCwKIAogICAgIEVycm9yU3RyaW5nIGVycm9yU3RyaW5n OwogICAgIGludCBjb250ZW50RWxlbWVudE5vZGVJZCA9IG1fZG9tQWdlbnQtPnB1c2hOb2RlVG9G cm9udGVuZCgmZXJyb3JTdHJpbmcsIGRvY3VtZW50Tm9kZUlkLCBjb250ZW50RWxlbWVudCk7Cisg ICAgaWYgKCFjb250ZW50RWxlbWVudE5vZGVJZCkgeworICAgICAgICAvLyBXZSd2ZSBhbHJlYWR5 IG5vdGlmaWVkIHRoYXQgdGhlIERPTSBub2RlIHdhcyByZW1vdmVkIGZyb20gdGhlIERPTSwgc28g dGhlcmUncyBubyBuZWVkIHRvIHNlbmQgYW5vdGhlciBldmVudC4KKyAgICAgICAgcmV0dXJuOwor ICAgIH0KICAgICBtX2Zyb250ZW5kLT51bnJlZ2lzdGVyZWROYW1lZEZsb3dDb250ZW50RWxlbWVu dChkb2N1bWVudE5vZGVJZCwgbmFtZWRGbG93LT5uYW1lKCkuc3RyaW5nKCksIGNvbnRlbnRFbGVt ZW50Tm9kZUlkKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggMzFiNzg2NS4uZTJm NWVlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTMtMTEt MDYgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgogCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IENTUyBSZWdpb25zOiBSZW1vdmluZyBhIGNvbnRlbnQgbm9kZSBvZiBhIENv bnRlbnRGbG93IGZyb20gdGhlIERPTSB3aWxsIHNlbmQgYSAwIG5vZGVJZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNTc3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgdGhlIGNvbnRlbnQgbm9k ZSByZW1vdmFsIGZyb20gdGhlIGNvbnRlbnQgZmxvdy4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQ29udGVudEZsb3dUcmVlQ29udGVudFZpZXcuanM6CisgICAgICAgICogVXNlckludGVyZmFj ZS9ET01UcmVlTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdl cik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLl9jcmVh dGVDb250ZW50Rmxvd0Zyb21QYXlsb2FkKTogUmVnaXN0ZXJlZCBhbGwgdGhlIGNvbnRlbnQgbm9k ZXMKKyAgICAgICAgaW4gdGhlIF9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZS5fdW5iaW5kKTogQWRkZWQgY2FsbCB0 byBfcmVtb3ZlQ29udGVudE5vZGVGcm9tRmxvd0lmTmVlZGVkLgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZS5fcmVtb3ZlQ29udGVudE5vZGVGcm9tRmxvd0lm TmVlZGVkKTogQ2FsbGVkIGZyb20gX3VuYmluZCB0byBjaGVjaworICAgICAgICBhbmQgcmVtb3Zl IGEgbm9kZSBmcm9tIGl0J3MgcGFyZW50IGNvbnRlbnQgZmxvdyBpZiBuZWVkZWQuCisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLnVucmVnaXN0ZXJlZE5hbWVk Rmxvd0NvbnRlbnRFbGVtZW50KToKKworMjAxMy0xMS0wNiAgQWxleGFuZHJ1IENoaWN1bGl0YSAg PGFjaGljdUBhZG9iZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ1NTIFJlZ2lvbnM6 IFdoZW4gYSBmbG93IGlzIGNsaWNrZWQgdGhlIGNvbnRlbnQgb2YgZmxvdyBuZWVkcyB0byBiZSBk aXNwbGF5ZWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMjkyNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250ZW50Rmxvd1RyZWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRlbnRGbG93VHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4IDRhMWQ4OTIu LmRmYTMyZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRlbnRGbG93VHJlZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRlbnRGbG93VHJlZUNvbnRlbnRWaWV3LmpzCkBAIC0xODMsNiAr MTgzLDYgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRGbG93VHJlZUNvbnRlbnRWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgY29udGVudE5vZGVPdXRsaW5lLmNsb3NlKCk7CiAgICAgICAgIGNvbnRl bnROb2RlT3V0bGluZS5lbGVtZW50LnJlbW92ZSgpOwogCi0gICAgICAgIHRoaXMuX25vZGVzTWFw LnJlbW92ZShldmVudC5kYXRhLm5vZGUuaWQpOworICAgICAgICB0aGlzLl9ub2Rlc01hcC5kZWxl dGUoZXZlbnQuZGF0YS5ub2RlLmlkKTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRE9NVHJlZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9ET01UcmVlTWFuYWdlci5qcwppbmRleCAzN2RmOTdj Li41ZTUwNTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9ET01UcmVlTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9ET01UcmVlTWFuYWdlci5qcwpAQCAtNDAsNiArNDAsNyBAQCBXZWJJbnNwZWN0b3IuRE9N VHJlZU1hbmFnZXIgPSBmdW5jdGlvbigpIHsKICAgICB0aGlzLl9kb2N1bWVudCA9IG51bGw7CiAg ICAgdGhpcy5fYXR0cmlidXRlTG9hZE5vZGVJZHMgPSB7fTsKICAgICB0aGlzLl9mbG93cyA9IHt9 OworICAgIHRoaXMuX2NvbnRlbnROb2Rlc1RvRmxvd3NNYXAgPSBuZXcgTWFwKCk7CiB9CiAKIFdl Ykluc3BlY3Rvci5PYmplY3QuYWRkQ29uc3RydWN0b3JGdW5jdGlvbnMoV2ViSW5zcGVjdG9yLkRP TVRyZWVNYW5hZ2VyKTsKQEAgLTMzNyw2ICszMzgsOCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1h bmFnZXIucHJvdG90eXBlID0gewogICAgICAqLwogICAgIF91bmJpbmQ6IGZ1bmN0aW9uKG5vZGUp CiAgICAgeworICAgICAgICB0aGlzLl9yZW1vdmVDb250ZW50Tm9kZUZyb21GbG93SWZOZWVkZWQo bm9kZSk7CisKICAgICAgICAgZGVsZXRlIHRoaXMuX2lkVG9ET01Ob2RlW25vZGUuaWRdOwogICAg ICAgICBmb3IgKHZhciBpID0gMDsgbm9kZS5jaGlsZHJlbiAmJiBpIDwgbm9kZS5jaGlsZHJlbi5s ZW5ndGg7ICsraSkKICAgICAgICAgICAgIHRoaXMuX3VuYmluZChub2RlLmNoaWxkcmVuW2ldKTsK QEAgLTUzNiw3ICs1MzksMTQgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlw ZSA9IHsKICAgICBfY3JlYXRlQ29udGVudEZsb3dGcm9tUGF5bG9hZDogZnVuY3Rpb24oZmxvd1Bh eWxvYWQpCiAgICAgewogICAgICAgICAvLyBGSVhNRTogQ29sbGVjdCB0aGUgcmVnaW9ucyBmcm9t IHRoZSBwYXlsb2FkLgotICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db250ZW50Rmxv dyhmbG93UGF5bG9hZC5kb2N1bWVudE5vZGVJZCwgZmxvd1BheWxvYWQubmFtZSwgZmxvd1BheWxv YWQub3ZlcnNldCwgZmxvd1BheWxvYWQuY29udGVudC5tYXAodGhpcy5ub2RlRm9ySWQuYmluZCh0 aGlzKSkpOworICAgICAgICB2YXIgZmxvdyA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGVudEZsb3co Zmxvd1BheWxvYWQuZG9jdW1lbnROb2RlSWQsIGZsb3dQYXlsb2FkLm5hbWUsIGZsb3dQYXlsb2Fk Lm92ZXJzZXQsIGZsb3dQYXlsb2FkLmNvbnRlbnQubWFwKHRoaXMubm9kZUZvcklkLmJpbmQodGhp cykpKTsKKworICAgICAgICBmb3IgKHZhciBjb250ZW50Tm9kZSBvZiBmbG93LmNvbnRlbnROb2Rl cykgeworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2NvbnRlbnROb2Rlc1RvRmxv d3NNYXAuaGFzKGNvbnRlbnROb2RlLmlkKSk7CisgICAgICAgICAgICB0aGlzLl9jb250ZW50Tm9k ZXNUb0Zsb3dzTWFwLnNldChjb250ZW50Tm9kZS5pZCwgZmxvdyk7CisgICAgICAgIH0KKworICAg ICAgICByZXR1cm4gZmxvdzsKICAgICB9LAogCiAgICAgX3VwZGF0ZUNvbnRlbnRGbG93RnJvbVBh eWxvYWQ6IGZ1bmN0aW9uKGNvbnRlbnRGbG93LCBmbG93UGF5bG9hZCkKQEAgLTU1Nyw2ICs1Njcs NyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAg ICAgICAgIGNvbnNvbGUuZXJyb3IoIkVycm9yIHdoaWxlIGdldHRpbmcgdGhlIG5hbWVkIGZsb3dz IGZvciBkb2N1bWVudCAiICsgZG9jdW1lbnROb2RlSWRlbnRpZmllciArICI6ICIgKyBlcnJvcik7 CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgdGhp cy5fY29udGVudE5vZGVzVG9GbG93c01hcC5jbGVhcigpOwogICAgICAgICAgICAgdmFyIGNvbnRl bnRGbG93cyA9IFtdOwogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBmbG93cy5sZW5n dGg7ICsraSkgewogICAgICAgICAgICAgICAgIHZhciBmbG93UGF5bG9hZCA9IGZsb3dzW2ldOwpA QCAtNjE0LDIxICs2MjUsMzcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBmbG93S2V5ID0gV2ViSW5zcGVjdG9yLkRPTVRyZWVN YW5hZ2VyLl9mbG93UGF5bG9hZEhhc2hLZXkoe2RvY3VtZW50Tm9kZUlkOiBkb2N1bWVudE5vZGVJ ZGVudGlmaWVyLCBuYW1lOiBmbG93TmFtZX0pOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlz Ll9mbG93cy5oYXNPd25Qcm9wZXJ0eShmbG93S2V5KSk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KCF0aGlzLl9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmhhcyhjb250ZW50Tm9kZUlkKSk7CiAKICAg ICAgICAgdmFyIGZsb3cgPSB0aGlzLl9mbG93c1tmbG93S2V5XTsKICAgICAgICAgdmFyIGNvbnRl bnROb2RlID0gdGhpcy5ub2RlRm9ySWQoY29udGVudE5vZGVJZCk7CiAKKyAgICAgICAgdGhpcy5f Y29udGVudE5vZGVzVG9GbG93c01hcC5zZXQoY29udGVudE5vZGUuaWQsIGZsb3cpOworCiAgICAg ICAgIGlmIChuZXh0Q29udGVudEVsZW1lbnROb2RlSWQpCiAgICAgICAgICAgICBmbG93Lmluc2Vy dENvbnRlbnROb2RlQmVmb3JlKGNvbnRlbnROb2RlLCB0aGlzLm5vZGVGb3JJZChuZXh0Q29udGVu dEVsZW1lbnROb2RlSWQpKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgZmxvdy5hcHBlbmRD b250ZW50Tm9kZShjb250ZW50Tm9kZSk7CiAgICAgfSwKIAorICAgIF9yZW1vdmVDb250ZW50Tm9k ZUZyb21GbG93SWZOZWVkZWQ6IGZ1bmN0aW9uKG5vZGUpCisgICAgeworICAgICAgICBpZiAoIXRo aXMuX2NvbnRlbnROb2Rlc1RvRmxvd3NNYXAuaGFzKG5vZGUuaWQpKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB2YXIgZmxvdyA9IHRoaXMuX2NvbnRlbnROb2Rlc1RvRmxvd3NNYXAuZ2V0 KG5vZGUuaWQpOworICAgICAgICB0aGlzLl9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmRlbGV0ZShu b2RlLmlkKTsKKyAgICAgICAgZmxvdy5yZW1vdmVDb250ZW50Tm9kZShub2RlKTsKKyAgICB9LAor CiAgICAgdW5yZWdpc3RlcmVkTmFtZWRGbG93Q29udGVudEVsZW1lbnQ6IGZ1bmN0aW9uKGRvY3Vt ZW50Tm9kZUlkZW50aWZpZXIsIGZsb3dOYW1lLCBjb250ZW50Tm9kZUlkKQogICAgIHsKLSAgICAg ICAgdmFyIGZsb3dLZXkgPSBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuX2Zsb3dQYXlsb2Fk SGFzaEtleSh7ZG9jdW1lbnROb2RlSWQ6IGRvY3VtZW50Tm9kZUlkZW50aWZpZXIsIG5hbWU6IGZs b3dOYW1lfSk7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2Zsb3dzLmhhc093blByb3Bl cnR5KGZsb3dLZXkpKTsKLSAgICAgICAgdGhpcy5fZmxvd3NbZmxvd0tleV0ucmVtb3ZlQ29udGVu dE5vZGUodGhpcy5ub2RlRm9ySWQoY29udGVudE5vZGVJZCkpOworICAgICAgICBjb25zb2xlLmFz c2VydCh0aGlzLl9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmhhcyhjb250ZW50Tm9kZUlkKSk7CisK KyAgICAgICAgdmFyIGZsb3cgPSB0aGlzLl9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmdldChjb250 ZW50Tm9kZUlkKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoZmxvdy5pZCA9PT0gV2ViSW5zcGVj dG9yLkRPTVRyZWVNYW5hZ2VyLl9mbG93UGF5bG9hZEhhc2hLZXkoe2RvY3VtZW50Tm9kZUlkOiBk b2N1bWVudE5vZGVJZGVudGlmaWVyLCBuYW1lOiBmbG93TmFtZX0pKTsKKworICAgICAgICB0aGlz Ll9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmRlbGV0ZShjb250ZW50Tm9kZUlkKTsKKyAgICAgICAg Zmxvdy5yZW1vdmVDb250ZW50Tm9kZSh0aGlzLm5vZGVGb3JJZChjb250ZW50Tm9kZUlkKSk7CiAg ICAgfQogfQogCg== 216308 2013-11-07 09:17:19 -0800 2013-11-07 10:03:56 -0800 Patch for landing bug123577.v2.patch text/plain 12208 achicu ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlOTA2MWVmLi5kYjAyMzdlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMTEt MDYgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IENTUyBSZWdpb25zOiBSZW1vdmluZyBhIGNvbnRlbnQgbm9kZSBvZiBhIENv bnRlbnRGbG93IGZyb20gdGhlIERPTSB3aWxsIHNlbmQgYSAwIG5vZGVJZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNTc3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdGVzdCB0byBjaGVjayB0 aGF0IHRoZSBub3RpZmljYXRpb24gdGhhdCBhbiBlbGVtZW50IHdhcyByZW1vdmVkIGZyb20gdGhl IENvbnRlbnRGbG93IGlzIGhhbmRsZWQKKyAgICAgICAgY29ycmVjdGx5IGluIHRoZSBXZWJJbnNw ZWN0b3IgZXZlbiBpZiB0aGUgZWxlbWVudCBpcyBub3QgcGFydCBvZiB0aGUgRE9NIGFueW1vcmUu CisKKyAgICAgICAgKiBpbnNwZWN0b3ItcHJvdG9jb2wvbW9kZWwvY29udGVudC1mbG93LWNvbnRl bnQtcmVtb3ZhbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci1wcm90 b2NvbC9tb2RlbC9jb250ZW50LWZsb3ctY29udGVudC1yZW1vdmFsLmh0bWw6IEFkZGVkLgorCiAy MDEzLTExLTA2ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4 IHRlc3QgY2FzZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL21v ZGVsL2NvbnRlbnQtZmxvdy1jb250ZW50LXJlbW92YWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yLXByb3RvY29sL21vZGVsL2NvbnRlbnQtZmxvdy1jb250ZW50LXJlbW92YWwt ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY3ODdhMDQK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3ItcHJvdG9jb2wvbW9kZWwv Y29udGVudC1mbG93LWNvbnRlbnQtcmVtb3ZhbC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw5IEBA CitUZXN0aW5nIHRoYXQgdGhlIENvbnRlbnRGbG93cyBldmVudHMgYXJlIGNvcnJlY3RseSBkaXNw YXRjaGVkIHdoZW4gY29udGVudCBub2RlcyBhcmUgZGV0YWNoZWQgZnJvbSB0aGUgRE9NLgorCitQ QVNTOiBDb250ZW50RmxvdyB3YXMgYWRkZWQuCitQQVNTOiBDb250ZW50Rmxvdy5jb250ZW50Tm9k ZXMgaGFzIGEgbGVuZ3RoIG9mIDIuCitQQVNTOiBDb250ZW50Rmxvdy5jb250ZW50Tm9kZXNbMF0u aWQgaXMgIiNjb250ZW50U3RhdGljIi4KK1BBU1M6IENvbnRlbnRGbG93LmNvbnRlbnROb2Rlc1sx XS5pZCBpcyAiI2NvbnRlbnRSZW1vdmVkIi4KK1BBU1M6ICIjY29udGVudFJlbW92ZWQiIHdhcyBy ZW1vdmVkLgorUEFTUzogIiNjb250ZW50UmVtb3ZlZCIgY2Fubm90IGJlIGZvdW5kIGluIHRoZSBj b250ZW50Tm9kZXMgbGlzdC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXBy b3RvY29sL21vZGVsL2NvbnRlbnQtZmxvdy1jb250ZW50LXJlbW92YWwuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci1wcm90b2NvbC9tb2RlbC9jb250ZW50LWZsb3ctY29udGVudC1yZW1vdmFs Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNmRkYTA1NgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9tb2RlbC9jb250ZW50 LWZsb3ctY29udGVudC1yZW1vdmFsLmh0bWwKQEAgLTAsMCArMSw2NCBAQAorPCFkb2N0eXBlIGh0 bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLmNvbnRlbnQKK3sKKyAgICAtd2Via2l0LWZs b3ctaW50bzogZmxvdzsKK30KKzwvc3R5bGU+Cis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlw dCIgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9yZXNvdXJjZXMvcHJv dG9jb2wtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gY2hhbmdlRmxvd0Nv bnRlbnQoKQoreworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb250ZW50UmVtb3ZlZCIp LnJlbW92ZSgpOworfQorCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0Lmlt cG9ydEluc3BlY3RvclNjcmlwdHMoKTsKKworICAgIHZhciBjb250ZW50RmxvdzsKKworICAgIFdl Ykluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5GcmFtZVJlc291cmNlTWFuYWdlci5FdmVudC5NYWluRnJhbWVEaWRDaGFuZ2UsIGZ1bmN0 aW9uKGV2ZW50KSB7CisgICAgICAgIHZhciBkb21UcmVlID0gV2ViSW5zcGVjdG9yLmZyYW1lUmVz b3VyY2VNYW5hZ2VyLm1haW5GcmFtZS5kb21UcmVlOworICAgICAgICBkb21UcmVlLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTVRyZWUuRXZlbnQuUm9vdERPTU5vZGVJbnZhbGlkYXRl ZCwgb25Sb290RE9NTm9kZUludmFsaWRhdGVkLCBudWxsKTsKKyAgICAgICAgZG9tVHJlZS5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01UcmVlLkV2ZW50LkNvbnRlbnRGbG93V2FzQWRk ZWQsIG9uQ29udGVudEZsb3dXYXNBZGRlZCwgbnVsbCk7CisgICAgICAgIGRvbVRyZWUucmVxdWVz dENvbnRlbnRGbG93TGlzdCgpOworICAgIH0pOworCisgICAgZnVuY3Rpb24gb25Sb290RE9NTm9k ZUludmFsaWRhdGVkKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNl TWFuYWdlci5tYWluRnJhbWUuZG9tVHJlZS5yZXF1ZXN0Q29udGVudEZsb3dMaXN0KCk7CisgICAg fQorCisgICAgZnVuY3Rpb24gb25Db250ZW50Rmxvd1dhc0FkZGVkKGV2ZW50KQorICAgIHsKKyAg ICAgICAgY29udGVudEZsb3cgPSBldmVudC5kYXRhLmZsb3c7CisgICAgICAgIEluc3BlY3RvclRl c3QuYXNzZXJ0KGNvbnRlbnRGbG93Lm5hbWUgPT09ICJmbG93IiwgIkNvbnRlbnRGbG93IHdhcyBh ZGRlZC4iKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoY29udGVudEZsb3cuY29udGVu dE5vZGVzLmxlbmd0aCA9PT0gMiwgIkNvbnRlbnRGbG93LmNvbnRlbnROb2RlcyBoYXMgYSBsZW5n dGggb2YgMi4iKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoY29udGVudEZsb3cuY29u dGVudE5vZGVzWzBdLmdldEF0dHJpYnV0ZSgiaWQiKSA9PT0gImNvbnRlbnRTdGF0aWMiLCAiQ29u dGVudEZsb3cuY29udGVudE5vZGVzWzBdLmlkIGlzIFwiI2NvbnRlbnRTdGF0aWNcIi4iKTsKKyAg ICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoY29udGVudEZsb3cuY29udGVudE5vZGVzWzFdLmdl dEF0dHJpYnV0ZSgiaWQiKSA9PT0gImNvbnRlbnRSZW1vdmVkIiwgIkNvbnRlbnRGbG93LmNvbnRl bnROb2Rlc1sxXS5pZCBpcyBcIiNjb250ZW50UmVtb3ZlZFwiLiIpOworCisgICAgICAgIGNvbnRl bnRGbG93LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRGbG93LkV2ZW50LkNv bnRlbnROb2RlV2FzUmVtb3ZlZCwgb25Db250ZW50Tm9kZVdhc1JlbW92ZWQsIG51bGwpOworCisg ICAgICAgIEluc3BlY3RvclRlc3Quc2VuZENvbW1hbmQoIlJ1bnRpbWUuZXZhbHVhdGUiLCB7ZXhw cmVzc2lvbjogImNoYW5nZUZsb3dDb250ZW50KCkifSk7CisgICAgfQorCisgICAgZnVuY3Rpb24g b25Db250ZW50Tm9kZVdhc1JlbW92ZWQoZXZlbnQpCisgICAgeworICAgICAgICBJbnNwZWN0b3JU ZXN0LmFzc2VydChldmVudC5kYXRhLm5vZGUuZ2V0QXR0cmlidXRlKCJpZCIpID09PSAiY29udGVu dFJlbW92ZWQiLCAiXCIjY29udGVudFJlbW92ZWRcIiB3YXMgcmVtb3ZlZC4iKTsKKyAgICAgICAg SW5zcGVjdG9yVGVzdC5hc3NlcnQoY29udGVudEZsb3cuY29udGVudE5vZGVzLmluZGV4T2YoZXZl bnQuZGF0YS5ub2RlKSA9PT0gLTEsICJcIiNjb250ZW50UmVtb3ZlZFwiIGNhbm5vdCBiZSBmb3Vu ZCBpbiB0aGUgY29udGVudE5vZGVzIGxpc3QuIik7CisgICAgICAgIEluc3BlY3RvclRlc3QuY29t cGxldGVUZXN0KCk7CisgICAgfQorfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9 InJ1blRlc3QoKSI+CisgICAgPHA+VGVzdGluZyB0aGF0IHRoZSBDb250ZW50Rmxvd3MgZXZlbnRz IGFyZSBjb3JyZWN0bHkgZGlzcGF0Y2hlZCB3aGVuIGNvbnRlbnQgbm9kZXMgYXJlIGRldGFjaGVk IGZyb20gdGhlIERPTS48L3A+CisKKyAgICA8ZGl2IGlkPSJjb250ZW50U3RhdGljIiBjbGFzcz0i Y29udGVudCI+PC9kaXY+CisgICAgPGRpdiBpZD0iY29udGVudFJlbW92ZWQiIGNsYXNzPSJjb250 ZW50Ij48L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGRiMDg3ZDAuLjE3 MzNkNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMy0xMS0wNiAgQWxleGFuZHJ1 IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog Q1NTIFJlZ2lvbnM6IFJlbW92aW5nIGEgY29udGVudCBub2RlIG9mIGEgQ29udGVudEZsb3cgZnJv bSB0aGUgRE9NIHdpbGwgc2VuZCBhIDAgbm9kZUlkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM1NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3ItcHJvdG9jb2wvbW9kZWwvY29u dGVudC1mbG93LWNvbnRlbnQtcmVtb3ZhbC5odG1sCisKKyAgICAgICAgRG8gbm90IHNlbmQgdW5y ZWdpc3RlciBldmVudHMgZm9yIHRoZSBjb250ZW50IG5vZGVzIG9mIGEgZmxvdyB3aGVuIHRoZSBl bGVtZW50IGlzIG5vdCBwYXJ0IG9mIHRoZSBET00KKyAgICAgICAgYW55bW9yZS4gV2UgYWxyZWFk eSBzZW5kIGFuIHVuYmluZCBldmVudCwgc28gdGhlIGluc3BlY3RvciBpcyBhbHJlYWR5IG5vdGlm aWVkIHRoYXQgdGhlIG5vZGUgd2FzIHJlbW92ZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6 OmRpZFVucmVnaXN0ZXJOYW1lZEZsb3dDb250ZW50RWxlbWVudCk6CisKIDIwMTMtMTEtMDYgIEJl bSBKb25lcy1CZXkgIDxiam9uZXNiZUBhZG9iZS5jb20+CiAKICAgICAgICAgUmVuYW1lIHJlZ2lv biBsaW5lIG9mZnNldCBtZXRob2RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNTU0FnZW50LmNwcAppbmRleCAyYmVhYjE0Li5lYmVkYzcyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKQEAgLTc3NSw2ICs3NzUsMTAg QEAgdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6ZGlkVW5yZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRF bGVtZW50KERvY3VtZW50KiBkb2N1bWVudCwKIAogICAgIEVycm9yU3RyaW5nIGVycm9yU3RyaW5n OwogICAgIGludCBjb250ZW50RWxlbWVudE5vZGVJZCA9IG1fZG9tQWdlbnQtPnB1c2hOb2RlVG9G cm9udGVuZCgmZXJyb3JTdHJpbmcsIGRvY3VtZW50Tm9kZUlkLCBjb250ZW50RWxlbWVudCk7Cisg ICAgaWYgKCFjb250ZW50RWxlbWVudE5vZGVJZCkgeworICAgICAgICAvLyBXZSd2ZSBhbHJlYWR5 IG5vdGlmaWVkIHRoYXQgdGhlIERPTSBub2RlIHdhcyByZW1vdmVkIGZyb20gdGhlIERPTSwgc28g dGhlcmUncyBubyBuZWVkIHRvIHNlbmQgYW5vdGhlciBldmVudC4KKyAgICAgICAgcmV0dXJuOwor ICAgIH0KICAgICBtX2Zyb250ZW5kLT51bnJlZ2lzdGVyZWROYW1lZEZsb3dDb250ZW50RWxlbWVu dChkb2N1bWVudE5vZGVJZCwgbmFtZWRGbG93LT5uYW1lKCkuc3RyaW5nKCksIGNvbnRlbnRFbGVt ZW50Tm9kZUlkKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggMzFiNzg2NS4uMjNh ODY1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTMtMTEt MDYgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgogCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IENTUyBSZWdpb25zOiBSZW1vdmluZyBhIGNvbnRlbnQgbm9kZSBvZiBhIENv bnRlbnRGbG93IGZyb20gdGhlIERPTSB3aWxsIHNlbmQgYSAwIG5vZGVJZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNTc3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgIFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICBGaXhlZCB0aGUgY29udGVudCBu b2RlIHJlbW92YWwgZnJvbSB0aGUgY29udGVudCBmbG93LgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9Db250ZW50Rmxvd1RyZWVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0RPTVRyZWVNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5h Z2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUuX2Ny ZWF0ZUNvbnRlbnRGbG93RnJvbVBheWxvYWQpOiBSZWdpc3RlcmVkIGFsbCB0aGUgY29udGVudCBu b2RlcworICAgICAgICBpbiB0aGUgX2NvbnRlbnROb2Rlc1RvRmxvd3NNYXAuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLl91bmJpbmQpOiBBZGRlZCBjYWxs IHRvIF9yZW1vdmVDb250ZW50Tm9kZUZyb21GbG93SWZOZWVkZWQuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLl9yZW1vdmVDb250ZW50Tm9kZUZyb21GbG93 SWZOZWVkZWQpOiBDYWxsZWQgZnJvbSBfdW5iaW5kIHRvIGNoZWNrCisgICAgICAgIGFuZCByZW1v dmUgYSBub2RlIGZyb20gaXQncyBwYXJlbnQgY29udGVudCBmbG93IGlmIG5lZWRlZC4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUudW5yZWdpc3RlcmVkTmFt ZWRGbG93Q29udGVudEVsZW1lbnQpOgorCisyMDEzLTExLTA2ICBBbGV4YW5kcnUgQ2hpY3VsaXRh ICA8YWNoaWN1QGFkb2JlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDU1MgUmVnaW9u czogV2hlbiBhIGZsb3cgaXMgY2xpY2tlZCB0aGUgY29udGVudCBvZiBmbG93IG5lZWRzIHRvIGJl IGRpc3BsYXllZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIyOTI3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRlbnRGbG93VHJlZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udGVudEZsb3dUcmVlQ29udGVudFZpZXcuanMKaW5kZXggNGExZDg5 Mi4uZGZhMzJlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udGVudEZsb3dUcmVlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udGVudEZsb3dUcmVlQ29udGVudFZpZXcuanMKQEAgLTE4Myw2 ICsxODMsNiBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEZsb3dUcmVlQ29udGVudFZpZXcucHJvdG90 eXBlID0gewogICAgICAgICBjb250ZW50Tm9kZU91dGxpbmUuY2xvc2UoKTsKICAgICAgICAgY29u dGVudE5vZGVPdXRsaW5lLmVsZW1lbnQucmVtb3ZlKCk7CiAKLSAgICAgICAgdGhpcy5fbm9kZXNN YXAucmVtb3ZlKGV2ZW50LmRhdGEubm9kZS5pZCk7CisgICAgICAgIHRoaXMuX25vZGVzTWFwLmRl bGV0ZShldmVudC5kYXRhLm5vZGUuaWQpOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9ET01UcmVlTWFuYWdlci5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RPTVRyZWVNYW5hZ2VyLmpzCmluZGV4IDM3ZGY5 N2MuLmQ1MGI4MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0RPTVRyZWVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0RPTVRyZWVNYW5hZ2VyLmpzCkBAIC00MCw2ICs0MCw3IEBAIFdlYkluc3BlY3Rvci5E T01UcmVlTWFuYWdlciA9IGZ1bmN0aW9uKCkgewogICAgIHRoaXMuX2RvY3VtZW50ID0gbnVsbDsK ICAgICB0aGlzLl9hdHRyaWJ1dGVMb2FkTm9kZUlkcyA9IHt9OwogICAgIHRoaXMuX2Zsb3dzID0g e307CisgICAgdGhpcy5fY29udGVudE5vZGVzVG9GbG93c01hcCA9IG5ldyBNYXA7CiB9CiAKIFdl Ykluc3BlY3Rvci5PYmplY3QuYWRkQ29uc3RydWN0b3JGdW5jdGlvbnMoV2ViSW5zcGVjdG9yLkRP TVRyZWVNYW5hZ2VyKTsKQEAgLTMzNyw2ICszMzgsOCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1h bmFnZXIucHJvdG90eXBlID0gewogICAgICAqLwogICAgIF91bmJpbmQ6IGZ1bmN0aW9uKG5vZGUp CiAgICAgeworICAgICAgICB0aGlzLl9yZW1vdmVDb250ZW50Tm9kZUZyb21GbG93SWZOZWVkZWQo bm9kZSk7CisKICAgICAgICAgZGVsZXRlIHRoaXMuX2lkVG9ET01Ob2RlW25vZGUuaWRdOwogICAg ICAgICBmb3IgKHZhciBpID0gMDsgbm9kZS5jaGlsZHJlbiAmJiBpIDwgbm9kZS5jaGlsZHJlbi5s ZW5ndGg7ICsraSkKICAgICAgICAgICAgIHRoaXMuX3VuYmluZChub2RlLmNoaWxkcmVuW2ldKTsK QEAgLTUzNiw3ICs1MzksMTQgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlw ZSA9IHsKICAgICBfY3JlYXRlQ29udGVudEZsb3dGcm9tUGF5bG9hZDogZnVuY3Rpb24oZmxvd1Bh eWxvYWQpCiAgICAgewogICAgICAgICAvLyBGSVhNRTogQ29sbGVjdCB0aGUgcmVnaW9ucyBmcm9t IHRoZSBwYXlsb2FkLgotICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db250ZW50Rmxv dyhmbG93UGF5bG9hZC5kb2N1bWVudE5vZGVJZCwgZmxvd1BheWxvYWQubmFtZSwgZmxvd1BheWxv YWQub3ZlcnNldCwgZmxvd1BheWxvYWQuY29udGVudC5tYXAodGhpcy5ub2RlRm9ySWQuYmluZCh0 aGlzKSkpOworICAgICAgICB2YXIgZmxvdyA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGVudEZsb3co Zmxvd1BheWxvYWQuZG9jdW1lbnROb2RlSWQsIGZsb3dQYXlsb2FkLm5hbWUsIGZsb3dQYXlsb2Fk Lm92ZXJzZXQsIGZsb3dQYXlsb2FkLmNvbnRlbnQubWFwKHRoaXMubm9kZUZvcklkLmJpbmQodGhp cykpKTsKKworICAgICAgICBmb3IgKHZhciBjb250ZW50Tm9kZSBvZiBmbG93LmNvbnRlbnROb2Rl cykgeworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2NvbnRlbnROb2Rlc1RvRmxv d3NNYXAuaGFzKGNvbnRlbnROb2RlLmlkKSk7CisgICAgICAgICAgICB0aGlzLl9jb250ZW50Tm9k ZXNUb0Zsb3dzTWFwLnNldChjb250ZW50Tm9kZS5pZCwgZmxvdyk7CisgICAgICAgIH0KKworICAg ICAgICByZXR1cm4gZmxvdzsKICAgICB9LAogCiAgICAgX3VwZGF0ZUNvbnRlbnRGbG93RnJvbVBh eWxvYWQ6IGZ1bmN0aW9uKGNvbnRlbnRGbG93LCBmbG93UGF5bG9hZCkKQEAgLTU1Nyw2ICs1Njcs NyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAg ICAgICAgIGNvbnNvbGUuZXJyb3IoIkVycm9yIHdoaWxlIGdldHRpbmcgdGhlIG5hbWVkIGZsb3dz IGZvciBkb2N1bWVudCAiICsgZG9jdW1lbnROb2RlSWRlbnRpZmllciArICI6ICIgKyBlcnJvcik7 CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgdGhp cy5fY29udGVudE5vZGVzVG9GbG93c01hcC5jbGVhcigpOwogICAgICAgICAgICAgdmFyIGNvbnRl bnRGbG93cyA9IFtdOwogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBmbG93cy5sZW5n dGg7ICsraSkgewogICAgICAgICAgICAgICAgIHZhciBmbG93UGF5bG9hZCA9IGZsb3dzW2ldOwpA QCAtNjE0LDIxICs2MjUsMzcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBmbG93S2V5ID0gV2ViSW5zcGVjdG9yLkRPTVRyZWVN YW5hZ2VyLl9mbG93UGF5bG9hZEhhc2hLZXkoe2RvY3VtZW50Tm9kZUlkOiBkb2N1bWVudE5vZGVJ ZGVudGlmaWVyLCBuYW1lOiBmbG93TmFtZX0pOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlz Ll9mbG93cy5oYXNPd25Qcm9wZXJ0eShmbG93S2V5KSk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KCF0aGlzLl9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmhhcyhjb250ZW50Tm9kZUlkKSk7CiAKICAg ICAgICAgdmFyIGZsb3cgPSB0aGlzLl9mbG93c1tmbG93S2V5XTsKICAgICAgICAgdmFyIGNvbnRl bnROb2RlID0gdGhpcy5ub2RlRm9ySWQoY29udGVudE5vZGVJZCk7CiAKKyAgICAgICAgdGhpcy5f Y29udGVudE5vZGVzVG9GbG93c01hcC5zZXQoY29udGVudE5vZGUuaWQsIGZsb3cpOworCiAgICAg ICAgIGlmIChuZXh0Q29udGVudEVsZW1lbnROb2RlSWQpCiAgICAgICAgICAgICBmbG93Lmluc2Vy dENvbnRlbnROb2RlQmVmb3JlKGNvbnRlbnROb2RlLCB0aGlzLm5vZGVGb3JJZChuZXh0Q29udGVu dEVsZW1lbnROb2RlSWQpKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgZmxvdy5hcHBlbmRD b250ZW50Tm9kZShjb250ZW50Tm9kZSk7CiAgICAgfSwKIAorICAgIF9yZW1vdmVDb250ZW50Tm9k ZUZyb21GbG93SWZOZWVkZWQ6IGZ1bmN0aW9uKG5vZGUpCisgICAgeworICAgICAgICBpZiAoIXRo aXMuX2NvbnRlbnROb2Rlc1RvRmxvd3NNYXAuaGFzKG5vZGUuaWQpKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB2YXIgZmxvdyA9IHRoaXMuX2NvbnRlbnROb2Rlc1RvRmxvd3NNYXAuZ2V0 KG5vZGUuaWQpOworICAgICAgICB0aGlzLl9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmRlbGV0ZShu b2RlLmlkKTsKKyAgICAgICAgZmxvdy5yZW1vdmVDb250ZW50Tm9kZShub2RlKTsKKyAgICB9LAor CiAgICAgdW5yZWdpc3RlcmVkTmFtZWRGbG93Q29udGVudEVsZW1lbnQ6IGZ1bmN0aW9uKGRvY3Vt ZW50Tm9kZUlkZW50aWZpZXIsIGZsb3dOYW1lLCBjb250ZW50Tm9kZUlkKQogICAgIHsKLSAgICAg ICAgdmFyIGZsb3dLZXkgPSBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuX2Zsb3dQYXlsb2Fk SGFzaEtleSh7ZG9jdW1lbnROb2RlSWQ6IGRvY3VtZW50Tm9kZUlkZW50aWZpZXIsIG5hbWU6IGZs b3dOYW1lfSk7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2Zsb3dzLmhhc093blByb3Bl cnR5KGZsb3dLZXkpKTsKLSAgICAgICAgdGhpcy5fZmxvd3NbZmxvd0tleV0ucmVtb3ZlQ29udGVu dE5vZGUodGhpcy5ub2RlRm9ySWQoY29udGVudE5vZGVJZCkpOworICAgICAgICBjb25zb2xlLmFz c2VydCh0aGlzLl9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmhhcyhjb250ZW50Tm9kZUlkKSk7CisK KyAgICAgICAgdmFyIGZsb3cgPSB0aGlzLl9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmdldChjb250 ZW50Tm9kZUlkKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoZmxvdy5pZCA9PT0gV2ViSW5zcGVj dG9yLkRPTVRyZWVNYW5hZ2VyLl9mbG93UGF5bG9hZEhhc2hLZXkoe2RvY3VtZW50Tm9kZUlkOiBk b2N1bWVudE5vZGVJZGVudGlmaWVyLCBuYW1lOiBmbG93TmFtZX0pKTsKKworICAgICAgICB0aGlz Ll9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmRlbGV0ZShjb250ZW50Tm9kZUlkKTsKKyAgICAgICAg Zmxvdy5yZW1vdmVDb250ZW50Tm9kZSh0aGlzLm5vZGVGb3JJZChjb250ZW50Tm9kZUlkKSk7CiAg ICAgfQogfQogCg==