145188 2015-05-19 15:10:32 -0700 Web Inspector: Slightly better node previews in arrays 2015-05-20 08:46:18 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1096068 0 joepeck 2015-05-19 15:10:32 -0700 * SUMMARY Slightly better node previews in arrays. Without getting access to the full node, we can at least provide slightly better node previews. * TEST div = document.createElement('div'); div.className = 'foo bar'; span = document.createElement('span'); span.id = 'foo'; input = document.createElement('input'); input.type = 'password'; text = document.createTextNode('text content'); comment = document.createComment('comment content'); [document.body, div, span, input, text, comment] * CURRENT ▶︎ [body, div.foo.bar, span#foo, input, #text, #comment] * EXPECTED ▶︎ [<body>, <div class="foo bar">, <span id="foo">, <input type="password">, #text "text content", ] * NOTES - console.dir(span) should still use the smaller string: ▶︎ span#foo { ... } - ultimately we should consider fetching these node objects and replacing them with real DOM Tree Outlines, or styling this preview string to effectively make it look like the DOM Tree Outline even though it is backed by a non-real node. 1096070 1 webkit-bug-importer 2015-05-19 15:11:35 -0700 <rdar://problem/21027125> 1096073 2 253408 joepeck 2015-05-19 15:26:29 -0700 Created attachment 253408 [PATCH] Proposed Fix 1096239 3 253408 commit-queue 2015-05-20 08:46:13 -0700 Comment on attachment 253408 [PATCH] Proposed Fix Clearing flags on attachment: 253408 Committed r184635: <http://trac.webkit.org/changeset/184635> 1096240 4 commit-queue 2015-05-20 08:46:18 -0700 All reviewed patches have been landed. Closing bug. 253408 2015-05-19 15:26:29 -0700 2015-05-20 08:46:13 -0700 [PATCH] Proposed Fix node-preview-improvement.patch text/plain 12779 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhYTZhOWUzLi4wZTVkMmMwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTUtMDUt MTkgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBTbGlnaHRseSBiZXR0ZXIgbm9kZSBwcmV2aWV3cyBpbiBhcnJheXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTE4OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL21v ZGVsL3JlbW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9tb2Rl bC9yZW1vdGUtb2JqZWN0Lmh0bWw6CisKKzIwMTUtMDUtMTkgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXByb3ZlIFByZXZp ZXcgZm9yIE5vZGVMaXN0IC8gYXJyYXkgbGlrZSBjb2xsZWN0aW9ucwogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MTc3CiAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dAppbmRl eCA0NWJiNzI2Li40M2QyMzAzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9k ZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L21vZGVsL3JlbW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0CkBAIC0yMTkxLDcgKzIxOTEsNTEgQEAg RVhQUkVTU0lPTjogc3BhbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3NwYW4nKTsgc3Bhbi5p ZCA9ICdmb28nOyBzcGFuCiB9CiAKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCi1FWFBSRVNTSU9OOiBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgn dGV4dCcpCitFWFBSRVNTSU9OOiBpbnB1dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2lucHV0 Jyk7IGlucHV0LnR5cGUgPSAncGFzc3dvcmQnOyBpbnB1dAoreworICAiX3R5cGUiOiAib2JqZWN0 IiwKKyAgIl9zdWJ0eXBlIjogIm5vZGUiLAorICAiX29iamVjdElkIjogIjxmaWx0ZXJlZD4iLAor ICAiX2Rlc2NyaXB0aW9uIjogImlucHV0IiwKKyAgIl9wcmV2aWV3IjogeworICAgICJfdHlwZSI6 ICJvYmplY3QiLAorICAgICJfc3VidHlwZSI6ICJub2RlIiwKKyAgICAiX2Rlc2NyaXB0aW9uIjog ImlucHV0IiwKKyAgICAiX2xvc3NsZXNzIjogZmFsc2UsCisgICAgIl9vdmVyZmxvdyI6IHRydWUs CisgICAgIl9wcm9wZXJ0aWVzIjogWworICAgICAgeworICAgICAgICAiX25hbWUiOiAic2VsZWN0 aW9uU3RhcnQiLAorICAgICAgICAiX3R5cGUiOiAibnVtYmVyIiwKKyAgICAgICAgIl92YWx1ZSI6 ICIwIgorICAgICAgfSwKKyAgICAgIHsKKyAgICAgICAgIl9uYW1lIjogInNlbGVjdGlvbkVuZCIs CisgICAgICAgICJfdHlwZSI6ICJudW1iZXIiLAorICAgICAgICAiX3ZhbHVlIjogIjAiCisgICAg ICB9LAorICAgICAgeworICAgICAgICAiX25hbWUiOiAic2VsZWN0aW9uRGlyZWN0aW9uIiwKKyAg ICAgICAgIl90eXBlIjogInN0cmluZyIsCisgICAgICAgICJfdmFsdWUiOiAibm9uZSIKKyAgICAg IH0sCisgICAgICB7CisgICAgICAgICJfbmFtZSI6ICJhY2NlcHQiLAorICAgICAgICAiX3R5cGUi OiAic3RyaW5nIiwKKyAgICAgICAgIl92YWx1ZSI6ICIiCisgICAgICB9LAorICAgICAgeworICAg ICAgICAiX25hbWUiOiAiYWx0IiwKKyAgICAgICAgIl90eXBlIjogInN0cmluZyIsCisgICAgICAg ICJfdmFsdWUiOiAiIgorICAgICAgfQorICAgIF0sCisgICAgIl9lbnRyaWVzIjogbnVsbAorICB9 Cit9CisKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCitFWFBSRVNTSU9OOiB0ZXh0ID0gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoJ3RleHQgY29u dGVudCcpOyB0ZXh0CiB7CiAgICJfdHlwZSI6ICJvYmplY3QiLAogICAiX3N1YnR5cGUiOiAibm9k ZSIsCkBAIC0yMjA3LDcgKzIyNTEsNyBAQCBFWFBSRVNTSU9OOiBkb2N1bWVudC5jcmVhdGVUZXh0 Tm9kZSgndGV4dCcpCiAgICAgICB7CiAgICAgICAgICJfbmFtZSI6ICJ3aG9sZVRleHQiLAogICAg ICAgICAiX3R5cGUiOiAic3RyaW5nIiwKLSAgICAgICAgIl92YWx1ZSI6ICJ0ZXh0IgorICAgICAg ICAiX3ZhbHVlIjogInRleHQgY29udGVudCIKICAgICAgIH0sCiAgICAgICB7CiAgICAgICAgICJf bmFtZSI6ICJzcGxpdFRleHQiLApAQCAtMjIyMiwxMiArMjI2NiwxMTUgQEAgRVhQUkVTU0lPTjog ZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoJ3RleHQnKQogICAgICAgewogICAgICAgICAiX25hbWUi OiAiZGF0YSIsCiAgICAgICAgICJfdHlwZSI6ICJzdHJpbmciLAotICAgICAgICAiX3ZhbHVlIjog InRleHQiCisgICAgICAgICJfdmFsdWUiOiAidGV4dCBjb250ZW50IgogICAgICAgfSwKICAgICAg IHsKICAgICAgICAgIl9uYW1lIjogImxlbmd0aCIsCiAgICAgICAgICJfdHlwZSI6ICJudW1iZXIi LAotICAgICAgICAiX3ZhbHVlIjogIjQiCisgICAgICAgICJfdmFsdWUiOiAiMTIiCisgICAgICB9 CisgICAgXSwKKyAgICAiX2VudHJpZXMiOiBudWxsCisgIH0KK30KKworLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KK0VYUFJFU1NJT046IGNvbW1l bnQgPSBkb2N1bWVudC5jcmVhdGVDb21tZW50KCdjb21tZW50IGNvbnRlbnQnKTsgY29tbWVudAor eworICAiX3R5cGUiOiAib2JqZWN0IiwKKyAgIl9zdWJ0eXBlIjogIm5vZGUiLAorICAiX29iamVj dElkIjogIjxmaWx0ZXJlZD4iLAorICAiX2Rlc2NyaXB0aW9uIjogIiNjb21tZW50IiwKKyAgIl9w cmV2aWV3IjogeworICAgICJfdHlwZSI6ICJvYmplY3QiLAorICAgICJfc3VidHlwZSI6ICJub2Rl IiwKKyAgICAiX2Rlc2NyaXB0aW9uIjogIiNjb21tZW50IiwKKyAgICAiX2xvc3NsZXNzIjogZmFs c2UsCisgICAgIl9vdmVyZmxvdyI6IHRydWUsCisgICAgIl9wcm9wZXJ0aWVzIjogWworICAgICAg eworICAgICAgICAiX25hbWUiOiAiZGF0YSIsCisgICAgICAgICJfdHlwZSI6ICJzdHJpbmciLAor ICAgICAgICAiX3ZhbHVlIjogImNvbW1lbnQgY29udGVudCIKKyAgICAgIH0sCisgICAgICB7Cisg ICAgICAgICJfbmFtZSI6ICJsZW5ndGgiLAorICAgICAgICAiX3R5cGUiOiAibnVtYmVyIiwKKyAg ICAgICAgIl92YWx1ZSI6ICIxNSIKKyAgICAgIH0sCisgICAgICB7CisgICAgICAgICJfbmFtZSI6 ICJwcmV2aW91c0VsZW1lbnRTaWJsaW5nIiwKKyAgICAgICAgIl90eXBlIjogIm9iamVjdCIsCisg ICAgICAgICJfc3VidHlwZSI6ICJudWxsIiwKKyAgICAgICAgIl92YWx1ZSI6ICJudWxsIgorICAg ICAgfSwKKyAgICAgIHsKKyAgICAgICAgIl9uYW1lIjogIm5leHRFbGVtZW50U2libGluZyIsCisg ICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAorICAgICAgICAiX3N1YnR5cGUiOiAibnVsbCIsCisg ICAgICAgICJfdmFsdWUiOiAibnVsbCIKKyAgICAgIH0sCisgICAgICB7CisgICAgICAgICJfbmFt ZSI6ICJzdWJzdHJpbmdEYXRhIiwKKyAgICAgICAgIl90eXBlIjogImZ1bmN0aW9uIiwKKyAgICAg ICAgIl92YWx1ZSI6ICIiCisgICAgICB9CisgICAgXSwKKyAgICAiX2VudHJpZXMiOiBudWxsCisg IH0KK30KKworLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KK0VYUFJFU1NJT046IFtkb2N1bWVudC5ib2R5LCBkaXYsIHNwYW4sIGlucHV0LCB0ZXh0 LCBjb21tZW50XQoreworICAiX3R5cGUiOiAib2JqZWN0IiwKKyAgIl9zdWJ0eXBlIjogImFycmF5 IiwKKyAgIl9vYmplY3RJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgIl9kZXNjcmlwdGlvbiI6ICJBcnJh eSIsCisgICJfc2l6ZSI6IDYsCisgICJfcHJldmlldyI6IHsKKyAgICAiX3R5cGUiOiAib2JqZWN0 IiwKKyAgICAiX3N1YnR5cGUiOiAiYXJyYXkiLAorICAgICJfZGVzY3JpcHRpb24iOiAiQXJyYXki LAorICAgICJfbG9zc2xlc3MiOiBmYWxzZSwKKyAgICAiX292ZXJmbG93IjogZmFsc2UsCisgICAg Il9zaXplIjogNiwKKyAgICAiX3Byb3BlcnRpZXMiOiBbCisgICAgICB7CisgICAgICAgICJfbmFt ZSI6ICIwIiwKKyAgICAgICAgIl90eXBlIjogIm9iamVjdCIsCisgICAgICAgICJfc3VidHlwZSI6 ICJub2RlIiwKKyAgICAgICAgIl92YWx1ZSI6ICI8Ym9keT4iCisgICAgICB9LAorICAgICAgewor ICAgICAgICAiX25hbWUiOiAiMSIsCisgICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAorICAgICAg ICAiX3N1YnR5cGUiOiAibm9kZSIsCisgICAgICAgICJfdmFsdWUiOiAiPGRpdiBjbGFzcz1cImZv byBiYXJcIj4iCisgICAgICB9LAorICAgICAgeworICAgICAgICAiX25hbWUiOiAiMiIsCisgICAg ICAgICJfdHlwZSI6ICJvYmplY3QiLAorICAgICAgICAiX3N1YnR5cGUiOiAibm9kZSIsCisgICAg ICAgICJfdmFsdWUiOiAiPHNwYW4gaWQ9XCJmb29cIj4iCisgICAgICB9LAorICAgICAgeworICAg ICAgICAiX25hbWUiOiAiMyIsCisgICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAorICAgICAgICAi X3N1YnR5cGUiOiAibm9kZSIsCisgICAgICAgICJfdmFsdWUiOiAiPGlucHV0IHR5cGU9XCJwYXNz d29yZFwiPiIKKyAgICAgIH0sCisgICAgICB7CisgICAgICAgICJfbmFtZSI6ICI0IiwKKyAgICAg ICAgIl90eXBlIjogIm9iamVjdCIsCisgICAgICAgICJfc3VidHlwZSI6ICJub2RlIiwKKyAgICAg ICAgIl92YWx1ZSI6ICIjdGV4dCBcInRleHQgY29udGVudFwiIgorICAgICAgfSwKKyAgICAgIHsK KyAgICAgICAgIl9uYW1lIjogIjUiLAorICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKKyAgICAg ICAgIl9zdWJ0eXBlIjogIm5vZGUiLAorICAgICAgICAiX3ZhbHVlIjogIjwhLS1jb21tZW50IGNv bnRlbnQtLT4iCiAgICAgICB9CiAgICAgXSwKICAgICAiX2VudHJpZXMiOiBudWxsCkBAIC0yMjU0 LDE5ICsyNDAxLDE5IEBAIEVYUFJFU1NJT046IGRvY3VtZW50LmhlYWQuY2hpbGRyZW4KICAgICAg ICAgIl9uYW1lIjogIjAiLAogICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAgICAgIl9z dWJ0eXBlIjogIm5vZGUiLAotICAgICAgICAiX3ZhbHVlIjogIm1ldGEiCisgICAgICAgICJfdmFs dWUiOiAiPG1ldGE+IgogICAgICAgfSwKICAgICAgIHsKICAgICAgICAgIl9uYW1lIjogIjEiLAog ICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAgICAgIl9zdWJ0eXBlIjogIm5vZGUiLAot ICAgICAgICAiX3ZhbHVlIjogInNjcmlwdCIKKyAgICAgICAgIl92YWx1ZSI6ICI8c2NyaXB0PiIK ICAgICAgIH0sCiAgICAgICB7CiAgICAgICAgICJfbmFtZSI6ICIyIiwKICAgICAgICAgIl90eXBl IjogIm9iamVjdCIsCiAgICAgICAgICJfc3VidHlwZSI6ICJub2RlIiwKLSAgICAgICAgIl92YWx1 ZSI6ICJzY3JpcHQiCisgICAgICAgICJfdmFsdWUiOiAiPHNjcmlwdD4iCiAgICAgICB9CiAgICAg XSwKICAgICAiX2VudHJpZXMiOiBudWxsCkBAIC0yMjkzLDE5ICsyNDQwLDE5IEBAIEVYUFJFU1NJ T046IGRvY3VtZW50LmdldEVsZW1lbnRzQnlDbGFzc05hbWUoJ215LXRlc3QnKQogICAgICAgICAi X25hbWUiOiAiMCIsCiAgICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICAgICAiX3N1YnR5 cGUiOiAibm9kZSIsCi0gICAgICAgICJfdmFsdWUiOiAicC5teS10ZXN0IgorICAgICAgICAiX3Zh bHVlIjogIjxwIGNsYXNzPVwibXktdGVzdFwiPiIKICAgICAgIH0sCiAgICAgICB7CiAgICAgICAg ICJfbmFtZSI6ICIxIiwKICAgICAgICAgIl90eXBlIjogIm9iamVjdCIsCiAgICAgICAgICJfc3Vi dHlwZSI6ICJub2RlIiwKLSAgICAgICAgIl92YWx1ZSI6ICJwLm15LXRlc3QiCisgICAgICAgICJf dmFsdWUiOiAiPHAgY2xhc3M9XCJteS10ZXN0XCI+IgogICAgICAgfSwKICAgICAgIHsKICAgICAg ICAgIl9uYW1lIjogIjIiLAogICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAgICAgIl9z dWJ0eXBlIjogIm5vZGUiLAotICAgICAgICAiX3ZhbHVlIjogInAubXktdGVzdCIKKyAgICAgICAg Il92YWx1ZSI6ICI8cCBjbGFzcz1cIm15LXRlc3RcIj4iCiAgICAgICB9CiAgICAgXSwKICAgICAi X2VudHJpZXMiOiBudWxsCkBAIC0yMzMyLDE5ICsyNDc5LDE5IEBAIEVYUFJFU1NJT046IGRvY3Vt ZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5teS10ZXN0JykKICAgICAgICAgIl9uYW1lIjogIjAiLAog ICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAgICAgIl9zdWJ0eXBlIjogIm5vZGUiLAot ICAgICAgICAiX3ZhbHVlIjogInAubXktdGVzdCIKKyAgICAgICAgIl92YWx1ZSI6ICI8cCBjbGFz cz1cIm15LXRlc3RcIj4iCiAgICAgICB9LAogICAgICAgewogICAgICAgICAiX25hbWUiOiAiMSIs CiAgICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICAgICAiX3N1YnR5cGUiOiAibm9kZSIs Ci0gICAgICAgICJfdmFsdWUiOiAicC5teS10ZXN0IgorICAgICAgICAiX3ZhbHVlIjogIjxwIGNs YXNzPVwibXktdGVzdFwiPiIKICAgICAgIH0sCiAgICAgICB7CiAgICAgICAgICJfbmFtZSI6ICIy IiwKICAgICAgICAgIl90eXBlIjogIm9iamVjdCIsCiAgICAgICAgICJfc3VidHlwZSI6ICJub2Rl IiwKLSAgICAgICAgIl92YWx1ZSI6ICJwLm15LXRlc3QiCisgICAgICAgICJfdmFsdWUiOiAiPHAg Y2xhc3M9XCJteS10ZXN0XCI+IgogICAgICAgfQogICAgIF0sCiAgICAgIl9lbnRyaWVzIjogbnVs bApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3Qu aHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0Lmh0bWwKaW5k ZXggMjUzMGVhNi4uZTU4M2ZmNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21v ZGVsL3JlbW90ZS1vYmplY3QuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwv cmVtb3RlLW9iamVjdC5odG1sCkBAIC0xMDksNyArMTA5LDEwIEBAIGZ1bmN0aW9uIHRlc3QoKQog ICAgICAgICB7ZXhwcmVzc2lvbjogImRvY3VtZW50LmJvZHkifSwKICAgICAgICAge2V4cHJlc3Np b246ICJkaXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsgZGl2LmNsYXNzTmFtZSA9 ICdmb28gYmFyJzsgZGl2In0sCiAgICAgICAgIHtleHByZXNzaW9uOiAic3BhbiA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoJ3NwYW4nKTsgc3Bhbi5pZCA9ICdmb28nOyBzcGFuIn0sCi0gICAgICAg IHtleHByZXNzaW9uOiAiZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoJ3RleHQnKSJ9LAorICAgICAg ICB7ZXhwcmVzc2lvbjogImlucHV0ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnaW5wdXQnKTsg aW5wdXQudHlwZSA9ICdwYXNzd29yZCc7IGlucHV0In0sCisgICAgICAgIHtleHByZXNzaW9uOiAi dGV4dCA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCd0ZXh0IGNvbnRlbnQnKTsgdGV4dCJ9LAor ICAgICAgICB7ZXhwcmVzc2lvbjogImNvbW1lbnQgPSBkb2N1bWVudC5jcmVhdGVDb21tZW50KCdj b21tZW50IGNvbnRlbnQnKTsgY29tbWVudCJ9LAorICAgICAgICB7ZXhwcmVzc2lvbjogIltkb2N1 bWVudC5ib2R5LCBkaXYsIHNwYW4sIGlucHV0LCB0ZXh0LCBjb21tZW50XSJ9LAogCiAgICAgICAg IC8vIE5vZGUgQ29sbGVjdGlvbnMgKE5vZGVMaXN0cyAvIENvbGxlY3Rpb25zKQogICAgICAgICB7 ZXhwcmVzc2lvbjogImRvY3VtZW50LmFsbCIsIGJyb3dzZXJPbmx5OiB0cnVlfSwgLy8gSFRNTEFs bENvbGxlY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGE5ZjIxYzkuLjJmOTZhZmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE1LTA1LTE5ICBK b3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogU2xpZ2h0bHkgYmV0dGVyIG5vZGUgcHJldmlld3MgaW4gYXJyYXlzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUxODgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdFNvdXJjZS5qczoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0LnByb3RvdHlwZS5fbm9k ZURlc2NyaXB0aW9uKToKKyAgICAgICAgKEluamVjdGVkU2NyaXB0LnByb3RvdHlwZS5fbm9kZVBy ZXZpZXcpOgorICAgICAgICBEaWZmZXJlbnQgc3RyaW5naWZpZWQgcmVwcmVzZW50YXRpb25zIGZv ciBhIGJhc2ljIG9iamVjdCBkZXNjcmlwdGlvbiBvciBpbiBhIHByZXZpZXcuCisKKyAgICAgICAg KEluamVjdGVkU2NyaXB0LlJlbW90ZU9iamVjdC5wcm90b3R5cGUuX2FwcGVuZFByb3BlcnR5UHJl dmlld3MpOgorICAgICAgICBVc2UgdGhlIG5vZGUgcHJldmlldyBzdHJpbmcgcmVwcmVzZW50YXRp b24gaW5zaWRlIHByZXZpZXdzLgorCisyMDE1LTA1LTE5ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNv cmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92ZSBQcmV2aWV3 IGZvciBOb2RlTGlzdCAvIGFycmF5IGxpa2UgY29sbGVjdGlvbnMKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTE3NwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwppbmRl eCAwMDJhMGMzLi44N2Q4Y2FmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKQEAgLTc1NSw2ICs3NTUsNTMgQEAg SW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9 LAogCisgICAgX25vZGVEZXNjcmlwdGlvbjogZnVuY3Rpb24obm9kZSkKKyAgICB7CisgICAgICAg IHZhciBpc1hNTERvY3VtZW50ID0gbm9kZS5vd25lckRvY3VtZW50ICYmICEhbm9kZS5vd25lckRv Y3VtZW50LnhtbFZlcnNpb247CisgICAgICAgIHZhciBkZXNjcmlwdGlvbiA9IGlzWE1MRG9jdW1l bnQgPyBub2RlLm5vZGVOYW1lIDogbm9kZS5ub2RlTmFtZS50b0xvd2VyQ2FzZSgpOworCisgICAg ICAgIHN3aXRjaCAobm9kZS5ub2RlVHlwZSkgeworICAgICAgICBjYXNlIDE6IC8vIE5vZGUuRUxF TUVOVF9OT0RFCisgICAgICAgICAgICBpZiAobm9kZS5pZCkKKyAgICAgICAgICAgICAgICBkZXNj cmlwdGlvbiArPSAiIyIgKyBub2RlLmlkOworICAgICAgICAgICAgaWYgKG5vZGUuY2xhc3NOYW1l KQorICAgICAgICAgICAgICAgIGRlc2NyaXB0aW9uICs9ICIuIiArIG5vZGUuY2xhc3NOYW1lLnRy aW0oKS5yZXBsYWNlKC9ccysvZywgIi4iKTsKKyAgICAgICAgICAgIHJldHVybiBkZXNjcmlwdGlv bjsKKworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIGRlc2NyaXB0aW9uOwor ICAgICAgICB9CisgICAgfSwKKworICAgIF9ub2RlUHJldmlldzogZnVuY3Rpb24obm9kZSkKKyAg ICB7CisgICAgICAgIHZhciBpc1hNTERvY3VtZW50ID0gbm9kZS5vd25lckRvY3VtZW50ICYmICEh bm9kZS5vd25lckRvY3VtZW50LnhtbFZlcnNpb247CisgICAgICAgIHZhciBub2RlTmFtZSA9IGlz WE1MRG9jdW1lbnQgPyBub2RlLm5vZGVOYW1lIDogbm9kZS5ub2RlTmFtZS50b0xvd2VyQ2FzZSgp OworCisgICAgICAgIHN3aXRjaCAobm9kZS5ub2RlVHlwZSkgeworICAgICAgICBjYXNlIDE6IC8v IE5vZGUuRUxFTUVOVF9OT0RFCisgICAgICAgICAgICBpZiAobm9kZS5pZCkKKyAgICAgICAgICAg ICAgICByZXR1cm4gIjwiICsgbm9kZU5hbWUgKyAiIGlkPVwiIiArIG5vZGUuaWQgKyAiXCI+IjsK KyAgICAgICAgICAgIGlmIChub2RlLmNsYXNzTmFtZSkKKyAgICAgICAgICAgICAgICByZXR1cm4g IjwiICsgbm9kZU5hbWUgKyAiIGNsYXNzPVwiIiArIG5vZGUuY2xhc3NOYW1lICsgIlwiPiI7Cisg ICAgICAgICAgICBpZiAobm9kZU5hbWUgPT09ICJpbnB1dCIgJiYgbm9kZS50eXBlKQorICAgICAg ICAgICAgICAgIHJldHVybiAiPCIgKyBub2RlTmFtZSArICIgdHlwZT1cIiIgKyBub2RlLnR5cGUg KyAiXCI+IjsKKyAgICAgICAgICAgIHJldHVybiAiPCIgKyBub2RlTmFtZSArICI+IjsKKworICAg ICAgICBjYXNlIDM6IC8vIE5vZGUuVEVYVF9OT0RFCisgICAgICAgICAgICByZXR1cm4gbm9kZU5h bWUgKyAiIFwiIiArIG5vZGUubm9kZVZhbHVlICsgIlwiIjsKKworICAgICAgICBjYXNlIDg6IC8v IE5vZGUuQ09NTUVOVF9OT0RFCisgICAgICAgICAgICByZXR1cm4gIjwhLS0iICsgbm9kZS5ub2Rl VmFsdWUgKyAiLS0+IjsKKworICAgICAgICBjYXNlIDEwOiAvLyBOb2RlLkRPQ1VNRU5UX1RZUEVf Tk9ERQorICAgICAgICAgICAgcmV0dXJuICI8IURPQ1RZUEUgIiArIG5vZGVOYW1lICsgIj4iOwor CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXR1cm4gbm9kZU5hbWU7CisgICAgICAg IH0KKyAgICB9LAorCiAgICAgX2Rlc2NyaWJlOiBmdW5jdGlvbihvYmopCiAgICAgewogICAgICAg ICBpZiAodGhpcy5pc1ByaW1pdGl2ZVZhbHVlKG9iaikpCkBAIC03NzQsMjAgKzgyMSw4IEBAIElu amVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHN1YnR5cGUgPT09ICJlcnJv ciIpCiAgICAgICAgICAgICByZXR1cm4gdG9TdHJpbmcob2JqKTsKIAotICAgICAgICBpZiAoc3Vi dHlwZSA9PT0gIm5vZGUiKSB7Ci0gICAgICAgICAgICB2YXIgZGVzY3JpcHRpb24gPSBvYmoubm9k ZU5hbWUudG9Mb3dlckNhc2UoKTsKLSAgICAgICAgICAgIHN3aXRjaCAob2JqLm5vZGVUeXBlKSB7 Ci0gICAgICAgICAgICBjYXNlIDEgLyogTm9kZS5FTEVNRU5UX05PREUgKi86Ci0gICAgICAgICAg ICAgICAgZGVzY3JpcHRpb24gKz0gb2JqLmlkID8gIiMiICsgb2JqLmlkIDogIiI7Ci0gICAgICAg ICAgICAgICAgdmFyIGNsYXNzTmFtZSA9IG9iai5jbGFzc05hbWU7Ci0gICAgICAgICAgICAgICAg ZGVzY3JpcHRpb24gKz0gKGNsYXNzTmFtZSAmJiB0eXBlb2YgY2xhc3NOYW1lID09PSAic3RyaW5n IikgPyAiLiIgKyBjbGFzc05hbWUudHJpbSgpLnJlcGxhY2UoL1xzKy9nLCAiLiIpIDogIiI7Ci0g ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIDEwIC8qTm9kZS5ET0NVTUVO VF9UWVBFX05PREUgKi86Ci0gICAgICAgICAgICAgICAgZGVzY3JpcHRpb24gPSAiPCFET0NUWVBF ICIgKyBkZXNjcmlwdGlvbiArICI+IjsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIHJldHVybiBkZXNjcmlwdGlvbjsKLSAgICAgICAgfQorICAgICAg ICBpZiAoc3VidHlwZSA9PT0gIm5vZGUiKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMuX25vZGVE ZXNjcmlwdGlvbihvYmopOwogCiAgICAgICAgIHZhciBjbGFzc05hbWUgPSBJbmplY3RlZFNjcmlw dEhvc3QuaW50ZXJuYWxDb25zdHJ1Y3Rvck5hbWUob2JqKTsKICAgICAgICAgaWYgKHN1YnR5cGUg PT09ICJhcnJheSIpCkBAIC0xMTMzLDggKzExNjgsMTAgQEAgSW5qZWN0ZWRTY3JpcHQuUmVtb3Rl T2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgcHJldmlldy5vdmVyZmxv dyA9IHRydWU7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIHZhciBkZXNj cmlwdGlvbiA9ICIiOwotICAgICAgICAgICAgICAgIGlmICh0eXBlICE9PSAiZnVuY3Rpb24iIHx8 IHN1YnR5cGUgPT09ICJjbGFzcyIpCi0gICAgICAgICAgICAgICAgICAgIGRlc2NyaXB0aW9uID0g dGhpcy5fYWJicmV2aWF0ZVN0cmluZyhpbmplY3RlZFNjcmlwdC5fZGVzY3JpYmUodmFsdWUpLCBt YXhMZW5ndGgsIHN1YnR5cGUgPT09ICJyZWdleHAiKTsKKyAgICAgICAgICAgICAgICBpZiAodHlw ZSAhPT0gImZ1bmN0aW9uIiB8fCBzdWJ0eXBlID09PSAiY2xhc3MiKSB7CisgICAgICAgICAgICAg ICAgICAgIHZhciBmdWxsRGVzY3JpcHRpb24gPSBzdWJ0eXBlID09PSAibm9kZSIgPyBpbmplY3Rl ZFNjcmlwdC5fbm9kZVByZXZpZXcodmFsdWUpIDogaW5qZWN0ZWRTY3JpcHQuX2Rlc2NyaWJlKHZh bHVlKTsKKyAgICAgICAgICAgICAgICAgICAgZGVzY3JpcHRpb24gPSB0aGlzLl9hYmJyZXZpYXRl U3RyaW5nKGZ1bGxEZXNjcmlwdGlvbiwgbWF4TGVuZ3RoLCBzdWJ0eXBlID09PSAicmVnZXhwIik7 CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHByb3BlcnR5LnZhbHVlID0gZGVz Y3JpcHRpb247CiAgICAgICAgICAgICAgICAgcHJldmlldy5sb3NzbGVzcyA9IGZhbHNlOwogICAg ICAgICAgICAgfQo=