147335 2015-07-27 14:57:05 -0700 Web Inspector: Include <template> node content in DOM Tree 2015-07-28 13:56:16 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck burg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1112516 0 joepeck 2015-07-27 14:57:05 -0700 * SUMMARY Include <template> node content in DOM Tree. * TEST <body> <template> <h1>Header</h1> <p>Paragraph</p> </template> </body> * STEPS TO REPRODUCE 1. Inspect test page => Should be able to expand the <template> element in DOM Tree and see its contents. * NOTES - Backend already sends the frontend "DOMNode.templateContent" information, the frontend does nothing with it. 1112517 1 webkit-bug-importer 2015-07-27 14:57:17 -0700 <rdar://problem/22018682> 1112519 2 257596 joepeck 2015-07-27 15:03:10 -0700 Created attachment 257596 [PATCH] Proposed Fix Won't apply yet, requires the Pseudo Element patch's refactoring. 1112577 3 257596 timothy 2015-07-27 16:29:29 -0700 Comment on attachment 257596 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=257596&action=review > Source/WebInspectorUI/UserInterface/Models/DOMNode.js:269 > + templateContent() Getter? 1112615 4 joepeck 2015-07-27 17:14:55 -0700 (In reply to comment #3) > Comment on attachment 257596 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257596&action=review > > > Source/WebInspectorUI/UserInterface/Models/DOMNode.js:269 > > + templateContent() > > Getter? All of these DOMNode methods are methods and can be getters. I want to refactor the style quite a bit, but for this patch at least I wanted to follow the pattern. 1112841 5 257596 commit-queue 2015-07-28 13:38:44 -0700 Comment on attachment 257596 [PATCH] Proposed Fix Clearing flags on attachment: 257596 Committed r187507: <http://trac.webkit.org/changeset/187507> 1112842 6 commit-queue 2015-07-28 13:38:47 -0700 All reviewed patches have been landed. Closing bug. 1112854 7 257679 joepeck 2015-07-28 13:54:09 -0700 Created attachment 257679 [PATCH] For Landing 257596 2015-07-27 15:03:10 -0700 2015-07-28 13:38:44 -0700 [PATCH] Proposed Fix template.patch text/plain 7128 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNWQ1MmZlLi4xZTI5OGEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMDct MjcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBJbmNsdWRlIDx0ZW1wbGF0ZT4gbm9kZSBjb250ZW50IGluIERPTSBUcmVlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDczMzUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rv ci9kb20vdGVtcGxhdGUtY29udGVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGlu c3BlY3Rvci9kb20vdGVtcGxhdGUtY29udGVudC5odG1sOiBBZGRlZC4KKwogMjAxNS0wNy0yNCAg Sm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFNob3cgUHNldWRvIEVsZW1lbnRzIGluIERPTSBUcmVlCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZG9tL3RlbXBsYXRlLWNvbnRlbnQtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS90ZW1wbGF0ZS1jb250ZW50LWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xOGYzNzhkCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS90ZW1wbGF0ZS1jb250ZW50LWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDggQEAKK1Rlc3QgdGhhdCB3ZSBpbmNsdWRlIHRlbXBsYXRlIGNvbnRlbnQg aW4gRE9NIE5vZGVzIGZvciA8dGVtcGxhdGU+IGVsZW1lbnRzLgorCitQQVNTOiBHb3QgRE9NTm9k ZSBmb3IgZGl2IGVsZW1lbnQKK1BBU1M6IERPTU5vZGUgZG9lcyBub3QgaGF2ZSB0ZW1wbGF0ZSBj b250ZW50CisKK1BBU1M6IEdvdCBET01Ob2RlIGZvciB0ZW1wbGF0ZSBlbGVtZW50CitQQVNTOiBE T01Ob2RlIGhhcyB0ZW1wbGF0ZSBjb250ZW50CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kb20vdGVtcGxhdGUtY29udGVudC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RvbS90ZW1wbGF0ZS1jb250ZW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uMjMzMTRjYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k b20vdGVtcGxhdGUtY29udGVudC5odG1sCkBAIC0wLDAgKzEsMzMgQEAKKzxodG1sPgorPGhlYWQ+ Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3Qu anMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0aW9uIHRlc3QoKSB7CisgICAgV2ViSW5zcGVj dG9yLmRvbVRyZWVNYW5hZ2VyLnJlcXVlc3REb2N1bWVudChmdW5jdGlvbihkb2N1bWVudE5vZGUp IHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLnF1ZXJ5U2VsZWN0b3IoZG9j dW1lbnROb2RlLmlkLCAiI2RpdiIsIGZ1bmN0aW9uKG5vZGVJZCkgeworICAgICAgICAgICAgdmFy IGRvbU5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIubm9kZUZvcklkKG5vZGVJZCk7 CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoZG9tTm9kZSwgIkdvdCBET01O b2RlIGZvciBkaXYgZWxlbWVudCIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RU aGF0KCFkb21Ob2RlLnRlbXBsYXRlQ29udGVudCgpLCAiRE9NTm9kZSBkb2VzIG5vdCBoYXZlIHRl bXBsYXRlIGNvbnRlbnQiKTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgV2ViSW5zcGVjdG9yLmRv bVRyZWVNYW5hZ2VyLnF1ZXJ5U2VsZWN0b3IoZG9jdW1lbnROb2RlLmlkLCAiI3RlbXBsYXRlIiwg ZnVuY3Rpb24obm9kZUlkKSB7CisgICAgICAgICAgICB2YXIgZG9tTm9kZSA9IFdlYkluc3BlY3Rv ci5kb21UcmVlTWFuYWdlci5ub2RlRm9ySWQobm9kZUlkKTsKKyAgICAgICAgICAgIEluc3BlY3Rv clRlc3QubG9nKCIiKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChkb21O b2RlLCAiR290IERPTU5vZGUgZm9yIHRlbXBsYXRlIGVsZW1lbnQiKTsKKyAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0VGhhdChkb21Ob2RlLnRlbXBsYXRlQ29udGVudCgpLCAiRE9NTm9k ZSBoYXMgdGVtcGxhdGUgY29udGVudCIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21w bGV0ZVRlc3QoKTsKKyAgICAgICAgfSk7CisgICAgfSk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKyAgICA8cD5UZXN0IHRoYXQgd2UgaW5jbHVkZSB0 ZW1wbGF0ZSBjb250ZW50IGluIERPTSBOb2RlcyBmb3IgJmx0O3RlbXBsYXRlJmd0OyBlbGVtZW50 cy48L3A+CisKKyAgICA8ZGl2IGlkPSJkaXYiPjwvZGl2PgorICAgIDx0ZW1wbGF0ZSBpZD0idGVt cGxhdGUiPgorICAgICAgICA8aDE+SGVhZGVyPC9oMT4KKyAgICAgICAgPHA+UGFyYWdyYXBoPC9w PgorICAgIDwvdGVtcGxhdGU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv ZwppbmRleCBlNzc0MGE1Li43MDhmYjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNS0wNy0yNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluY2x1ZGUgPHRlbXBsYXRlPiBub2RlIGNv bnRlbnQgaW4gRE9NIFRyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NzMzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFuYWdlci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUuX3VuYmluZCk6 CisgICAgICAgIENsZWFudXAgdGVtcGxhdGVDb250ZW50IHdoZW4gRE9NTm9kZXMgZ2V0IHJlbW92 ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLnRlbXBsYXRlQ29udGVudCk6CisgICAg ICAgIENyZWF0ZSBhIERPTU5vZGUgZnJvbSB0aGUgcGF5bG9hZCdzIHRlbXBsYXRlQ29udGVudC4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl9zaW5nbGVUZXh0Q2hp bGQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5faGFz VmlzaWJsZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5w cm90b3R5cGUuX3Zpc2libGVDaGlsZHJlbik6CisgICAgICAgIEEgRE9NVHJlZUVsZW1lbnQgaGFz IGNoaWxkcmVuIGlmIHRoZSBET01Ob2RlIGhhcyB0ZW1wbGF0ZSBjb250ZW50LgorCiAyMDE1LTA3 LTI0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogU2hvdyBQc2V1ZG8gRWxlbWVudHMgaW4gRE9NIFRyZWUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVN YW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvRE9NVHJlZU1hbmFnZXIuanMKaW5kZXggOTE5YTc1Mi4uNjM3MmMwYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKQEAgLTI4OSwxMiArMjg5LDE0IEBAIFdlYkluc3BlY3Rv ci5ET01UcmVlTWFuYWdlciA9IGNsYXNzIERPTVRyZWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogICAgICAgICBmb3IgKHZhciBpID0gMDsgbm9kZS5jaGlsZHJlbiAmJiBpIDwg bm9kZS5jaGlsZHJlbi5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIHRoaXMuX3VuYmluZChub2Rl LmNoaWxkcmVuW2ldKTsKIAorICAgICAgICBpZiAobm9kZS50ZW1wbGF0ZUNvbnRlbnQoKSkKKyAg ICAgICAgICAgIHRoaXMuX3VuYmluZChub2RlLnRlbXBsYXRlQ29udGVudCgpKTsKKwogICAgICAg ICB2YXIgcHNldWRvRWxlbWVudHMgPSBub2RlLnBzZXVkb0VsZW1lbnRzKCk7CiAgICAgICAgIGZv ciAodmFyIHBzZXVkb0VsZW1lbnQgb2YgcHNldWRvRWxlbWVudHMpCiAgICAgICAgICAgICB0aGlz Ll91bmJpbmQocHNldWRvRWxlbWVudCk7CiAKICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBzaGFk b3cgcm9vdHMuCi0gICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgdGVtcGxhdGUgY29udGVudC4KICAg ICB9CiAKICAgICBnZXQgcmVzdG9yZVNlbGVjdGVkTm9kZUlzQWxsb3dlZCgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCmlu ZGV4IDJmNTZlNjEuLmNjZjg5NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCkBAIC03OSw3ICs3OSwxMCBAQCBXZWJJ bnNwZWN0b3IuRE9NTm9kZSA9IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2Jq ZWN0CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICAvLyBGSVhNRTogSGFuZGxl IHRlbXBsYXRlQ29udGVudC4KKyAgICAgICAgaWYgKHBheWxvYWQudGVtcGxhdGVDb250ZW50KSB7 CisgICAgICAgICAgICB0aGlzLl90ZW1wbGF0ZUNvbnRlbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkRP TU5vZGUodGhpcy5fZG9tQWdlbnQsIHRoaXMub3duZXJEb2N1bWVudCwgdHJ1ZSwgcGF5bG9hZC50 ZW1wbGF0ZUNvbnRlbnQpOworICAgICAgICAgICAgdGhpcy5fdGVtcGxhdGVDb250ZW50LnBhcmVu dE5vZGUgPSB0aGlzOworICAgICAgICB9CiAKICAgICAgICAgaWYgKHBheWxvYWQuY2hpbGRyZW4p CiAgICAgICAgICAgICB0aGlzLl9zZXRDaGlsZHJlblBheWxvYWQocGF5bG9hZC5jaGlsZHJlbik7 CkBAIC0yNjMsNiArMjY2LDExIEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlID0gY2xhc3MgRE9NTm9k ZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgcmV0dXJuIHRoaXMuX2xvY2Fs TmFtZTsKICAgICB9CiAKKyAgICB0ZW1wbGF0ZUNvbnRlbnQoKQorICAgIHsKKyAgICAgICAgcmV0 dXJuIHRoaXMuX3RlbXBsYXRlQ29udGVudCB8fCBudWxsOworICAgIH0KKwogICAgIHBzZXVkb1R5 cGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3BzZXVkb1R5cGU7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVu dC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVF bGVtZW50LmpzCmluZGV4IDZiZDQ0NjUuLmIzYTIyZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50Lmpz CkBAIC0xMjYwLDYgKzEyNjAsOCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFz cyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogCiAgICAgICAg IGlmIChub2RlLmhhc1NoYWRvd1Jvb3RzKCkpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAg ICAgICAgaWYgKG5vZGUudGVtcGxhdGVDb250ZW50KCkpCisgICAgICAgICAgICByZXR1cm4gbnVs bDsKICAgICAgICAgaWYgKG5vZGUuaGFzUHNldWRvRWxlbWVudHMoKSkKICAgICAgICAgICAgIHJl dHVybiBudWxsOwogCkBAIC0xMjg2LDYgKzEyODgsOCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVs ZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxl bQogCiAgICAgICAgIGlmIChub2RlLmhhc0NoaWxkTm9kZXMoKSkKICAgICAgICAgICAgIHJldHVy biB0cnVlOworICAgICAgICBpZiAobm9kZS50ZW1wbGF0ZUNvbnRlbnQoKSkKKyAgICAgICAgICAg IHJldHVybiB0cnVlOwogICAgICAgICBpZiAobm9kZS5oYXNQc2V1ZG9FbGVtZW50cygpKQogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTEyOTgsNiArMTMwMiwxMCBAQCBXZWJJbnNwZWN0 b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3Bl Y3Rvci5UcmVlRWxlbQogCiAgICAgICAgIHZhciB2aXNpYmxlQ2hpbGRyZW4gPSBbXTsKIAorICAg ICAgICB2YXIgdGVtcGxhdGVDb250ZW50ID0gbm9kZS50ZW1wbGF0ZUNvbnRlbnQoKTsKKyAgICAg ICAgaWYgKHRlbXBsYXRlQ29udGVudCkKKyAgICAgICAgICAgIHZpc2libGVDaGlsZHJlbi5wdXNo KHRlbXBsYXRlQ29udGVudCk7CisKICAgICAgICAgdmFyIGJlZm9yZVBzZXVkb0VsZW1lbnQgPSBu b2RlLmJlZm9yZVBzZXVkb0VsZW1lbnQoKTsKICAgICAgICAgaWYgKGJlZm9yZVBzZXVkb0VsZW1l bnQpCiAgICAgICAgICAgICB2aXNpYmxlQ2hpbGRyZW4ucHVzaChiZWZvcmVQc2V1ZG9FbGVtZW50 KTsK 257679 2015-07-28 13:54:09 -0700 2015-07-28 13:56:16 -0700 [PATCH] For Landing template2.patch text/plain 7204 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNWQ1MmZlLi44NTZlNzE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMDct MjcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBJbmNsdWRlIDx0ZW1wbGF0ZT4gbm9kZSBjb250ZW50IGluIERPTSBUcmVlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDczMzUKKwor ICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZG9tL3RlbXBsYXRlLWNvbnRlbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBp bnNwZWN0b3IvZG9tL3RlbXBsYXRlLWNvbnRlbnQuaHRtbDogQWRkZWQuCisKIDIwMTUtMDctMjQg IEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBTaG93IFBzZXVkbyBFbGVtZW50cyBpbiBET00gVHJlZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS90ZW1wbGF0ZS1jb250ZW50LWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kb20vdGVtcGxhdGUtY29udGVudC1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMThmMzc4ZAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20vdGVtcGxhdGUtY29udGVudC1leHBlY3RlZC50 eHQKQEAgLTAsMCArMSw4IEBACitUZXN0IHRoYXQgd2UgaW5jbHVkZSB0ZW1wbGF0ZSBjb250ZW50 IGluIERPTSBOb2RlcyBmb3IgPHRlbXBsYXRlPiBlbGVtZW50cy4KKworUEFTUzogR290IERPTU5v ZGUgZm9yIGRpdiBlbGVtZW50CitQQVNTOiBET01Ob2RlIGRvZXMgbm90IGhhdmUgdGVtcGxhdGUg Y29udGVudAorCitQQVNTOiBHb3QgRE9NTm9kZSBmb3IgdGVtcGxhdGUgZWxlbWVudAorUEFTUzog RE9NTm9kZSBoYXMgdGVtcGxhdGUgY29udGVudAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZG9tL3RlbXBsYXRlLWNvbnRlbnQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kb20vdGVtcGxhdGUtY29udGVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLjIzMzE0Y2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZG9tL3RlbXBsYXRlLWNvbnRlbnQuaHRtbApAQCAtMCwwICsxLDMzIEBACis8aHRtbD4KKzxoZWFk PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0 LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5jdGlvbiB0ZXN0KCkgeworICAgIFdlYkluc3Bl Y3Rvci5kb21UcmVlTWFuYWdlci5yZXF1ZXN0RG9jdW1lbnQoZnVuY3Rpb24oZG9jdW1lbnROb2Rl KSB7CisgICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5xdWVyeVNlbGVjdG9yKGRv Y3VtZW50Tm9kZS5pZCwgIiNkaXYiLCBmdW5jdGlvbihub2RlSWQpIHsKKyAgICAgICAgICAgIHZh ciBkb21Ob2RlID0gV2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLm5vZGVGb3JJZChub2RlSWQp OworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGRvbU5vZGUsICJHb3QgRE9N Tm9kZSBmb3IgZGl2IGVsZW1lbnQiKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 VGhhdCghZG9tTm9kZS50ZW1wbGF0ZUNvbnRlbnQoKSwgIkRPTU5vZGUgZG9lcyBub3QgaGF2ZSB0 ZW1wbGF0ZSBjb250ZW50Iik7CisgICAgICAgIH0pOworCisgICAgICAgIFdlYkluc3BlY3Rvci5k b21UcmVlTWFuYWdlci5xdWVyeVNlbGVjdG9yKGRvY3VtZW50Tm9kZS5pZCwgIiN0ZW1wbGF0ZSIs IGZ1bmN0aW9uKG5vZGVJZCkgeworICAgICAgICAgICAgdmFyIGRvbU5vZGUgPSBXZWJJbnNwZWN0 b3IuZG9tVHJlZU1hbmFnZXIubm9kZUZvcklkKG5vZGVJZCk7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmxvZygiIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoZG9t Tm9kZSwgIkdvdCBET01Ob2RlIGZvciB0ZW1wbGF0ZSBlbGVtZW50Iik7CisgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoZG9tTm9kZS50ZW1wbGF0ZUNvbnRlbnQoKSwgIkRPTU5v ZGUgaGFzIHRlbXBsYXRlIGNvbnRlbnQiKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY29t cGxldGVUZXN0KCk7CisgICAgICAgIH0pOworICAgIH0pOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+ Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAgPHA+VGVzdCB0aGF0IHdlIGluY2x1ZGUg dGVtcGxhdGUgY29udGVudCBpbiBET00gTm9kZXMgZm9yICZsdDt0ZW1wbGF0ZSZndDsgZWxlbWVu dHMuPC9wPgorCisgICAgPGRpdiBpZD0iZGl2Ij48L2Rpdj4KKyAgICA8dGVtcGxhdGUgaWQ9InRl bXBsYXRlIj4KKyAgICAgICAgPGgxPkhlYWRlcjwvaDE+CisgICAgICAgIDxwPlBhcmFncmFwaDwv cD4KKyAgICA8L3RlbXBsYXRlPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cKaW5kZXggZWQwNWQ0OS4uYzE3OWJlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMjYgQEAKIDIwMTUtMDctMjcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxl LmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbmNsdWRlIDx0ZW1wbGF0ZT4gbm9kZSBj b250ZW50IGluIERPTSBUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDczMzUKKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZS5fdW5iaW5k KToKKyAgICAgICAgQ2xlYW51cCB0ZW1wbGF0ZUNvbnRlbnQgd2hlbiBET01Ob2RlcyBnZXQgcmVt b3ZlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUudGVtcGxhdGVDb250ZW50KToKKyAg ICAgICAgQ3JlYXRlIGEgRE9NTm9kZSBmcm9tIHRoZSBwYXlsb2FkJ3MgdGVtcGxhdGVDb250ZW50 LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuX3NpbmdsZVRleHRD aGlsZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl9o YXNWaXNpYmxlQ2hpbGRyZW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50 LnByb3RvdHlwZS5fdmlzaWJsZUNoaWxkcmVuKToKKyAgICAgICAgQSBET01UcmVlRWxlbWVudCBo YXMgY2hpbGRyZW4gaWYgdGhlIERPTU5vZGUgaGFzIHRlbXBsYXRlIGNvbnRlbnQuCisKKzIwMTUt MDctMjcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBSZXZlcnQgY2hhbmdlIHRvIERPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5y ZW1vdmUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NzMzNgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9ET01UcmVlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCmluZGV4IDkxOWE3NTIuLjYz NzJjMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCkBAIC0yODksMTIgKzI4 OSwxNCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFuYWdl ciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IG5v ZGUuY2hpbGRyZW4gJiYgaSA8IG5vZGUuY2hpbGRyZW4ubGVuZ3RoOyArK2kpCiAgICAgICAgICAg ICB0aGlzLl91bmJpbmQobm9kZS5jaGlsZHJlbltpXSk7CiAKKyAgICAgICAgaWYgKG5vZGUudGVt cGxhdGVDb250ZW50KCkpCisgICAgICAgICAgICB0aGlzLl91bmJpbmQobm9kZS50ZW1wbGF0ZUNv bnRlbnQoKSk7CisKICAgICAgICAgdmFyIHBzZXVkb0VsZW1lbnRzID0gbm9kZS5wc2V1ZG9FbGVt ZW50cygpOwogICAgICAgICBmb3IgKHZhciBwc2V1ZG9FbGVtZW50IG9mIHBzZXVkb0VsZW1lbnRz KQogICAgICAgICAgICAgdGhpcy5fdW5iaW5kKHBzZXVkb0VsZW1lbnQpOwogCiAgICAgICAgIC8v IEZJWE1FOiBIYW5kbGUgc2hhZG93IHJvb3RzLgotICAgICAgICAvLyBGSVhNRTogSGFuZGxlIHRl bXBsYXRlIGNvbnRlbnQuCiAgICAgfQogCiAgICAgZ2V0IHJlc3RvcmVTZWxlY3RlZE5vZGVJc0Fs bG93ZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL0RPTU5vZGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvRE9NTm9kZS5qcwppbmRleCAyZjU2ZTYxLi5jY2Y4OTY2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcwpAQCAt NzksNyArNzksMTAgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUgPSBjbGFzcyBET01Ob2RlIGV4dGVu ZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAg ICAgLy8gRklYTUU6IEhhbmRsZSB0ZW1wbGF0ZUNvbnRlbnQuCisgICAgICAgIGlmIChwYXlsb2Fk LnRlbXBsYXRlQ29udGVudCkgeworICAgICAgICAgICAgdGhpcy5fdGVtcGxhdGVDb250ZW50ID0g bmV3IFdlYkluc3BlY3Rvci5ET01Ob2RlKHRoaXMuX2RvbUFnZW50LCB0aGlzLm93bmVyRG9jdW1l bnQsIHRydWUsIHBheWxvYWQudGVtcGxhdGVDb250ZW50KTsKKyAgICAgICAgICAgIHRoaXMuX3Rl bXBsYXRlQ29udGVudC5wYXJlbnROb2RlID0gdGhpczsKKyAgICAgICAgfQogCiAgICAgICAgIGlm IChwYXlsb2FkLmNoaWxkcmVuKQogICAgICAgICAgICAgdGhpcy5fc2V0Q2hpbGRyZW5QYXlsb2Fk KHBheWxvYWQuY2hpbGRyZW4pOwpAQCAtMjYzLDYgKzI2NiwxMSBAQCBXZWJJbnNwZWN0b3IuRE9N Tm9kZSA9IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAg IHJldHVybiB0aGlzLl9sb2NhbE5hbWU7CiAgICAgfQogCisgICAgdGVtcGxhdGVDb250ZW50KCkK KyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl90ZW1wbGF0ZUNvbnRlbnQgfHwgbnVsbDsKKyAg ICB9CisKICAgICBwc2V1ZG9UeXBlKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9wc2V1 ZG9UeXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRE9NVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcwppbmRleCA2NjFjMDhlLi4xYmUzMzU2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVl RWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlRWxlbWVudC5qcwpAQCAtMTI2MCw2ICsxMjYwLDggQEAgV2ViSW5zcGVjdG9yLkRP TVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu VHJlZUVsZW0KIAogICAgICAgICBpZiAobm9kZS5oYXNTaGFkb3dSb290cygpKQogICAgICAgICAg ICAgcmV0dXJuIG51bGw7CisgICAgICAgIGlmIChub2RlLnRlbXBsYXRlQ29udGVudCgpKQorICAg ICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICAgIGlmIChub2RlLmhhc1BzZXVkb0VsZW1lbnRz KCkpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKIApAQCAtMTI4Niw2ICsxMjg4LDggQEAgV2Vi SW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBX ZWJJbnNwZWN0b3IuVHJlZUVsZW0KIAogICAgICAgICBpZiAobm9kZS5oYXNDaGlsZE5vZGVzKCkp CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgaWYgKG5vZGUudGVtcGxhdGVDb250 ZW50KCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgaWYgKG5vZGUuaGFzUHNl dWRvRWxlbWVudHMoKSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCkBAIC0xMjk4LDYgKzEz MDIsMTAgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1l bnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KIAogICAgICAgICB2YXIgdmlzaWJsZUNo aWxkcmVuID0gW107CiAKKyAgICAgICAgdmFyIHRlbXBsYXRlQ29udGVudCA9IG5vZGUudGVtcGxh dGVDb250ZW50KCk7CisgICAgICAgIGlmICh0ZW1wbGF0ZUNvbnRlbnQpCisgICAgICAgICAgICB2 aXNpYmxlQ2hpbGRyZW4ucHVzaCh0ZW1wbGF0ZUNvbnRlbnQpOworCiAgICAgICAgIHZhciBiZWZv cmVQc2V1ZG9FbGVtZW50ID0gbm9kZS5iZWZvcmVQc2V1ZG9FbGVtZW50KCk7CiAgICAgICAgIGlm IChiZWZvcmVQc2V1ZG9FbGVtZW50KQogICAgICAgICAgICAgdmlzaWJsZUNoaWxkcmVuLnB1c2go YmVmb3JlUHNldWRvRWxlbWVudCk7Cg==