45897 2010-09-16 09:22:45 -0700 Web Inspector: highlight DOM node when hover on link element or DOM breakpoint 2010-09-20 04:42:40 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov webkit-unassigned bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 280135 0 podivilov 2010-09-16 09:22:45 -0700 Web Inspector: highlight DOM node when hover on link element or DOM breakpoint 280149 1 67805 podivilov 2010-09-16 09:39:37 -0700 Created attachment 67805 Proposed patch. 280611 2 67805 pfeldman 2010-09-17 04:57:31 -0700 Comment on attachment 67805 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=67805&action=prettypatch > WebCore/inspector/front-end/BreakpointsSidebarPane.js:188 > + WebInspector.panels.elements.decorateNodeLabel(WebInspector.domAgent.nodeForId(this._breakpoint.nodeId), link); please mind nullable nodes. 281481 3 68068 podivilov 2010-09-20 03:52:23 -0700 Created attachment 68068 Proposed patch. 281493 4 68068 commit-queue 2010-09-20 04:42:35 -0700 Comment on attachment 68068 Proposed patch. Clearing flags on attachment: 68068 Committed r67844: <http://trac.webkit.org/changeset/67844> 281494 5 commit-queue 2010-09-20 04:42:40 -0700 All reviewed patches have been landed. Closing bug. 67805 2010-09-16 09:39:37 -0700 2010-09-20 03:52:23 -0700 Proposed patch. patch text/plain 11421 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWE4MjEzZi4uZjE3YTRmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMC0wOS0xNiAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBoaWdobGlnaHQgRE9NIG5vZGUg d2hlbiBob3ZlciBvbiBsaW5rIGVsZW1lbnQgb3IgRE9NIGJyZWFrcG9pbnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1ODk3CisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludEl0ZW0pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1Bh bmVsLnByb3RvdHlwZS5oaWRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVs LnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5w cm90b3R5cGUuc2V0RG9jdW1lbnQuc2VsZWN0Tm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RWxlbWVudHNQYW5lbC5wcm90b3R5cGUuX21vdXNlTW92ZWRJbkNydW1icyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUuX21vdXNlTW92ZWRPdXRPZkNydW1i cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUubGlua2lm eU5vZGVSZWZlcmVuY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNU cmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5l LnByb3RvdHlwZS5zZXQgZm9jdXNlZERPTU5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVs ZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLl9vbm1vdXNlbW92ZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUuX29ubW91c2VvdXQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLmhpZ2hsaWdodERPTU5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmhpZ2hsaWdo dERPTU5vZGVXaXRoVGltZW91dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iud2lyZUVsZW1lbnRX aXRoRE9NTm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX3VwZGF0ZUZvY3VzZWROb2RlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IudXBk YXRlRm9jdXNlZE5vZGUpOgorCiAyMDEwLTA5LTE2ICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpz IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMK aW5kZXggY2RhNzJmYi4uZTIxYjlmZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKQEAgLTE4MywxMyArMTgzLDE2IEBA IFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50SXRlbSA9IGZ1bmN0aW9uKGJyZWFrcG9pbnQpCiB7 CiAgICAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRJdGVtLmNhbGwodGhpcywgYnJlYWtwb2ludCk7 CiAKLSAgICB2YXIgbm9kZSA9IFdlYkluc3BlY3Rvci5kb21BZ2VudC5ub2RlRm9ySWQodGhpcy5f YnJlYWtwb2ludC5ub2RlSWQpOwotICAgIHZhciBsaW5rID0gV2ViSW5zcGVjdG9yLnBhbmVscy5l bGVtZW50cy5saW5raWZ5Tm9kZVJlZmVyZW5jZShub2RlKTsKKyAgICB2YXIgbGluayA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICBsaW5rLmNsYXNzTmFtZSA9ICJub2RlLWxp bmsiOworICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMuZGVjb3JhdGVOb2RlTGFiZWwo V2ViSW5zcGVjdG9yLmRvbUFnZW50Lm5vZGVGb3JJZCh0aGlzLl9icmVha3BvaW50Lm5vZGVJZCks IGxpbmspOwogICAgIHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQobGluayk7CiAKICAgICB2YXIg dHlwZSA9IFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LmxhYmVsRm9yVHlwZSh0aGlzLl9icmVh a3BvaW50LnR5cGUpOwogICAgIHZhciB0eXBlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZVRleHRO b2RlKCIgLSAiICsgdHlwZSk7CiAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0eXBlRWxl bWVudCk7CisKKyAgICBXZWJJbnNwZWN0b3Iud2lyZUVsZW1lbnRXaXRoRE9NTm9kZSh0aGlzLl9l bGVtZW50LCB0aGlzLl9icmVha3BvaW50Lm5vZGVJZCk7CiB9CiAKIFdlYkluc3BlY3Rvci5ET01C cmVha3BvaW50SXRlbS5wcm90b3R5cGUgPSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IDcyOGM0OGUuLmU0ODJhZTggMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCkBAIC0xNDcsNyArMTQ3LDcgQEAg V2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAg V2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS5oaWRlLmNhbGwodGhpcyk7CiAKLSAgICAgICAg V2ViSW5zcGVjdG9yLmhvdmVyZWRET01Ob2RlID0gbnVsbDsKKyAgICAgICAgV2ViSW5zcGVjdG9y LmhpZ2hsaWdodERPTU5vZGUoMCk7CiAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuZGlzYWJsZVNl YXJjaGluZ0Zvck5vZGUoKTsKICAgICB9LAogCkBAIC0xNjUsNyArMTY1LDcgQEAgV2ViSW5zcGVj dG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnJvb3RET01Ob2Rl ID0gbnVsbDsKICAgICAgICAgdGhpcy5mb2N1c2VkRE9NTm9kZSA9IG51bGw7CiAKLSAgICAgICAg V2ViSW5zcGVjdG9yLmhvdmVyZWRET01Ob2RlID0gbnVsbDsKKyAgICAgICAgV2ViSW5zcGVjdG9y LmhpZ2hsaWdodERPTU5vZGUoMCk7CiAKICAgICAgICAgdGhpcy5yZWNlbnRseU1vZGlmaWVkTm9k ZXMgPSBbXTsKIApAQCAtMTg3LDkgKzE4Nyw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgaW5zcGVjdGVkUm9vdERvY3VtZW50LmFkZEV2ZW50TGlz dGVuZXIoIkRPTU5vZGVSZW1vdmVkIiwgdGhpcy5fbm9kZVJlbW92ZWQuYmluZCh0aGlzKSk7CiAg ICAgICAgIGluc3BlY3RlZFJvb3REb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJET01BdHRyTW9k aWZpZWQiLCB0aGlzLl9hdHRyaWJ1dGVzVXBkYXRlZC5iaW5kKHRoaXMpKTsKIAotICAgICAgICB0 aGlzLnRyZWVPdXRsaW5lLnN1cHByZXNzU2VsZWN0SGlnaGxpZ2h0ID0gdHJ1ZTsKICAgICAgICAg dGhpcy5yb290RE9NTm9kZSA9IGluc3BlY3RlZFJvb3REb2N1bWVudDsKLSAgICAgICAgdGhpcy50 cmVlT3V0bGluZS5zdXBwcmVzc1NlbGVjdEhpZ2hsaWdodCA9IGZhbHNlOwogCiAgICAgICAgIGZ1 bmN0aW9uIHNlbGVjdE5vZGUoY2FuZGlkYXRlRm9jdXNOb2RlKQogICAgICAgICB7CkBAIC0xOTks MTEgKzE5Nyw5IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIGlmICghY2FuZGlkYXRlRm9jdXNOb2RlKQogICAgICAgICAgICAgICAgIHJldHVy bjsKIAotICAgICAgICAgICAgdGhpcy50cmVlT3V0bGluZS5zdXBwcmVzc1NlbGVjdEhpZ2hsaWdo dCA9IHRydWU7CiAgICAgICAgICAgICB0aGlzLmZvY3VzZWRET01Ob2RlID0gY2FuZGlkYXRlRm9j dXNOb2RlOwogICAgICAgICAgICAgaWYgKHRoaXMudHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxl bWVudCkKICAgICAgICAgICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1l bnQuZXhwYW5kKCk7Ci0gICAgICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLnN1cHByZXNzU2VsZWN0 SGlnaGxpZ2h0ID0gZmFsc2U7CiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBzZWxlY3RM YXN0U2VsZWN0ZWROb2RlKG5vZGVJZCkKQEAgLTU3OCw3ICs1NzQsNyBAQCBXZWJJbnNwZWN0b3Iu RWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBub2RlVW5kZXJNb3VzZSA9 IGRvY3VtZW50LmVsZW1lbnRGcm9tUG9pbnQoZXZlbnQucGFnZVgsIGV2ZW50LnBhZ2VZKTsKICAg ICAgICAgdmFyIGNydW1iRWxlbWVudCA9IG5vZGVVbmRlck1vdXNlLmVuY2xvc2luZ05vZGVPclNl bGZXaXRoQ2xhc3MoImNydW1iIik7CiAKLSAgICAgICAgV2ViSW5zcGVjdG9yLmhvdmVyZWRET01O b2RlID0gKGNydW1iRWxlbWVudCA/IGNydW1iRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCA6IG51 bGwpOworICAgICAgICBXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0RE9NTm9kZShjcnVtYkVsZW1lbnQg PyBjcnVtYkVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QuaWQgOiAwKTsKIAogICAgICAgICBpZiAo Il9tb3VzZU91dE9mQ3J1bWJzVGltZW91dCIgaW4gdGhpcykgewogICAgICAgICAgICAgY2xlYXJU aW1lb3V0KHRoaXMuX21vdXNlT3V0T2ZDcnVtYnNUaW1lb3V0KTsKQEAgLTU5Miw3ICs1ODgsNyBA QCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChu b2RlVW5kZXJNb3VzZSAmJiBub2RlVW5kZXJNb3VzZS5pc0Rlc2NlbmRhbnQodGhpcy5jcnVtYnNF bGVtZW50KSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBXZWJJbnNwZWN0b3IuaG92 ZXJlZERPTU5vZGUgPSBudWxsOworICAgICAgICBXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0RE9NTm9k ZSgwKTsKIAogICAgICAgICB0aGlzLl9tb3VzZU91dE9mQ3J1bWJzVGltZW91dCA9IHNldFRpbWVv dXQodGhpcy51cGRhdGVCcmVhZGNydW1iU2l6ZXMuYmluZCh0aGlzKSwgMTAwMCk7CiAgICAgfSwK QEAgLTc3OCw4ICs3NzQsOCBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgewogICAgICAgICB2YXIgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNw YW4iKTsKICAgICAgICAgbGluay5jbGFzc05hbWUgPSAibm9kZS1saW5rIjsKLSAgICAgICAgbGlu ay5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIFdlYkluc3BlY3Rvci51cGRhdGVGb2N1c2VkTm9k ZS5iaW5kKFdlYkluc3BlY3Rvciwgbm9kZS5pZCksIGZhbHNlKTsKICAgICAgICAgdGhpcy5kZWNv cmF0ZU5vZGVMYWJlbChub2RlLCBsaW5rKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLndpcmVFbGVt ZW50V2l0aERPTU5vZGUobGluaywgbm9kZS5pZCk7CiAgICAgICAgIHJldHVybiBsaW5rOwogICAg IH0sCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1Ry ZWVPdXRsaW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91 dGxpbmUuanMKaW5kZXggMTg4OGExNy4uZTI2MTIzNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKQEAgLTkzLDI3ICs5Myw4IEBA IFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAg Ly8gYW5kIHRoZSBzZWxlY3QoKSBjYWxsIHdvdWxkIGNoYW5nZSB0aGUgZm9jdXNlZERPTU5vZGUg YW5kIHJlZW50ZXIgdGhpcyBzZXR0ZXIuIFNvIHRvCiAgICAgICAgIC8vIGF2b2lkIGNhbGxpbmcg Zm9jdXNlZE5vZGVDaGFuZ2VkKCkgdHdpY2UsIGZpcnN0IGNoZWNrIGlmIF9mb2N1c2VkRE9NTm9k ZSBpcyB0aGUgc2FtZQogICAgICAgICAvLyBub2RlIGFzIHRoZSBvbmUgcGFzc2VkIGluLgotICAg ICAgICBpZiAodGhpcy5fZm9jdXNlZERPTU5vZGUgPT09IHgpIHsKKyAgICAgICAgaWYgKHRoaXMu X2ZvY3VzZWRET01Ob2RlID09PSB4KQogICAgICAgICAgICAgdGhpcy5mb2N1c2VkTm9kZUNoYW5n ZWQoKTsKLQotICAgICAgICAgICAgaWYgKHggJiYgIXRoaXMuc3VwcHJlc3NTZWxlY3RIaWdobGln aHQpIHsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmhpZ2hsaWdodERPTU5vZGUo eC5pZCk7Ci0KLSAgICAgICAgICAgICAgICBpZiAoIl9yZXN0b3JlUHJldmlvdXNIaWdobGlnaHRO b2RlVGltZW91dCIgaW4gdGhpcykKLSAgICAgICAgICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRo aXMuX3Jlc3RvcmVQcmV2aW91c0hpZ2hsaWdodE5vZGVUaW1lb3V0KTsKLQotICAgICAgICAgICAg ICAgIGZ1bmN0aW9uIHJlc3RvcmVIaWdobGlnaHRUb0hvdmVyZWROb2RlKCkKLSAgICAgICAgICAg ICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBob3ZlcmVkTm9kZSA9IFdlYkluc3BlY3Rv ci5ob3ZlcmVkRE9NTm9kZTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGhvdmVyZWROb2RlKQot ICAgICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5oaWdobGlnaHRET01Ob2Rl KGhvdmVyZWROb2RlLmlkKTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5oaWRlRE9NTm9kZUhpZ2hsaWdodCgpOwotICAg ICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgIHRoaXMuX3Jlc3RvcmVQcmV2aW91c0hp Z2hsaWdodE5vZGVUaW1lb3V0ID0gc2V0VGltZW91dChyZXN0b3JlSGlnaGxpZ2h0VG9Ib3ZlcmVk Tm9kZSwgMjAwMCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KICAgICB9LAogCiAgICAgZ2V0 IGVkaXRpbmcoKQpAQCAtMjYwLDcgKzI0MSw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVP dXRsaW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBlbGVtZW50Ll9jcmVhdGVUb29s dGlwRm9yTm9kZSgpOwogICAgICAgICB9CiAKLSAgICAgICAgV2ViSW5zcGVjdG9yLmhvdmVyZWRE T01Ob2RlID0gKGVsZW1lbnQgPyBlbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0IDogbnVsbCk7Cisg ICAgICAgIFdlYkluc3BlY3Rvci5oaWdobGlnaHRET01Ob2RlKGVsZW1lbnQgPyBlbGVtZW50LnJl cHJlc2VudGVkT2JqZWN0LmlkIDogMCk7CiAgICAgfSwKIAogICAgIF9vbm1vdXNlb3V0OiBmdW5j dGlvbihldmVudCkKQEAgLTI3NCw3ICsyNTUsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVl T3V0bGluZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fcHJldmlvdXNI b3ZlcmVkRWxlbWVudDsKICAgICAgICAgfQogCi0gICAgICAgIFdlYkluc3BlY3Rvci5ob3ZlcmVk RE9NTm9kZSA9IG51bGw7CisgICAgICAgIFdlYkluc3BlY3Rvci5oaWdobGlnaHRET01Ob2RlKDAp OwogICAgIH0sCiAKICAgICBfY29udGV4dE1lbnVFdmVudEZpcmVkOiBmdW5jdGlvbihldmVudCkK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IGRhNzdkZTMuLjRl NmQ1ZWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtNDAz LDQ1ICs0MDMsNDQgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICAgICAgfQogICAgIH0sCiAK LSAgICBnZXQgaG92ZXJlZERPTU5vZGUoKQorICAgIGhpZ2hsaWdodERPTU5vZGU6IGZ1bmN0aW9u KG5vZGVJZCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9ob3ZlcmVkRE9NTm9kZTsKLSAg ICB9LAorICAgICAgICBpZiAoIl9oaWRlRE9NTm9kZUhpZ2hsaWdodFRpbWVvdXQiIGluIHRoaXMp IHsKKyAgICAgICAgICAgIGNsZWFyVGltZW91dCh0aGlzLl9oaWRlRE9NTm9kZUhpZ2hsaWdodFRp bWVvdXQpOworICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2hpZGVET01Ob2RlSGlnaGxpZ2h0VGlt ZW91dDsKKyAgICAgICAgfQogCi0gICAgc2V0IGhvdmVyZWRET01Ob2RlKHgpCi0gICAgewotICAg ICAgICBpZiAodGhpcy5faG92ZXJlZERPTU5vZGUgPT09IHgpCisgICAgICAgIGlmICh0aGlzLl9o aWdobGlnaHRlZERPTU5vZGVJZCA9PT0gbm9kZUlkKQogICAgICAgICAgICAgcmV0dXJuOwogCi0g ICAgICAgIHRoaXMuX2hvdmVyZWRET01Ob2RlID0geDsKLQotICAgICAgICBpZiAodGhpcy5faG92 ZXJlZERPTU5vZGUpCi0gICAgICAgICAgICB0aGlzLl91cGRhdGVIb3ZlckhpZ2hsaWdodFNvb24o dGhpcy5zaG93aW5nRE9NTm9kZUhpZ2hsaWdodCA/IDUwIDogNTAwKTsKKyAgICAgICAgdGhpcy5f aGlnaGxpZ2h0ZWRET01Ob2RlSWQgPSBub2RlSWQ7CisgICAgICAgIGlmIChub2RlSWQpCisgICAg ICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmhpZ2hsaWdodERPTU5vZGUobm9kZUlkKTsKICAgICAg ICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fdXBkYXRlSG92ZXJIaWdobGlnaHQoKTsKKyAgICAg ICAgICAgIEluc3BlY3RvckJhY2tlbmQuaGlkZURPTU5vZGVIaWdobGlnaHQoKTsKICAgICB9LAog Ci0gICAgX3VwZGF0ZUhvdmVySGlnaGxpZ2h0U29vbjogZnVuY3Rpb24oZGVsYXkpCisgICAgaGln aGxpZ2h0RE9NTm9kZVdpdGhUaW1lb3V0OiBmdW5jdGlvbihub2RlSWQsIHRpbWVvdXQpCiAgICAg ewotICAgICAgICBpZiAoIl91cGRhdGVIb3ZlckhpZ2hsaWdodFRpbWVvdXQiIGluIHRoaXMpCi0g ICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fdXBkYXRlSG92ZXJIaWdobGlnaHRUaW1lb3V0 KTsKLSAgICAgICAgdGhpcy5fdXBkYXRlSG92ZXJIaWdobGlnaHRUaW1lb3V0ID0gc2V0VGltZW91 dCh0aGlzLl91cGRhdGVIb3ZlckhpZ2hsaWdodC5iaW5kKHRoaXMpLCBkZWxheSk7CisgICAgICAg IHRoaXMuaGlnaGxpZ2h0RE9NTm9kZShub2RlSWQpOworICAgICAgICB0aGlzLl9oaWRlRE9NTm9k ZUhpZ2hsaWdodFRpbWVvdXQgPSBzZXRUaW1lb3V0KHRoaXMuaGlnaGxpZ2h0RE9NTm9kZS5iaW5k KHRoaXMsIDApLCB0aW1lb3V0KTsKICAgICB9LAogCi0gICAgX3VwZGF0ZUhvdmVySGlnaGxpZ2h0 OiBmdW5jdGlvbigpCisgICAgd2lyZUVsZW1lbnRXaXRoRE9NTm9kZTogZnVuY3Rpb24oZWxlbWVu dCwgbm9kZUlkKQogICAgIHsKLSAgICAgICAgaWYgKCJfdXBkYXRlSG92ZXJIaWdobGlnaHRUaW1l b3V0IiBpbiB0aGlzKSB7Ci0gICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fdXBkYXRlSG92 ZXJIaWdobGlnaHRUaW1lb3V0KTsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl91cGRhdGVIb3Zl ckhpZ2hsaWdodFRpbWVvdXQ7Ci0gICAgICAgIH0KKyAgICAgICAgZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJjbGljayIsIHRoaXMuX3VwZGF0ZUZvY3VzZWROb2RlLmJpbmQodGhpcywgbm9kZUlk KSwgZmFsc2UpOworICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3ZlciIs IHRoaXMuaGlnaGxpZ2h0RE9NTm9kZS5iaW5kKHRoaXMsIG5vZGVJZCksIGZhbHNlKTsKKyAgICAg ICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW91dCIsIHRoaXMuaGlnaGxpZ2h0RE9N Tm9kZS5iaW5kKHRoaXMsIDApLCBmYWxzZSk7CisgICAgfSwKIAotICAgICAgICBpZiAodGhpcy5f aG92ZXJlZERPTU5vZGUpIHsKLSAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuaGlnaGxpZ2h0 RE9NTm9kZSh0aGlzLl9ob3ZlcmVkRE9NTm9kZS5pZCk7Ci0gICAgICAgICAgICB0aGlzLnNob3dp bmdET01Ob2RlSGlnaGxpZ2h0ID0gdHJ1ZTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg IEluc3BlY3RvckJhY2tlbmQuaGlkZURPTU5vZGVIaWdobGlnaHQoKTsKLSAgICAgICAgICAgIHRo aXMuc2hvd2luZ0RPTU5vZGVIaWdobGlnaHQgPSBmYWxzZTsKLSAgICAgICAgfQorICAgIF91cGRh dGVGb2N1c2VkTm9kZTogZnVuY3Rpb24obm9kZUlkKQorICAgIHsKKyAgICAgICAgdmFyIG5vZGUg PSBXZWJJbnNwZWN0b3IuZG9tQWdlbnQubm9kZUZvcklkKG5vZGVJZCk7CisgICAgICAgIGlmICgh bm9kZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLmN1cnJlbnRQYW5lbCA9 IHRoaXMucGFuZWxzLmVsZW1lbnRzOworICAgICAgICB0aGlzLnBhbmVscy5lbGVtZW50cy5mb2N1 c2VkRE9NTm9kZSA9IG5vZGU7CiAgICAgfQogfQogCkBAIC0xNDY3LDcgKzE0NjYsNyBAQCBXZWJJ bnNwZWN0b3IucmVzZXQgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5yZXNvdXJjZVVSTE1hcCA9IHt9 OwogICAgIHRoaXMuY29va2llRG9tYWlucyA9IHt9OwogICAgIHRoaXMuYXBwbGljYXRpb25DYWNo ZURvbWFpbnMgPSB7fTsKLSAgICB0aGlzLmhvdmVyZWRET01Ob2RlID0gbnVsbDsKKyAgICB0aGlz LmhpZ2hsaWdodERPTU5vZGUoMCk7CiAKICAgICBkZWxldGUgdGhpcy5tYWluUmVzb3VyY2U7CiAK QEAgLTE2NzYsMTMgKzE2NzUsOCBAQCBXZWJJbnNwZWN0b3IuZHJhd0xvYWRpbmdQaWVDaGFydCA9 IGZ1bmN0aW9uKGNhbnZhcywgcGVyY2VudCkgewogCiBXZWJJbnNwZWN0b3IudXBkYXRlRm9jdXNl ZE5vZGUgPSBmdW5jdGlvbihub2RlSWQpCiB7Ci0gICAgdmFyIG5vZGUgPSBXZWJJbnNwZWN0b3Iu ZG9tQWdlbnQubm9kZUZvcklkKG5vZGVJZCk7Ci0gICAgaWYgKCFub2RlKQotICAgICAgICAvLyBG SVhNRTogU2hvdWxkIHdlIGRlc2VsZWN0IGlmIG51bGwgaXMgcGFzc2VkIGluPwotICAgICAgICBy ZXR1cm47Ci0KLSAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHRoaXMucGFuZWxzLmVsZW1lbnRzOwot ICAgIHRoaXMucGFuZWxzLmVsZW1lbnRzLmZvY3VzZWRET01Ob2RlID0gbm9kZTsKKyAgICB0aGlz Ll91cGRhdGVGb2N1c2VkTm9kZShub2RlSWQpOworICAgIHRoaXMuaGlnaGxpZ2h0RE9NTm9kZVdp dGhUaW1lb3V0KG5vZGVJZCwgMjAwMCk7CiB9CiAKIFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZv clVSTCA9IGZ1bmN0aW9uKHVybCkK 68068 2010-09-20 03:52:23 -0700 2010-09-20 04:42:35 -0700 Proposed patch. patch text/plain 12497 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWNmZjY3NS4uODg4MWIxOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMC0wOS0yMCAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBoaWdobGlnaHQgRE9NIG5vZGUg d2hlbiBob3ZlciBvbiBsaW5rIGVsZW1lbnQgb3IgRE9NIGJyZWFrcG9pbnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1ODk3CisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQnJlYWtwb2ludEl0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkpTQnJl YWtwb2ludEl0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnRJdGVtKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50SXRlbS5wcm90b3R5cGUuY29tcGFy ZVRvKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50SXRlbS5wcm90b3R5cGUu X2JyZWFrcG9pbnRDbGlja2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1l bnRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5 cGUuaGlkZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUu cmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLnNl dERvY3VtZW50LnNlbGVjdE5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFu ZWwucHJvdG90eXBlLl9tb3VzZU1vdmVkSW5DcnVtYnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLl9tb3VzZU1vdmVkT3V0T2ZDcnVtYnMpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmxpbmtpZnlOb2RlUmVmZXJl bmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUu c2V0IGZvY3VzZWRET01Ob2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVP dXRsaW5lLnByb3RvdHlwZS5fb25tb3VzZW1vdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVs ZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLl9vbm1vdXNlb3V0KToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5oaWdo bGlnaHRET01Ob2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5oaWdobGlnaHRET01Ob2RlRm9y VHdvU2Vjb25kcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iud2lyZUVsZW1lbnRXaXRoRE9NTm9k ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX3VwZGF0ZUZvY3VzZWROb2RlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IudXBkYXRlRm9jdXNl ZE5vZGUpOgorCiAyMDEwLTA5LTE5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdt YWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNjc3NDkuCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFu ZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5l LmpzCmluZGV4IGNkYTcyZmIuLjk2ODhmM2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCkBAIC05Nyw2ICs5Nyw3IEBA IFdlYkluc3BlY3Rvci5CcmVha3BvaW50SXRlbSA9IGZ1bmN0aW9uKGJyZWFrcG9pbnQpCiAgICAg dGhpcy5fYnJlYWtwb2ludCA9IGJyZWFrcG9pbnQ7CiAKICAgICB0aGlzLl9lbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgibGkiKTsKKyAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImNsaWNrIiwgdGhpcy5fYnJlYWtwb2ludENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2Up OwogCiAgICAgdmFyIGNoZWNrYm94RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImlu cHV0Iik7CiAgICAgY2hlY2tib3hFbGVtZW50LmNsYXNzTmFtZSA9ICJjaGVja2JveC1lbGVtIjsK QEAgLTE0MSw4ICsxNDIsNiBAQCBXZWJJbnNwZWN0b3IuSlNCcmVha3BvaW50SXRlbSA9IGZ1bmN0 aW9uKGJyZWFrcG9pbnQpCiB7CiAgICAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRJdGVtLmNhbGwo dGhpcywgYnJlYWtwb2ludCk7CiAKLSAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIo ImNsaWNrIiwgdGhpcy5fYnJlYWtwb2ludENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwotCiAg ICAgdmFyIGRpc3BsYXlOYW1lID0gdGhpcy5fYnJlYWtwb2ludC51cmwgPyBXZWJJbnNwZWN0b3Iu ZGlzcGxheU5hbWVGb3JVUkwodGhpcy5fYnJlYWtwb2ludC51cmwpIDogV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCIocHJvZ3JhbSkiKTsKICAgICB2YXIgbGFiZWxFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUoZGlzcGxheU5hbWUgKyAiOiIgKyB0aGlzLl9icmVha3BvaW50LmxpbmUpOwog ICAgIHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQobGFiZWxFbGVtZW50KTsKQEAgLTE4Myw4ICsx ODIsNyBAQCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludEl0ZW0gPSBmdW5jdGlvbihicmVha3Bv aW50KQogewogICAgIFdlYkluc3BlY3Rvci5CcmVha3BvaW50SXRlbS5jYWxsKHRoaXMsIGJyZWFr cG9pbnQpOwogCi0gICAgdmFyIG5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tQWdlbnQubm9kZUZvcklk KHRoaXMuX2JyZWFrcG9pbnQubm9kZUlkKTsKLSAgICB2YXIgbGluayA9IFdlYkluc3BlY3Rvci5w YW5lbHMuZWxlbWVudHMubGlua2lmeU5vZGVSZWZlcmVuY2Uobm9kZSk7CisgICAgdmFyIGxpbmsg PSBXZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLmxpbmtpZnlOb2RlQnlJZCh0aGlzLl9icmVh a3BvaW50Lm5vZGVJZCk7CiAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZChsaW5rKTsKIAog ICAgIHZhciB0eXBlID0gV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQubGFiZWxGb3JUeXBlKHRo aXMuX2JyZWFrcG9pbnQudHlwZSk7CkBAIC0xOTgsNiArMTk2LDExIEBAIFdlYkluc3BlY3Rvci5E T01CcmVha3BvaW50SXRlbS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl9icmVha3Bv aW50LnR5cGUgIT0gb3RoZXIuX2JyZWFrcG9pbnQudHlwZSkKICAgICAgICAgICAgIHJldHVybiB0 aGlzLl9icmVha3BvaW50LnR5cGUgPCBvdGhlci5fYnJlYWtwb2ludC50eXBlID8gLTEgOiAxOwog ICAgICAgICByZXR1cm4gMDsKKyAgICB9LAorCisgICAgX2JyZWFrcG9pbnRDbGlja2VkOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IudXBkYXRlRm9jdXNlZE5vZGUodGhp cy5fYnJlYWtwb2ludC5ub2RlSWQpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcwppbmRleCA5Y2ZmM2E3Li43MmIyM2UxIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcwpAQCAtMTQ3LDcgKzE0 Nyw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICB7CiAg ICAgICAgIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuaGlkZS5jYWxsKHRoaXMpOwogCi0g ICAgICAgIFdlYkluc3BlY3Rvci5ob3ZlcmVkRE9NTm9kZSA9IG51bGw7CisgICAgICAgIFdlYklu c3BlY3Rvci5oaWdobGlnaHRET01Ob2RlKDApOwogICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmRp c2FibGVTZWFyY2hpbmdGb3JOb2RlKCk7CiAgICAgfSwKIApAQCAtMTY1LDcgKzE2NSw3IEBAIFdl Ykluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yb290 RE9NTm9kZSA9IG51bGw7CiAgICAgICAgIHRoaXMuZm9jdXNlZERPTU5vZGUgPSBudWxsOwogCi0g ICAgICAgIFdlYkluc3BlY3Rvci5ob3ZlcmVkRE9NTm9kZSA9IG51bGw7CisgICAgICAgIFdlYklu c3BlY3Rvci5oaWdobGlnaHRET01Ob2RlKDApOwogCiAgICAgICAgIHRoaXMucmVjZW50bHlNb2Rp ZmllZE5vZGVzID0gW107CiAKQEAgLTE4Nyw5ICsxODcsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVu dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGluc3BlY3RlZFJvb3REb2N1bWVudC5hZGRF dmVudExpc3RlbmVyKCJET01Ob2RlUmVtb3ZlZCIsIHRoaXMuX25vZGVSZW1vdmVkLmJpbmQodGhp cykpOwogICAgICAgICBpbnNwZWN0ZWRSb290RG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiRE9N QXR0ck1vZGlmaWVkIiwgdGhpcy5fYXR0cmlidXRlc1VwZGF0ZWQuYmluZCh0aGlzKSk7CiAKLSAg ICAgICAgdGhpcy50cmVlT3V0bGluZS5zdXBwcmVzc1NlbGVjdEhpZ2hsaWdodCA9IHRydWU7CiAg ICAgICAgIHRoaXMucm9vdERPTU5vZGUgPSBpbnNwZWN0ZWRSb290RG9jdW1lbnQ7Ci0gICAgICAg IHRoaXMudHJlZU91dGxpbmUuc3VwcHJlc3NTZWxlY3RIaWdobGlnaHQgPSBmYWxzZTsKIAogICAg ICAgICBmdW5jdGlvbiBzZWxlY3ROb2RlKGNhbmRpZGF0ZUZvY3VzTm9kZSkKICAgICAgICAgewpA QCAtMTk5LDExICsxOTcsOSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICBpZiAoIWNhbmRpZGF0ZUZvY3VzTm9kZSkKICAgICAgICAgICAgICAg ICByZXR1cm47CiAKLSAgICAgICAgICAgIHRoaXMudHJlZU91dGxpbmUuc3VwcHJlc3NTZWxlY3RI aWdobGlnaHQgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5mb2N1c2VkRE9NTm9kZSA9IGNhbmRp ZGF0ZUZvY3VzTm9kZTsKICAgICAgICAgICAgIGlmICh0aGlzLnRyZWVPdXRsaW5lLnNlbGVjdGVk VHJlZUVsZW1lbnQpCiAgICAgICAgICAgICAgICAgdGhpcy50cmVlT3V0bGluZS5zZWxlY3RlZFRy ZWVFbGVtZW50LmV4cGFuZCgpOwotICAgICAgICAgICAgdGhpcy50cmVlT3V0bGluZS5zdXBwcmVz c1NlbGVjdEhpZ2hsaWdodCA9IGZhbHNlOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24g c2VsZWN0TGFzdFNlbGVjdGVkTm9kZShub2RlSWQpCkBAIC01NzgsNyArNTc0LDcgQEAgV2ViSW5z cGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgbm9kZVVuZGVy TW91c2UgPSBkb2N1bWVudC5lbGVtZW50RnJvbVBvaW50KGV2ZW50LnBhZ2VYLCBldmVudC5wYWdl WSk7CiAgICAgICAgIHZhciBjcnVtYkVsZW1lbnQgPSBub2RlVW5kZXJNb3VzZS5lbmNsb3NpbmdO b2RlT3JTZWxmV2l0aENsYXNzKCJjcnVtYiIpOwogCi0gICAgICAgIFdlYkluc3BlY3Rvci5ob3Zl cmVkRE9NTm9kZSA9IChjcnVtYkVsZW1lbnQgPyBjcnVtYkVsZW1lbnQucmVwcmVzZW50ZWRPYmpl Y3QgOiBudWxsKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmhpZ2hsaWdodERPTU5vZGUoY3J1bWJF bGVtZW50ID8gY3J1bWJFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0LmlkIDogMCk7CiAKICAgICAg ICAgaWYgKCJfbW91c2VPdXRPZkNydW1ic1RpbWVvdXQiIGluIHRoaXMpIHsKICAgICAgICAgICAg IGNsZWFyVGltZW91dCh0aGlzLl9tb3VzZU91dE9mQ3J1bWJzVGltZW91dCk7CkBAIC01OTIsNyAr NTg4LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICBpZiAobm9kZVVuZGVyTW91c2UgJiYgbm9kZVVuZGVyTW91c2UuaXNEZXNjZW5kYW50KHRoaXMu Y3J1bWJzRWxlbWVudCkpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgV2ViSW5zcGVj dG9yLmhvdmVyZWRET01Ob2RlID0gbnVsbDsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmhpZ2hsaWdo dERPTU5vZGUoMCk7CiAKICAgICAgICAgdGhpcy5fbW91c2VPdXRPZkNydW1ic1RpbWVvdXQgPSBz ZXRUaW1lb3V0KHRoaXMudXBkYXRlQnJlYWRjcnVtYlNpemVzLmJpbmQodGhpcyksIDEwMDApOwog ICAgIH0sCkBAIC03NzgsOCArNzc0LDggQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIGxpbmsgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJzcGFuIik7CiAgICAgICAgIGxpbmsuY2xhc3NOYW1lID0gIm5vZGUtbGluayI7Ci0gICAg ICAgIGxpbmsuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBXZWJJbnNwZWN0b3IudXBkYXRlRm9j dXNlZE5vZGUuYmluZChXZWJJbnNwZWN0b3IsIG5vZGUuaWQpLCBmYWxzZSk7CiAgICAgICAgIHRo aXMuZGVjb3JhdGVOb2RlTGFiZWwobm9kZSwgbGluayk7CisgICAgICAgIFdlYkluc3BlY3Rvci53 aXJlRWxlbWVudFdpdGhET01Ob2RlKGxpbmssIG5vZGUuaWQpOwogICAgICAgICByZXR1cm4gbGlu azsKICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxl bWVudHNUcmVlT3V0bGluZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1RyZWVPdXRsaW5lLmpzCmluZGV4IDE4ODhhMTcuLmUyNjEyMzQgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC05MywyNyAr OTMsOCBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIC8vIGFuZCB0aGUgc2VsZWN0KCkgY2FsbCB3b3VsZCBjaGFuZ2UgdGhlIGZvY3VzZWRE T01Ob2RlIGFuZCByZWVudGVyIHRoaXMgc2V0dGVyLiBTbyB0bwogICAgICAgICAvLyBhdm9pZCBj YWxsaW5nIGZvY3VzZWROb2RlQ2hhbmdlZCgpIHR3aWNlLCBmaXJzdCBjaGVjayBpZiBfZm9jdXNl ZERPTU5vZGUgaXMgdGhlIHNhbWUKICAgICAgICAgLy8gbm9kZSBhcyB0aGUgb25lIHBhc3NlZCBp bi4KLSAgICAgICAgaWYgKHRoaXMuX2ZvY3VzZWRET01Ob2RlID09PSB4KSB7CisgICAgICAgIGlm ICh0aGlzLl9mb2N1c2VkRE9NTm9kZSA9PT0geCkKICAgICAgICAgICAgIHRoaXMuZm9jdXNlZE5v ZGVDaGFuZ2VkKCk7Ci0KLSAgICAgICAgICAgIGlmICh4ICYmICF0aGlzLnN1cHByZXNzU2VsZWN0 SGlnaGxpZ2h0KSB7Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5oaWdobGlnaHRE T01Ob2RlKHguaWQpOwotCi0gICAgICAgICAgICAgICAgaWYgKCJfcmVzdG9yZVByZXZpb3VzSGln aGxpZ2h0Tm9kZVRpbWVvdXQiIGluIHRoaXMpCi0gICAgICAgICAgICAgICAgICAgIGNsZWFyVGlt ZW91dCh0aGlzLl9yZXN0b3JlUHJldmlvdXNIaWdobGlnaHROb2RlVGltZW91dCk7Ci0KLSAgICAg ICAgICAgICAgICBmdW5jdGlvbiByZXN0b3JlSGlnaGxpZ2h0VG9Ib3ZlcmVkTm9kZSgpCi0gICAg ICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICB2YXIgaG92ZXJlZE5vZGUgPSBXZWJJ bnNwZWN0b3IuaG92ZXJlZERPTU5vZGU7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChob3ZlcmVk Tm9kZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuaGlnaGxpZ2h0 RE9NTm9kZShob3ZlcmVkTm9kZS5pZCk7Ci0gICAgICAgICAgICAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgICAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuaGlkZURPTU5vZGVIaWdobGlnaHQo KTsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICB0aGlzLl9yZXN0b3JlUHJl dmlvdXNIaWdobGlnaHROb2RlVGltZW91dCA9IHNldFRpbWVvdXQocmVzdG9yZUhpZ2hsaWdodFRv SG92ZXJlZE5vZGUsIDIwMDApOwotICAgICAgICAgICAgfQotICAgICAgICB9CiAgICAgfSwKIAog ICAgIGdldCBlZGl0aW5nKCkKQEAgLTI2MCw3ICsyNDEsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVu dHNUcmVlT3V0bGluZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgZWxlbWVudC5fY3Jl YXRlVG9vbHRpcEZvck5vZGUoKTsKICAgICAgICAgfQogCi0gICAgICAgIFdlYkluc3BlY3Rvci5o b3ZlcmVkRE9NTm9kZSA9IChlbGVtZW50ID8gZWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCA6IG51 bGwpOworICAgICAgICBXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0RE9NTm9kZShlbGVtZW50ID8gZWxl bWVudC5yZXByZXNlbnRlZE9iamVjdC5pZCA6IDApOwogICAgIH0sCiAKICAgICBfb25tb3VzZW91 dDogZnVuY3Rpb24oZXZlbnQpCkBAIC0yNzQsNyArMjU1LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1l bnRzVHJlZU91dGxpbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3By ZXZpb3VzSG92ZXJlZEVsZW1lbnQ7CiAgICAgICAgIH0KIAotICAgICAgICBXZWJJbnNwZWN0b3Iu aG92ZXJlZERPTU5vZGUgPSBudWxsOworICAgICAgICBXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0RE9N Tm9kZSgwKTsKICAgICB9LAogCiAgICAgX2NvbnRleHRNZW51RXZlbnRGaXJlZDogZnVuY3Rpb24o ZXZlbnQpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBhYzNm M2ZjLi5hZWU5MjU4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMK QEAgLTQwMyw0NSArNDAzLDQ0IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgICAgIH0KICAg ICB9LAogCi0gICAgZ2V0IGhvdmVyZWRET01Ob2RlKCkKKyAgICBoaWdobGlnaHRET01Ob2RlOiBm dW5jdGlvbihub2RlSWQpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5faG92ZXJlZERPTU5v ZGU7Ci0gICAgfSwKKyAgICAgICAgaWYgKCJfaGlkZURPTU5vZGVIaWdobGlnaHRUaW1lb3V0IiBp biB0aGlzKSB7CisgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5faGlkZURPTU5vZGVIaWdo bGlnaHRUaW1lb3V0KTsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9oaWRlRE9NTm9kZUhpZ2hs aWdodFRpbWVvdXQ7CisgICAgICAgIH0KIAotICAgIHNldCBob3ZlcmVkRE9NTm9kZSh4KQotICAg IHsKLSAgICAgICAgaWYgKHRoaXMuX2hvdmVyZWRET01Ob2RlID09PSB4KQorICAgICAgICBpZiAo dGhpcy5faGlnaGxpZ2h0ZWRET01Ob2RlSWQgPT09IG5vZGVJZCkKICAgICAgICAgICAgIHJldHVy bjsKIAotICAgICAgICB0aGlzLl9ob3ZlcmVkRE9NTm9kZSA9IHg7Ci0KLSAgICAgICAgaWYgKHRo aXMuX2hvdmVyZWRET01Ob2RlKQotICAgICAgICAgICAgdGhpcy5fdXBkYXRlSG92ZXJIaWdobGln aHRTb29uKHRoaXMuc2hvd2luZ0RPTU5vZGVIaWdobGlnaHQgPyA1MCA6IDUwMCk7CisgICAgICAg IHRoaXMuX2hpZ2hsaWdodGVkRE9NTm9kZUlkID0gbm9kZUlkOworICAgICAgICBpZiAobm9kZUlk KQorICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5oaWdobGlnaHRET01Ob2RlKG5vZGVJZCk7 CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZUhvdmVySGlnaGxpZ2h0KCk7 CisgICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmhpZGVET01Ob2RlSGlnaGxpZ2h0KCk7CiAg ICAgfSwKIAotICAgIF91cGRhdGVIb3ZlckhpZ2hsaWdodFNvb246IGZ1bmN0aW9uKGRlbGF5KQor ICAgIGhpZ2hsaWdodERPTU5vZGVGb3JUd29TZWNvbmRzOiBmdW5jdGlvbihub2RlSWQpCiAgICAg ewotICAgICAgICBpZiAoIl91cGRhdGVIb3ZlckhpZ2hsaWdodFRpbWVvdXQiIGluIHRoaXMpCi0g ICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fdXBkYXRlSG92ZXJIaWdobGlnaHRUaW1lb3V0 KTsKLSAgICAgICAgdGhpcy5fdXBkYXRlSG92ZXJIaWdobGlnaHRUaW1lb3V0ID0gc2V0VGltZW91 dCh0aGlzLl91cGRhdGVIb3ZlckhpZ2hsaWdodC5iaW5kKHRoaXMpLCBkZWxheSk7CisgICAgICAg IHRoaXMuaGlnaGxpZ2h0RE9NTm9kZShub2RlSWQpOworICAgICAgICB0aGlzLl9oaWRlRE9NTm9k ZUhpZ2hsaWdodFRpbWVvdXQgPSBzZXRUaW1lb3V0KHRoaXMuaGlnaGxpZ2h0RE9NTm9kZS5iaW5k KHRoaXMsIDApLCAyMDAwKTsKICAgICB9LAogCi0gICAgX3VwZGF0ZUhvdmVySGlnaGxpZ2h0OiBm dW5jdGlvbigpCisgICAgd2lyZUVsZW1lbnRXaXRoRE9NTm9kZTogZnVuY3Rpb24oZWxlbWVudCwg bm9kZUlkKQogICAgIHsKLSAgICAgICAgaWYgKCJfdXBkYXRlSG92ZXJIaWdobGlnaHRUaW1lb3V0 IiBpbiB0aGlzKSB7Ci0gICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fdXBkYXRlSG92ZXJI aWdobGlnaHRUaW1lb3V0KTsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl91cGRhdGVIb3Zlckhp Z2hsaWdodFRpbWVvdXQ7Ci0gICAgICAgIH0KKyAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuX3VwZGF0ZUZvY3VzZWROb2RlLmJpbmQodGhpcywgbm9kZUlkKSwg ZmFsc2UpOworICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3ZlciIsIHRo aXMuaGlnaGxpZ2h0RE9NTm9kZS5iaW5kKHRoaXMsIG5vZGVJZCksIGZhbHNlKTsKKyAgICAgICAg ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW91dCIsIHRoaXMuaGlnaGxpZ2h0RE9NTm9k ZS5iaW5kKHRoaXMsIDApLCBmYWxzZSk7CisgICAgfSwKIAotICAgICAgICBpZiAodGhpcy5faG92 ZXJlZERPTU5vZGUpIHsKLSAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuaGlnaGxpZ2h0RE9N Tm9kZSh0aGlzLl9ob3ZlcmVkRE9NTm9kZS5pZCk7Ci0gICAgICAgICAgICB0aGlzLnNob3dpbmdE T01Ob2RlSGlnaGxpZ2h0ID0gdHJ1ZTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIElu c3BlY3RvckJhY2tlbmQuaGlkZURPTU5vZGVIaWdobGlnaHQoKTsKLSAgICAgICAgICAgIHRoaXMu c2hvd2luZ0RPTU5vZGVIaWdobGlnaHQgPSBmYWxzZTsKLSAgICAgICAgfQorICAgIF91cGRhdGVG b2N1c2VkTm9kZTogZnVuY3Rpb24obm9kZUlkKQorICAgIHsKKyAgICAgICAgdmFyIG5vZGUgPSBX ZWJJbnNwZWN0b3IuZG9tQWdlbnQubm9kZUZvcklkKG5vZGVJZCk7CisgICAgICAgIGlmICghbm9k ZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHRo aXMucGFuZWxzLmVsZW1lbnRzOworICAgICAgICB0aGlzLnBhbmVscy5lbGVtZW50cy5mb2N1c2Vk RE9NTm9kZSA9IG5vZGU7CiAgICAgfQogfQogCkBAIC0xNDU3LDcgKzE0NTYsNyBAQCBXZWJJbnNw ZWN0b3IucmVzZXQgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5yZXNvdXJjZVVSTE1hcCA9IHt9Owog ICAgIHRoaXMuY29va2llRG9tYWlucyA9IHt9OwogICAgIHRoaXMuYXBwbGljYXRpb25DYWNoZURv bWFpbnMgPSB7fTsKLSAgICB0aGlzLmhvdmVyZWRET01Ob2RlID0gbnVsbDsKKyAgICB0aGlzLmhp Z2hsaWdodERPTU5vZGUoMCk7CiAKICAgICBkZWxldGUgdGhpcy5tYWluUmVzb3VyY2U7CiAKQEAg LTE2NjYsMTMgKzE2NjUsOCBAQCBXZWJJbnNwZWN0b3IuZHJhd0xvYWRpbmdQaWVDaGFydCA9IGZ1 bmN0aW9uKGNhbnZhcywgcGVyY2VudCkgewogCiBXZWJJbnNwZWN0b3IudXBkYXRlRm9jdXNlZE5v ZGUgPSBmdW5jdGlvbihub2RlSWQpCiB7Ci0gICAgdmFyIG5vZGUgPSBXZWJJbnNwZWN0b3IuZG9t QWdlbnQubm9kZUZvcklkKG5vZGVJZCk7Ci0gICAgaWYgKCFub2RlKQotICAgICAgICAvLyBGSVhN RTogU2hvdWxkIHdlIGRlc2VsZWN0IGlmIG51bGwgaXMgcGFzc2VkIGluPwotICAgICAgICByZXR1 cm47Ci0KLSAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHRoaXMucGFuZWxzLmVsZW1lbnRzOwotICAg IHRoaXMucGFuZWxzLmVsZW1lbnRzLmZvY3VzZWRET01Ob2RlID0gbm9kZTsKKyAgICB0aGlzLl91 cGRhdGVGb2N1c2VkTm9kZShub2RlSWQpOworICAgIHRoaXMuaGlnaGxpZ2h0RE9NTm9kZUZvclR3 b1NlY29uZHMobm9kZUlkKTsKIH0KIAogV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJMID0g ZnVuY3Rpb24odXJsKQo=