28871 2009-09-01 05:23:26 -0700 WebInspector: Make InjectedScript self-contained (move necessary methods from utilities.js into InjectedScript). 2009-09-01 07:59:13 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman timothy oldest_to_newest 143862 0 pfeldman 2009-09-01 05:23:26 -0700 Preparing InjectedScript for the separate context mode. 143863 1 38862 pfeldman 2009-09-01 05:27:30 -0700 Created attachment 38862 patch 143892 2 pfeldman 2009-09-01 07:59:13 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/ElementsPanel.js M WebCore/inspector/front-end/InjectedScript.js M WebCore/inspector/front-end/utilities.js Committed r47934 38862 2009-09-01 05:27:30 -0700 2009-09-01 07:01:19 -0700 patch self_contained text/plain 9657 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjY3NzE1OS4uMWNmZDYyZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAwOS0wOS0wMSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5 IEhhdGNoZXIuCisKKyAgICAgICAgV2ViSW5zcGVjdG9yOiBNYWtlIEluamVjdGVkU2NyaXB0IHNl bGYtY29udGFpbmVkIChtb3ZlIG5lY2Vzc2FyeQorICAgICAgICBtZXRob2RzIGZyb20gdXRpbGl0 aWVzLmpzIGludG8gSW5qZWN0ZWRTY3JpcHQpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODg3MQorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFu ZWwucHJvdG90eXBlLmdlbmVyYXRlU3R5bGVzaGVldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9JbmplY3RlZFNjcmlwdC5qczoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0Ll9lbnN1 cmVDb21tYW5kTGluZUFQSUluc3RhbGxlZC5pbnNwZWN0T2JqZWN0KToKKyAgICAgICAgKEluamVj dGVkU2NyaXB0Ll9lbnN1cmVDb21tYW5kTGluZUFQSUluc3RhbGxlZCk6CisgICAgICAgIChJbmpl Y3RlZFNjcmlwdC5wdXNoTm9kZVRvRnJvbnRlbmQpOgorICAgICAgICAoSW5qZWN0ZWRTY3JpcHQu Y3JlYXRlUHJveHlPYmplY3QpOgorICAgICAgICAoT2JqZWN0LnR5cGUpOgorICAgICAgICAoT2Jq ZWN0Lmhhc1Byb3BlcnRpZXMpOgorICAgICAgICAoT2JqZWN0LmNsYXNzTmFtZSk6CisgICAgICAg IChTdHJpbmcucHJvdG90eXBlLmVzY2FwZUNoYXJhY3RlcnMpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzOgorCiAyMDA5LTA5LTAxICBBbGV4YW5kZXIgUGF2bG92 ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBI YXRjaGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRz UGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcwpp bmRleCA2ZTI0N2UyLi5kNDNiY2I4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNQYW5lbC5qcwpAQCAtMzU5LDcgKzM1OSw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50 c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh2 YWx1ZTEgPT09IHZhbHVlMikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWVyZ2Vb cHJvcGVydHldID0gW3ZhbHVlMV07Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSBp ZiAoT2JqZWN0LnR5cGUodmFsdWUxKSA9PT0gImFycmF5IikKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlbHNlIGlmICh2YWx1ZTEgaW5zdGFuY2VvZiBBcnJheSkKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbWVyZ2VbcHJvcGVydHldLnB1c2godmFsdWUyKTsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1lcmdlW3Byb3BlcnR5XSA9IFt2YWx1ZTEsIHZhbHVlMl07CkBAIC0zOTEsNyArMzkxLDcgQEAg V2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgcHJvcGVydGllcy5sZW5ndGg7ICsraSkgewogICAgICAgICAg ICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBwcm9wZXJ0aWVzW2ldOwogICAgICAgICAgICAgICAg ICAgICB2YXIgdmFsdWUgPSBwc3VlZG9TdHlsZVtwcm9wZXJ0eV07Ci0gICAgICAgICAgICAgICAg ICAgIGlmIChPYmplY3QudHlwZSh2YWx1ZSkgIT09ICJhcnJheSIpCisgICAgICAgICAgICAgICAg ICAgIGlmICghKHZhbHVlIGluc3RhbmNlb2YgQXJyYXkpKQogICAgICAgICAgICAgICAgICAgICAg ICAgYnVpbGRlci5wdXNoKGRpc3BsYXlQcm9wZXJ0eShwcm9wZXJ0eSwgdmFsdWUpKTsKICAgICAg ICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAodmFsdWUu bGVuZ3RoID09PSAxKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0lu amVjdGVkU2NyaXB0LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2Ny aXB0LmpzCmluZGV4IDFjMDI5YzMuLmQzYmRiZTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMKQEAgLTg0Nyw3ICs4NDcsNyBAQCBJbmplY3RlZFNj cmlwdC5fZW5zdXJlQ29tbWFuZExpbmVBUElJbnN0YWxsZWQgPSBmdW5jdGlvbihpbnNwZWN0ZWRX aW5kb3cpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgaW5zcGVjdGVkV2luZG93LmNv bnNvbGUubG9nKG8pOwotICAgICAgICBpZiAoT2JqZWN0LnR5cGUobywgaW5zcGVjdGVkV2luZG93 KSA9PT0gIm5vZGUiKSB7CisgICAgICAgIGlmIChPYmplY3QudHlwZShvKSA9PT0gIm5vZGUiKSB7 CiAgICAgICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyLnB1c2hOb2RlUGF0aFRvRnJvbnRlbmQo bywgdHJ1ZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBzd2l0Y2ggKE9iamVjdC5k ZXNjcmliZShvKSkgewpAQCAtOTE2LDcgKzkxNiw3IEBAIEluamVjdGVkU2NyaXB0Ll9vYmplY3RG b3JJZCA9IGZ1bmN0aW9uKG9iamVjdElkKQogSW5qZWN0ZWRTY3JpcHQucHVzaE5vZGVUb0Zyb250 ZW5kID0gZnVuY3Rpb24ob2JqZWN0UHJveHkpCiB7CiAgICAgdmFyIG9iamVjdCA9IEluamVjdGVk U2NyaXB0Ll9yZXNvbHZlT2JqZWN0KG9iamVjdFByb3h5KTsKLSAgICBpZiAoIW9iamVjdCB8fCBP YmplY3QudHlwZShvYmplY3QsIEluamVjdGVkU2NyaXB0Ll93aW5kb3coKSkgIT09ICJub2RlIikK KyAgICBpZiAoIW9iamVjdCB8fCBPYmplY3QudHlwZShvYmplY3QpICE9PSAibm9kZSIpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICByZXR1cm4gSW5zcGVjdG9yQ29udHJvbGxlci5wdXNoTm9k ZVBhdGhUb0Zyb250ZW5kKG9iamVjdCwgZmFsc2UpOwogfQpAQCAtOTI2LDcgKzkyNiw3IEBAIElu amVjdGVkU2NyaXB0LmNyZWF0ZVByb3h5T2JqZWN0ID0gZnVuY3Rpb24ob2JqZWN0LCBvYmplY3RJ ZCwgYWJicmV2aWF0ZSkKIHsKICAgICB2YXIgcmVzdWx0ID0ge307CiAgICAgcmVzdWx0Lm9iamVj dElkID0gb2JqZWN0SWQ7Ci0gICAgcmVzdWx0LnR5cGUgPSBPYmplY3QudHlwZShvYmplY3QsIElu amVjdGVkU2NyaXB0Ll93aW5kb3coKSk7CisgICAgcmVzdWx0LnR5cGUgPSBPYmplY3QudHlwZShv YmplY3QpOwogCiAgICAgdmFyIHR5cGUgPSB0eXBlb2Ygb2JqZWN0OwogICAgIGlmICh0eXBlID09 PSAib2JqZWN0IiB8fCB0eXBlID09PSAiZnVuY3Rpb24iKSB7CkBAIC05MzYsNyArOTM2LDcgQEAg SW5qZWN0ZWRTY3JpcHQuY3JlYXRlUHJveHlPYmplY3QgPSBmdW5jdGlvbihvYmplY3QsIG9iamVj dElkLCBhYmJyZXZpYXRlKQogICAgICAgICB9CiAgICAgfQogICAgIHRyeSB7Ci0gICAgICAgIHJl c3VsdC5kZXNjcmlwdGlvbiA9IE9iamVjdC5kZXNjcmliZShvYmplY3QsIGFiYnJldmlhdGUsIElu amVjdGVkU2NyaXB0Ll93aW5kb3coKSk7CisgICAgICAgIHJlc3VsdC5kZXNjcmlwdGlvbiA9IE9i amVjdC5kZXNjcmliZShvYmplY3QsIGFiYnJldmlhdGUpOwogICAgIH0gY2F0Y2ggKGUpIHsKICAg ICAgICAgcmVzdWx0LmV4Y2VwdGlvbiA9IGUudG9TdHJpbmcoKTsKICAgICB9CkBAIC05ODYsMyAr OTg2LDEwOSBAQCBJbmplY3RlZFNjcmlwdC5DYWxsRnJhbWVQcm94eS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHJldHVybiBzY29wZUNoYWluUHJveHk7CiAgICAgfQogfQorCitPYmplY3QudHlwZSA9 IGZ1bmN0aW9uKG9iaikKK3sKKyAgICBpZiAob2JqID09PSBudWxsKQorICAgICAgICByZXR1cm4g Im51bGwiOworCisgICAgdmFyIHR5cGUgPSB0eXBlb2Ygb2JqOworICAgIGlmICh0eXBlICE9PSAi b2JqZWN0IiAmJiB0eXBlICE9PSAiZnVuY3Rpb24iKQorICAgICAgICByZXR1cm4gdHlwZTsKKwor ICAgIHZhciB3aW4gPSBJbmplY3RlZFNjcmlwdC5fd2luZG93KCk7CisKKyAgICBpZiAob2JqIGlu c3RhbmNlb2Ygd2luLk5vZGUpCisgICAgICAgIHJldHVybiAob2JqLm5vZGVUeXBlID09PSB1bmRl ZmluZWQgPyB0eXBlIDogIm5vZGUiKTsKKyAgICBpZiAob2JqIGluc3RhbmNlb2Ygd2luLlN0cmlu ZykKKyAgICAgICAgcmV0dXJuICJzdHJpbmciOworICAgIGlmIChvYmogaW5zdGFuY2VvZiB3aW4u QXJyYXkpCisgICAgICAgIHJldHVybiAiYXJyYXkiOworICAgIGlmIChvYmogaW5zdGFuY2VvZiB3 aW4uQm9vbGVhbikKKyAgICAgICAgcmV0dXJuICJib29sZWFuIjsKKyAgICBpZiAob2JqIGluc3Rh bmNlb2Ygd2luLk51bWJlcikKKyAgICAgICAgcmV0dXJuICJudW1iZXIiOworICAgIGlmIChvYmog aW5zdGFuY2VvZiB3aW4uRGF0ZSkKKyAgICAgICAgcmV0dXJuICJkYXRlIjsKKyAgICBpZiAob2Jq IGluc3RhbmNlb2Ygd2luLlJlZ0V4cCkKKyAgICAgICAgcmV0dXJuICJyZWdleHAiOworICAgIGlm IChvYmogaW5zdGFuY2VvZiB3aW4uRXJyb3IpCisgICAgICAgIHJldHVybiAiZXJyb3IiOworICAg IHJldHVybiB0eXBlOworfQorCitPYmplY3QuaGFzUHJvcGVydGllcyA9IGZ1bmN0aW9uKG9iaikK K3sKKyAgICBpZiAodHlwZW9mIG9iaiA9PT0gInVuZGVmaW5lZCIgfHwgdHlwZW9mIG9iaiA9PT0g Im51bGwiKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgZm9yICh2YXIgbmFtZSBpbiBvYmop CisgICAgICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBmYWxzZTsKK30KKworT2JqZWN0LmRl c2NyaWJlID0gZnVuY3Rpb24ob2JqLCBhYmJyZXZpYXRlZCkKK3sKKyAgICB2YXIgdHlwZTEgPSBP YmplY3QudHlwZShvYmopOworICAgIHZhciB0eXBlMiA9IE9iamVjdC5jbGFzc05hbWUob2JqKTsK KworICAgIHN3aXRjaCAodHlwZTEpIHsKKyAgICBjYXNlICJvYmplY3QiOgorICAgIGNhc2UgIm5v ZGUiOgorICAgICAgICByZXR1cm4gdHlwZTI7CisgICAgY2FzZSAiYXJyYXkiOgorICAgICAgICBy ZXR1cm4gIlsiICsgb2JqLnRvU3RyaW5nKCkgKyAiXSI7CisgICAgY2FzZSAic3RyaW5nIjoKKyAg ICAgICAgaWYgKG9iai5sZW5ndGggPiAxMDApCisgICAgICAgICAgICByZXR1cm4gIlwiIiArIG9i ai5zdWJzdHJpbmcoMCwgMTAwKSArICJcdTIwMjZcIiI7CisgICAgICAgIHJldHVybiAiXCIiICsg b2JqICsgIlwiIjsKKyAgICBjYXNlICJmdW5jdGlvbiI6CisgICAgICAgIHZhciBvYmplY3RUZXh0 ID0gU3RyaW5nKG9iaik7CisgICAgICAgIGlmICghL15mdW5jdGlvbiAvLnRlc3Qob2JqZWN0VGV4 dCkpCisgICAgICAgICAgICBvYmplY3RUZXh0ID0gKHR5cGUyID09ICJvYmplY3QiKSA/IHR5cGUx IDogdHlwZTI7CisgICAgICAgIGVsc2UgaWYgKGFiYnJldmlhdGVkKQorICAgICAgICAgICAgb2Jq ZWN0VGV4dCA9IC8uKi8uZXhlYyhvYmopWzBdLnJlcGxhY2UoLyArJC9nLCAiIik7CisgICAgICAg IHJldHVybiBvYmplY3RUZXh0OworICAgIGNhc2UgInJlZ2V4cCI6CisgICAgICAgIHJldHVybiBT dHJpbmcob2JqKS5yZXBsYWNlKC8oW1xcXC9dKS9nLCAiXFwkMSIpLnJlcGxhY2UoL1xcKFwvW2dp bV0qKSQvLCAiJDEiKS5zdWJzdHJpbmcoMSk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJu IFN0cmluZyhvYmopOworICAgIH0KK30KKworT2JqZWN0LmNsYXNzTmFtZSA9IGZ1bmN0aW9uKG9i aikKK3sKKyAgICByZXR1cm4gT2JqZWN0LnByb3RvdHlwZS50b1N0cmluZy5jYWxsKG9iaikucmVw bGFjZSgvXlxbb2JqZWN0ICguKilcXSQvaSwgIiQxIikKK30KKworLy8gQWx0aG91Z2ggRnVuY3Rp b24ucHJvdG90eXBlLmJpbmQgYW5kIFN0cmluZy5wcm90b3R5cGUuZXNjYXBlQ2hhcmFjdGVycyBh cmUgZGVmaW5lZCBpbiB1dGlsaXRpZXMuanMgdGhleSB3aWxsIHNvb24gYmVjb21lCisvLyB1bmF2 YWlsYWJsZSBpbiB0aGUgSW5qZWN0ZWRTY3JpcHQgY29udGV4dC4gU28gd2UgZGVmaW5lIHRoZW0g aGVyZSBmb3IgdGhlIGxvY2FsIHVzZS4KKy8vIFRPRE86IHJlbW92ZSB0aGlzIGNvbW1lbnQgb25j ZSBJbmplY3RlZFNjcmlwdCBydW5zIGluIGEgc2VwYXJhdGUgY29udGV4dC4KK0Z1bmN0aW9uLnBy b3RvdHlwZS5iaW5kID0gZnVuY3Rpb24odGhpc09iamVjdCkKK3sKKyAgICB2YXIgZnVuYyA9IHRo aXM7CisgICAgdmFyIGFyZ3MgPSBBcnJheS5wcm90b3R5cGUuc2xpY2UuY2FsbChhcmd1bWVudHMs IDEpOworICAgIHJldHVybiBmdW5jdGlvbigpIHsgcmV0dXJuIGZ1bmMuYXBwbHkodGhpc09iamVj dCwgYXJncy5jb25jYXQoQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRzLCAwKSkp IH07Cit9CisKK1N0cmluZy5wcm90b3R5cGUuZXNjYXBlQ2hhcmFjdGVycyA9IGZ1bmN0aW9uKGNo YXJzKQoreworICAgIHZhciBmb3VuZENoYXIgPSBmYWxzZTsKKyAgICBmb3IgKHZhciBpID0gMDsg aSA8IGNoYXJzLmxlbmd0aDsgKytpKSB7CisgICAgICAgIGlmICh0aGlzLmluZGV4T2YoY2hhcnMu Y2hhckF0KGkpKSAhPT0gLTEpIHsKKyAgICAgICAgICAgIGZvdW5kQ2hhciA9IHRydWU7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKworICAgIGlmICghZm91bmRDaGFyKQor ICAgICAgICByZXR1cm4gdGhpczsKKworICAgIHZhciByZXN1bHQgPSAiIjsKKyAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHRoaXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgaWYgKGNoYXJzLmluZGV4 T2YodGhpcy5jaGFyQXQoaSkpICE9PSAtMSkKKyAgICAgICAgICAgIHJlc3VsdCArPSAiXFwiOwor ICAgICAgICByZXN1bHQgKz0gdGhpcy5jaGFyQXQoaSk7CisgICAgfQorCisgICAgcmV0dXJuIHJl c3VsdDsKK30KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRp ZXMuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzCmluZGV4IGQ0 ODFiNzIuLmM1N2U5ZjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91 dGlsaXRpZXMuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5q cwpAQCAtMjYsMzYgKzI2LDYgQEAKICAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotT2JqZWN0LnR5cGUgPSBm dW5jdGlvbihvYmosIHdpbikKLXsKLSAgICBpZiAob2JqID09PSBudWxsKQotICAgICAgICByZXR1 cm4gIm51bGwiOwotCi0gICAgdmFyIHR5cGUgPSB0eXBlb2Ygb2JqOwotICAgIGlmICh0eXBlICE9 PSAib2JqZWN0IiAmJiB0eXBlICE9PSAiZnVuY3Rpb24iKQotICAgICAgICByZXR1cm4gdHlwZTsK LQotICAgIHdpbiA9IHdpbiB8fCB3aW5kb3c7Ci0KLSAgICBpZiAob2JqIGluc3RhbmNlb2Ygd2lu Lk5vZGUpCi0gICAgICAgIHJldHVybiAob2JqLm5vZGVUeXBlID09PSB1bmRlZmluZWQgPyB0eXBl IDogIm5vZGUiKTsKLSAgICBpZiAob2JqIGluc3RhbmNlb2Ygd2luLlN0cmluZykKLSAgICAgICAg cmV0dXJuICJzdHJpbmciOwotICAgIGlmIChvYmogaW5zdGFuY2VvZiB3aW4uQXJyYXkpCi0gICAg ICAgIHJldHVybiAiYXJyYXkiOwotICAgIGlmIChvYmogaW5zdGFuY2VvZiB3aW4uQm9vbGVhbikK LSAgICAgICAgcmV0dXJuICJib29sZWFuIjsKLSAgICBpZiAob2JqIGluc3RhbmNlb2Ygd2luLk51 bWJlcikKLSAgICAgICAgcmV0dXJuICJudW1iZXIiOwotICAgIGlmIChvYmogaW5zdGFuY2VvZiB3 aW4uRGF0ZSkKLSAgICAgICAgcmV0dXJuICJkYXRlIjsKLSAgICBpZiAob2JqIGluc3RhbmNlb2Yg d2luLlJlZ0V4cCkKLSAgICAgICAgcmV0dXJuICJyZWdleHAiOwotICAgIGlmIChvYmogaW5zdGFu Y2VvZiB3aW4uRXJyb3IpCi0gICAgICAgIHJldHVybiAiZXJyb3IiOwotICAgIHJldHVybiB0eXBl OwotfQotCiBPYmplY3QucHJveHlUeXBlID0gZnVuY3Rpb24ob2JqZWN0UHJveHkpCiB7CiAgICAg aWYgKG9iamVjdFByb3h5ID09PSBudWxsKQpAQCAtNjgsNDQgKzM4LDYgQEAgT2JqZWN0LnByb3h5 VHlwZSA9IGZ1bmN0aW9uKG9iamVjdFByb3h5KQogICAgIHJldHVybiBvYmplY3RQcm94eS50eXBl OwogfQogCi1PYmplY3QuaGFzUHJvcGVydGllcyA9IGZ1bmN0aW9uKG9iaikKLXsKLSAgICBpZiAo dHlwZW9mIG9iaiA9PT0gInVuZGVmaW5lZCIgfHwgdHlwZW9mIG9iaiA9PT0gIm51bGwiKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgZm9yICh2YXIgbmFtZSBpbiBvYmopCi0gICAgICAgIHJl dHVybiB0cnVlOwotICAgIHJldHVybiBmYWxzZTsKLX0KLQotT2JqZWN0LmRlc2NyaWJlID0gZnVu Y3Rpb24ob2JqLCBhYmJyZXZpYXRlZCwgd2luKQotewotICAgIHZhciB0eXBlMSA9IE9iamVjdC50 eXBlKG9iaiwgd2luKTsKLSAgICB2YXIgdHlwZTIgPSBPYmplY3QucHJvdG90eXBlLnRvU3RyaW5n LmNhbGwob2JqKS5yZXBsYWNlKC9eXFtvYmplY3QgKC4qKVxdJC9pLCAiJDEiKTsKLQotICAgIHN3 aXRjaCAodHlwZTEpIHsKLSAgICBjYXNlICJvYmplY3QiOgotICAgIGNhc2UgIm5vZGUiOgotICAg ICAgICByZXR1cm4gdHlwZTI7Ci0gICAgY2FzZSAiYXJyYXkiOgotICAgICAgICByZXR1cm4gIlsi ICsgb2JqLnRvU3RyaW5nKCkgKyAiXSI7Ci0gICAgY2FzZSAic3RyaW5nIjoKLSAgICAgICAgaWYg KG9iai5sZW5ndGggPiAxMDApCi0gICAgICAgICAgICByZXR1cm4gIlwiIiArIG9iai5zdWJzdHJp bmcoMCwgMTAwKSArICJcdTIwMjZcIiI7Ci0gICAgICAgIHJldHVybiAiXCIiICsgb2JqICsgIlwi IjsKLSAgICBjYXNlICJmdW5jdGlvbiI6Ci0gICAgICAgIHZhciBvYmplY3RUZXh0ID0gU3RyaW5n KG9iaik7Ci0gICAgICAgIGlmICghL15mdW5jdGlvbiAvLnRlc3Qob2JqZWN0VGV4dCkpCi0gICAg ICAgICAgICBvYmplY3RUZXh0ID0gKHR5cGUyID09ICJvYmplY3QiKSA/IHR5cGUxIDogdHlwZTI7 Ci0gICAgICAgIGVsc2UgaWYgKGFiYnJldmlhdGVkKQotICAgICAgICAgICAgb2JqZWN0VGV4dCA9 IC8uKi8uZXhlYyhvYmopWzBdLnJlcGxhY2UoLyArJC9nLCAiIik7Ci0gICAgICAgIHJldHVybiBv YmplY3RUZXh0OwotICAgIGNhc2UgInJlZ2V4cCI6Ci0gICAgICAgIHJldHVybiBTdHJpbmcob2Jq KS5yZXBsYWNlKC8oW1xcXC9dKS9nLCAiXFwkMSIpLnJlcGxhY2UoL1xcKFwvW2dpbV0qKSQvLCAi JDEiKS5zdWJzdHJpbmcoMSk7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIFN0cmluZyhv YmopOwotICAgIH0KLX0KLQogT2JqZWN0LnByb3BlcnRpZXMgPSBmdW5jdGlvbihvYmopCiB7CiAg ICAgdmFyIHByb3BlcnRpZXMgPSBbXTsK