56111 2011-03-10 09:37:16 -0800 Web Inspector: Optimize backend-frontend data transfer volume for CSS styles 2011-03-14 05:54:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 365246 0 apavlov 2011-03-10 09:37:16 -0800 Currently every CSS property is described by a number of key:value pairs in the Web Inspector protocol. This results in computed style transfers of about 30kB for ~220 properties and should certainly be reworked (this is often slow even without remote debugging). 365316 1 85350 apavlov 2011-03-10 10:58:50 -0800 Created attachment 85350 [PATCH] Suggested solution 365494 2 pmuellr 2011-03-10 13:43:04 -0800 Makes sense. I'm curious how much this saves. I've been noticing for weinre that computed styles are coming over far too often, as near as I can tell. For instance, I see them come over even if the computed style disclosure is set to "hide". Might well be something I'm doing wrong, or something that's changed since I last caught up to WI, of maybe they need to come over anyway for some other calculation. 365502 3 pfeldman 2011-03-10 13:52:07 -0800 (In reply to comment #2) > Makes sense. I'm curious how much this saves. > > I've been noticing for weinre that computed styles are coming over far too often, as near as I can tell. For instance, I see them come over even if the computed style disclosure is set to "hide". Might well be something I'm doing wrong, or something that's changed since I last caught up to WI, of maybe they need to come over anyway for some other calculation. Good point - I think we are sending computed style information regardless of the sidebar section state. 366185 4 loislo 2011-03-11 11:54:22 -0800 was landed as r80845 366186 5 loislo 2011-03-11 11:54:58 -0800 was landed as r80845(In reply to comment #4) > was landed as r80845 wrong bug 366907 6 85350 pfeldman 2011-03-14 02:39:36 -0700 Comment on attachment 85350 [PATCH] Suggested solution View in context: https://bugs.webkit.org/attachment.cgi?id=85350&action=review > LayoutTests/inspector/styles/styles-new-API.html:244 > + InspectorTest.addResult("['" + property.name + "':'" + property.value + "'" + (property.priority === "important" ? " is-important" : "") + ((typeof property.parsedOk === "undefined") ? "" : " non-parsed") +"] @[" + property.startOffset + "-" + property.endOffset + "] " + (property.status || "style")); ("parsedOk" in property) > Source/WebCore/inspector/InspectorStyleSheet.cpp:453 > + String status = it->disabled ? "disabled" : "active"; I'd suggest that: - active properties have no additional flags, - disabled properties have "disabled" set to true, - style (longhand) properties are placed under source code (shorthand) properties in case of regular styles + computed styles are returned as arrays of longhands. 366949 7 apavlov 2011-03-14 05:54:29 -0700 Committed r81019: <http://trac.webkit.org/changeset/81019> 85350 2011-03-10 10:58:50 -0800 2011-03-14 02:39:36 -0700 [PATCH] Suggested solution optimizestyles.patch text/plain 8529 apavlov Y29tbWl0IDI2MjdjYTY1MzJiNDA5NzRjMTc3MDI3ZTk3NjJhMzgwM2QwMjk3NTEKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUaHUgTWFyIDEw IDIxOjI1OjA4IDIwMTEgKzAzMDAKCiAgICBPcHRpbWl6YXRpb24KCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjViNDMwMC4u ZmNjYzE1MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTAzLTEwICBBbGV4YW5kZXIgUGF2 bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogT3B0aW1pemUgYmFja2VuZC1mcm9u dGVuZCBkYXRhIHRyYW5zZmVyIHZvbHVtZSBmb3IgQ1NTIHN0eWxlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYxMTEKKworICAgICAgICAqIGluc3Bl Y3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1BUEkuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3Ivc3R5 bGVzL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy5odG1sOgorCiAyMDExLTAzLTEwICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZDogcm9s bGluZyBvdXQgcjgwNDc4IGFuZCBpdHMgZm9sbG93IHVwcyBmb3IgYnJlYWtpbmcKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1BUEkuaHRtbCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1BUEkuaHRtbAppbmRleCBiODVm NzI5Li4wMjNhYzViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0 eWxlcy1uZXctQVBJLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHls ZXMtbmV3LUFQSS5odG1sCkBAIC0yNDEsNyArMjQxLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGUuY3NzUHJvcGVydGllcy5sZW5ndGg7ICsraSkg ewogICAgICAgICAgICAgdmFyIHByb3BlcnR5ID0gc3R5bGUuY3NzUHJvcGVydGllc1tpXTsKICAg ICAgICAgICAgIGlmIChwcm9wZXJ0eS5zdGF0dXMgIT09ICJkaXNhYmxlZCIpCi0gICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlsnIiArIHByb3BlcnR5Lm5hbWUgKyAiJzon IiArIHByb3BlcnR5LnZhbHVlICsgIiciICsgKHByb3BlcnR5LnByaW9yaXR5ID09PSAiaW1wb3J0 YW50IiA/ICIgaXMtaW1wb3J0YW50IiA6ICIiKSArIChwcm9wZXJ0eS5wYXJzZWRPayA/ICIiIDog IiBub24tcGFyc2VkIikgKyJdIEBbIiArIHByb3BlcnR5LnN0YXJ0T2Zmc2V0ICsgIi0iICsgcHJv cGVydHkuZW5kT2Zmc2V0ICsgIl0gIiArIHByb3BlcnR5LnN0YXR1cyk7CisgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlsnIiArIHByb3BlcnR5Lm5hbWUgKyAiJzonIiAr IHByb3BlcnR5LnZhbHVlICsgIiciICsgKHByb3BlcnR5LnByaW9yaXR5ID09PSAiaW1wb3J0YW50 IiA/ICIgaXMtaW1wb3J0YW50IiA6ICIiKSArICgodHlwZW9mIHByb3BlcnR5LnBhcnNlZE9rID09 PSAidW5kZWZpbmVkIikgPyAiIiA6ICIgbm9uLXBhcnNlZCIpICsiXSBAWyIgKyBwcm9wZXJ0eS5z dGFydE9mZnNldCArICItIiArIHByb3BlcnR5LmVuZE9mZnNldCArICJdICIgKyAocHJvcGVydHku c3RhdHVzIHx8ICJzdHlsZSIpKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiW3RleHQ9JyIgKyBwcm9wZXJ0eS50ZXh0ICsgIiddICIg KyBwcm9wZXJ0eS5zdGF0dXMpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy5odG1sIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtc291cmNlLW9mZnNldHMuaHRtbAppbmRleCA4NGUzMDli Li4xNmMzOWU2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxl cy1zb3VyY2Utb2Zmc2V0cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMv c3R5bGVzLXNvdXJjZS1vZmZzZXRzLmh0bWwKQEAgLTI3LDkgKzI3LDkgQEAgZnVuY3Rpb24gdGVz dCgpCiAgICAgICAgIHZhciBhbGxQcm9wZXJ0aWVzID0gc3R5bGUuY3NzUHJvcGVydGllczsKICAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBhbGxQcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7CiAg ICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBhbGxQcm9wZXJ0aWVzW2ldOwotICAgICAgICAgICAg aWYgKHByb3BlcnR5LnN0YXR1cyA9PT0gInN0eWxlIikKKyAgICAgICAgICAgIGlmICghcHJvcGVy dHkuc3RhdHVzKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hZGRSZXN1bHQoIlsnIiArIHByb3BlcnR5Lm5hbWUgKyAiJzonIiArIHByb3BlcnR5 LnZhbHVlICsgIiciICsgKHByb3BlcnR5LnByaW9yaXR5ID8gIiAhaW1wb3J0YW50IiA6ICIiKSAr IChwcm9wZXJ0eS5wYXJzZWRPayA/ICIiIDogIiBub24tcGFyc2VkIikgKyJdIEBbIiArIHByb3Bl cnR5LnN0YXJ0T2Zmc2V0ICsgIi0iICsgcHJvcGVydHkuZW5kT2Zmc2V0ICsgIl0iKTsKKyAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJbJyIgKyBwcm9wZXJ0eS5uYW1lICsgIic6 JyIgKyBwcm9wZXJ0eS52YWx1ZSArICInIiArIChwcm9wZXJ0eS5wcmlvcml0eSA/ICIgIWltcG9y dGFudCIgOiAiIikgKyAoKHR5cGVvZiBwcm9wZXJ0eS5wYXJzZWRPayA9PT0gInVuZGVmaW5lZCIp ID8gIiIgOiAiIG5vbi1wYXJzZWQiKSArIl0gQFsiICsgcHJvcGVydHkuc3RhcnRPZmZzZXQgKyAi LSIgKyBwcm9wZXJ0eS5lbmRPZmZzZXQgKyAiXSIpOwogICAgICAgICB9CiAgICAgfQogICAgIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDBlOTQ4NjUuLmUxZGE2ZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOSBA QAogMjAxMS0wMy0xMCAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgog CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IE9wdGltaXplIGJhY2tlbmQtZnJvbnRlbmQgZGF0YSB0cmFuc2ZlciB2b2x1bWUgZm9y IENTUyBzdHlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU2MTExCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgcmVkdWNlcyB0aGUgZ2V0U3R5bGVzRm9y Tm9kZSgpIHBheWxvYWQgbW9yZSB0aGFuIHR3aWNlIGZvciBCT0RZIGVsZW1lbnRzLgorCisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yU3R5bGU6OnBvcHVsYXRlT2JqZWN0V2l0aFN0eWxlUHJvcGVydGllcyk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNTU1Byb3BlcnR5LnBhcnNlUGF5bG9hZCk6CisKKzIwMTEtMDMtMTAgIEFs ZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdl ZCBieSBQYXZlbCBGZWxkbWFuLgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEludmFsaWQgZXhw ZWN0ZWQgcGFyYW1ldGVyIGxpc3QgaW4gQ1NTQWdlbnQuc2V0U2VsZWN0b3JUZXh0KCkgY2FsbGJh Y2sgKENTU1N0eWxlTW9kZWwuanMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yU3R5bGVTaGVldC5jcHAKaW5kZXggNDVlNmU0My4uNzdjY2RlMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcApAQCAtNDUwLDEz ICs0NTAsMTkgQEAgdm9pZCBJbnNwZWN0b3JTdHlsZTo6cG9wdWxhdGVPYmplY3RXaXRoU3R5bGVQ cm9wZXJ0aWVzKEluc3BlY3Rvck9iamVjdCogcmVzdWx0KQogCiAgICAgICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IHByb3BlcnR5ID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKICAgICAg ICAgcHJvcGVydGllc09iamVjdC0+cHVzaE9iamVjdChwcm9wZXJ0eSk7Ci0gICAgICAgIHByb3Bl cnR5LT5zZXRTdHJpbmcoInN0YXR1cyIsIGl0LT5kaXNhYmxlZCA/ICJkaXNhYmxlZCIgOiAiYWN0 aXZlIik7Ci0gICAgICAgIHByb3BlcnR5LT5zZXRCb29sZWFuKCJwYXJzZWRPayIsIHByb3BlcnR5 RW50cnkucGFyc2VkT2spOworICAgICAgICBTdHJpbmcgc3RhdHVzID0gaXQtPmRpc2FibGVkID8g ImRpc2FibGVkIiA6ICJhY3RpdmUiOworCisgICAgICAgIC8vIERlZmF1bHQgInBhcnNlZE9rIiA9 PSB0cnVlLgorICAgICAgICBpZiAoIXByb3BlcnR5RW50cnkucGFyc2VkT2spCisgICAgICAgICAg ICBwcm9wZXJ0eS0+c2V0Qm9vbGVhbigicGFyc2VkT2siLCBmYWxzZSk7CiAgICAgICAgIGlmIChp dC0+aGFzUmF3VGV4dCgpKQogICAgICAgICAgICAgcHJvcGVydHktPnNldFN0cmluZygidGV4dCIs IGl0LT5yYXdUZXh0KTsKICAgICAgICAgcHJvcGVydHktPnNldFN0cmluZygibmFtZSIsIG5hbWUp OwogICAgICAgICBwcm9wZXJ0eS0+c2V0U3RyaW5nKCJ2YWx1ZSIsIHByb3BlcnR5RW50cnkudmFs dWUpOwotICAgICAgICBwcm9wZXJ0eS0+c2V0U3RyaW5nKCJwcmlvcml0eSIsIHByb3BlcnR5RW50 cnkuaW1wb3J0YW50ID8gImltcG9ydGFudCIgOiAiIik7CisKKyAgICAgICAgLy8gRGVmYXVsdCAi cHJpb3JpdHkiID09ICIiLgorICAgICAgICBpZiAocHJvcGVydHlFbnRyeS5pbXBvcnRhbnQpCisg ICAgICAgICAgICBwcm9wZXJ0eS0+c2V0U3RyaW5nKCJwcmlvcml0eSIsICJpbXBvcnRhbnQiKTsK ICAgICAgICAgaWYgKCFpdC0+ZGlzYWJsZWQpIHsKICAgICAgICAgICAgIGlmIChpdC0+aGFzU291 cmNlKSB7CiAgICAgICAgICAgICAgICAgcHJvcGVydHktPnNldEJvb2xlYW4oImltcGxpY2l0Iiwg ZmFsc2UpOwpAQCAtNDgxLDI1ICs0ODcsMzUgQEAgdm9pZCBJbnNwZWN0b3JTdHlsZTo6cG9wdWxh dGVPYmplY3RXaXRoU3R5bGVQcm9wZXJ0aWVzKEluc3BlY3Rvck9iamVjdCogcmVzdWx0KQogCiAg ICAgICAgICAgICAgICAgaWYgKHNob3VsZEluYWN0aXZhdGUpIHsKICAgICAgICAgICAgICAgICAg ICAgYWN0aXZlSXQtPnNlY29uZC0+c2V0U3RyaW5nKCJzdGF0dXMiLCAiaW5hY3RpdmUiKTsKLSAg ICAgICAgICAgICAgICAgICAgYWN0aXZlSXQtPnNlY29uZC0+c2V0U3RyaW5nKCJzaG9ydGhhbmRO YW1lIiwgIiIpOworICAgICAgICAgICAgICAgICAgICBhY3RpdmVJdC0+c2Vjb25kLT5yZW1vdmUo InNob3J0aGFuZE5hbWUiKTsKICAgICAgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lVG9QcmV2 aW91c0FjdGl2ZVByb3BlcnR5LnNldChuYW1lLCBwcm9wZXJ0eSk7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBwcm9wZXJ0eS0+c2V0Qm9v bGVhbigiaW1wbGljaXQiLCBtX3N0eWxlLT5pc1Byb3BlcnR5SW1wbGljaXQobmFtZSkpOwotICAg ICAgICAgICAgICAgIHByb3BlcnR5LT5zZXRTdHJpbmcoInN0YXR1cyIsICJzdHlsZSIpOworICAg ICAgICAgICAgICAgIGJvb2wgaW1wbGljaXQgPSBtX3N0eWxlLT5pc1Byb3BlcnR5SW1wbGljaXQo bmFtZSk7CisgICAgICAgICAgICAgICAgLy8gRGVmYXVsdCAiaW1wbGljaXQiID09IGZhbHNlLgor ICAgICAgICAgICAgICAgIGlmIChpbXBsaWNpdCkKKyAgICAgICAgICAgICAgICAgICAgcHJvcGVy dHktPnNldEJvb2xlYW4oImltcGxpY2l0IiwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgc3RhdHVz ID0gIiI7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAgICAvLyBEZWZhdWx0ICJz dGF0dXMiID09ICJzdHlsZSIuCisgICAgICAgIGlmICghc3RhdHVzLmlzRW1wdHkoKSkKKyAgICAg ICAgICAgIHByb3BlcnR5LT5zZXRTdHJpbmcoInN0YXR1cyIsIHN0YXR1cyk7CisKICAgICAgICAg aWYgKHByb3BlcnR5RW50cnkucGFyc2VkT2spIHsKICAgICAgICAgICAgIC8vIEJvdGggZm9yIHN0 eWxlLW9yaWdpbmF0ZWQgYW5kIHBhcnNlZCBzb3VyY2UgcHJvcGVydGllcy4KICAgICAgICAgICAg IFN0cmluZyBzaG9ydGhhbmQgPSBtX3N0eWxlLT5nZXRQcm9wZXJ0eVNob3J0aGFuZChuYW1lKTsK LSAgICAgICAgICAgIHByb3BlcnR5LT5zZXRTdHJpbmcoInNob3J0aGFuZE5hbWUiLCBzaG9ydGhh bmQpOwotICAgICAgICAgICAgaWYgKCFzaG9ydGhhbmQuaXNFbXB0eSgpICYmICFmb3VuZFNob3J0 aGFuZHMuY29udGFpbnMoc2hvcnRoYW5kKSkgewotICAgICAgICAgICAgICAgIGZvdW5kU2hvcnRo YW5kcy5hZGQoc2hvcnRoYW5kKTsKLSAgICAgICAgICAgICAgICBzaG9ydGhhbmRWYWx1ZXMtPnNl dFN0cmluZyhzaG9ydGhhbmQsIHNob3J0aGFuZFZhbHVlKHNob3J0aGFuZCkpOworICAgICAgICAg ICAgaWYgKCFzaG9ydGhhbmQuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgLy8gRGVmYXVs dCAic2hvcnRoYW5kTmFtZSIgPT0gIiIuCisgICAgICAgICAgICAgICAgcHJvcGVydHktPnNldFN0 cmluZygic2hvcnRoYW5kTmFtZSIsIHNob3J0aGFuZCk7CisgICAgICAgICAgICAgICAgaWYgKCFm b3VuZFNob3J0aGFuZHMuY29udGFpbnMoc2hvcnRoYW5kKSkgeworICAgICAgICAgICAgICAgICAg ICBmb3VuZFNob3J0aGFuZHMuYWRkKHNob3J0aGFuZCk7CisgICAgICAgICAgICAgICAgICAgIHNo b3J0aGFuZFZhbHVlcy0+c2V0U3RyaW5nKHNob3J0aGFuZCwgc2hvcnRoYW5kVmFsdWUoc2hvcnRo YW5kKSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgIHByb3BlcnR5LT5zZXRTdHJpbmcoInNob3J0aGFuZE5hbWUiLCAiIik7Cisg ICAgICAgIH0KKyAgICAgICAgLy8gZWxzZSBzaG9ydGhhbmROYW1lIGlzIG5vdCBzZXQKICAgICB9 CiAKICAgICByZXN1bHQtPnNldEFycmF5KCJjc3NQcm9wZXJ0aWVzIiwgcHJvcGVydGllc09iamVj dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0 eWxlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxl TW9kZWwuanMKaW5kZXggMGU3Y2Q0OS4uNjkwYWJiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwpAQCAtNDEyLDggKzQxMiwx NCBAQCBXZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkgPSBmdW5jdGlvbihvd25lclN0eWxlLCBpbmRl eCwgbmFtZSwgdmFsdWUsIHByaW9yaXR5LCBzdAogCiBXZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHku cGFyc2VQYXlsb2FkID0gZnVuY3Rpb24ob3duZXJTdHlsZSwgaW5kZXgsIHBheWxvYWQpCiB7Cisg ICAgLy8gVGhlIGZvbGxvd2luZyBkZWZhdWx0IGZpZWxkIHZhbHVlcyBhcmUgdXNlZCBpbiB0aGUg cGF5bG9hZDoKKyAgICAvLyBwcmlvcml0eTogIiIKKyAgICAvLyBwYXJzZWRPazogdHJ1ZQorICAg IC8vIGltcGxpY2l0OiBmYWxzZQorICAgIC8vIHN0YXR1czogInN0eWxlIgorICAgIC8vIHNob3J0 aGFuZE5hbWU6ICIiCiAgICAgdmFyIHJlc3VsdCA9IG5ldyBXZWJJbnNwZWN0b3IuQ1NTUHJvcGVy dHkoCi0gICAgICAgIG93bmVyU3R5bGUsIGluZGV4LCBwYXlsb2FkLm5hbWUsIHBheWxvYWQudmFs dWUsIHBheWxvYWQucHJpb3JpdHksIHBheWxvYWQuc3RhdHVzLCBwYXlsb2FkLnBhcnNlZE9rLCBw YXlsb2FkLmltcGxpY2l0LCBwYXlsb2FkLnNob3J0aGFuZE5hbWUsIHBheWxvYWQudGV4dCk7Cisg ICAgICAgIG93bmVyU3R5bGUsIGluZGV4LCBwYXlsb2FkLm5hbWUsIHBheWxvYWQudmFsdWUsIHBh eWxvYWQucHJpb3JpdHkgfHwgIiIsIHBheWxvYWQuc3RhdHVzIHx8ICJzdHlsZSIsICh0eXBlb2Yg cGF5bG9hZC5wYXJzZWRPayA9PT0gInVuZGVmaW5lZCIpID8gdHJ1ZSA6IHBheWxvYWQucGFyc2Vk T2ssICEhcGF5bG9hZC5pbXBsaWNpdCwgcGF5bG9hZC5zaG9ydGhhbmROYW1lIHx8ICIiLCBwYXls b2FkLnRleHQpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAK