29705 2009-09-24 01:02:20 -0700 Web Inspector: Fix formatting for messages derived from resource warnings, couple of drive-by fixes. 2009-09-24 04:58:05 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman timothy yurys oldest_to_newest 149691 0 pfeldman 2009-09-24 01:02:20 -0700 For watch panel, console and properties section to use the same code, we wrap all the result of the evaluation (even in case of primitive values). However, WebInspector's addMessage API is also used from within frontend (for resource warnings). This should be resolved. The patch also has a handful of drive-by fixes. 149692 1 40050 pfeldman 2009-09-24 01:05:49 -0700 Created attachment 40050 patch 149701 2 40053 pfeldman 2009-09-24 02:09:31 -0700 Created attachment 40053 same with watch abbreviation 149729 3 pfeldman 2009-09-24 04:58:05 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorFrontend.cpp M WebCore/inspector/front-end/ConsoleView.js M WebCore/inspector/front-end/InjectedScript.js M WebCore/inspector/front-end/WatchExpressionsSidebarPane.js Committed r48717 40050 2009-09-24 01:05:49 -0700 2009-09-24 02:09:31 -0700 patch format_api text/plain 6390 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWZjNjNhOS4uMTBjNWRhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAwOS0wOS0yNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5 IEhhdGNoZXIuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGZvcm1hdHRpbmcgZm9yIG1l c3NhZ2VzIGRlcml2ZWQgZnJvbSByZXNvdXJjZSB3YXJuaW5ncywKKyAgICAgICAgY291cGxlIG9m IGRyaXZlLWJ5IGZvcm1hdHRpbmcgZml4ZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI5NzA1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmQ6OmFk ZE1lc3NhZ2VUb0NvbnNvbGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZVZpZXcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5q czoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0Ll9ldmFsdWF0ZUFuZFdyYXApOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLnByb3RvdHlwZS51cGRh dGUpOgorCiAyMDA5LTA5LTI0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAK ICAgICAgICAgRml4ZWQgYSBiaXQgb2YgdGhlIFdpbmRvd3MgYnVpbGQuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZC5jcHAKaW5kZXggM2JkZmE5Ny4uYzk3OTNjYiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcApAQCAtODMsMTMgKzgzLDggQEAgdm9pZCBJ bnNwZWN0b3JGcm9udGVuZDo6YWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBTY3JpcHRPYmplY3Qm IG1lc3NhZ2VPYmosIGNvbnMKICAgICB9IGVsc2UgaWYgKCF3cmFwcGVkQXJndW1lbnRzLmlzRW1w dHkoKSkgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgd3JhcHBlZEFyZ3VtZW50 cy5zaXplKCk7ICsraSkKICAgICAgICAgICAgIGZ1bmN0aW9uLT5hcHBlbmRBcmd1bWVudChtX2lu c3BlY3RvckNvbnRyb2xsZXItPndyYXBPYmplY3Qod3JhcHBlZEFyZ3VtZW50c1tpXSkpOwotICAg IH0gZWxzZSB7Ci0gICAgICAgIC8vIEZJWE1FOiBhdm9pZCBtYW51YWwgd3JhcHBpbmcgaGVyZS4K LSAgICAgICAgU2NyaXB0T2JqZWN0IHRleHRXcmFwcGVyID0gU2NyaXB0T2JqZWN0OjpjcmVhdGVO ZXcobV9zY3JpcHRTdGF0ZSk7Ci0gICAgICAgIHRleHRXcmFwcGVyLnNldCgidHlwZSIsICJzdHJp bmciKTsKLSAgICAgICAgdGV4dFdyYXBwZXIuc2V0KCJkZXNjcmlwdGlvbiIsIG1lc3NhZ2UpOwot ICAgICAgICBmdW5jdGlvbi0+YXBwZW5kQXJndW1lbnQodGV4dFdyYXBwZXIpOwotICAgIH0KKyAg ICB9IGVsc2UKKyAgICAgICAgZnVuY3Rpb24tPmFwcGVuZEFyZ3VtZW50KG1lc3NhZ2UpOwogICAg IGZ1bmN0aW9uLT5jYWxsKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25z b2xlVmlldy5qcwppbmRleCA1NzViMTNhLi40ZjUwZWNjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC02MDgsNyArNjA4LDcgQEAgV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aGlzLmZvcm1h dHRlZE1lc3NhZ2UgPSBzcGFuOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuT2JqZWN0OgotICAg ICAgICAgICAgICAgIHRoaXMuZm9ybWF0dGVkTWVzc2FnZSA9IHRoaXMuX2Zvcm1hdChbV2ViSW5z cGVjdG9yLk9iamVjdFByb3h5LndyYXBQcmltaXRpdmVWYWx1ZSgiJU8iKSwgYXJnc1swXV0pOwor ICAgICAgICAgICAgICAgIHRoaXMuZm9ybWF0dGVkTWVzc2FnZSA9IHRoaXMuX2Zvcm1hdChbIiVP IiwgYXJnc1swXV0pOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVs dDoKICAgICAgICAgICAgICAgICB0aGlzLmZvcm1hdHRlZE1lc3NhZ2UgPSB0aGlzLl9mb3JtYXQo YXJncyk7CkBAIC02MzEsNiArNjMxLDEzIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghcGFyYW1ldGVycy5sZW5ndGgpCiAgICAgICAgICAg ICByZXR1cm4gZm9ybWF0dGVkUmVzdWx0OwogCisgICAgICAgIC8vIEZvcm1hdHRpbmcgY29kZSBi ZWxvdyBhc3N1bWVzIHRoYXQgcGFyYW1ldGVycyBhcmUgYWxsIHdyYXBwZXJzIHdoZXJlYXMgZnJv bnRlbmQgY29uc29sZQorICAgICAgICAvLyBBUEkgYWxsb3dzIHBhc3NpbmcgYXJiaXRyYXJ5IHZh bHVlcyBhcyBtZXNzYWdlcyAoc3RyaW5ncywgbnVtYmVydHMsIGV0Yy4pLiBXcmFwIHRoZW0gaGVy ZS4KKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwYXJhbWV0ZXJzLmxlbmd0aDsgKytpKSB7 CisgICAgICAgICAgICBpZiAodHlwZW9mIHBhcmFtZXRlcnNbaV0gIT09ICJvYmplY3QiICYmIHR5 cGVvZiBwYXJhbWV0ZXJzW2ldICE9PSAiZnVuY3Rpb24iKQorICAgICAgICAgICAgICAgIHBhcmFt ZXRlcnNbaV0gPSBXZWJJbnNwZWN0b3IuT2JqZWN0UHJveHkud3JhcFByaW1pdGl2ZVZhbHVlKHBh cmFtZXRlcnNbaV0pOworICAgICAgICB9CisKICAgICAgICAgZnVuY3Rpb24gZm9ybWF0Rm9yQ29u c29sZShvYmopCiAgICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuY29u c29sZS5fZm9ybWF0KG9iaik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5qZWN0ZWRTY3JpcHQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0 ZWRTY3JpcHQuanMKaW5kZXggNzI2YzdjYy4uOWZkYzAwNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwpAQCAtNTM2LDExICs1MzYsMTEgQEAgSW5q ZWN0ZWRTY3JpcHQuX2V2YWx1YXRlQW5kV3JhcCA9IGZ1bmN0aW9uKGV2YWxGdW5jdGlvbiwgb2Jq ZWN0LCBleHByZXNzaW9uKQogICAgICAgICByZXN1bHQudmFsdWUgPSBJbnNwZWN0b3JDb250cm9s bGVyLndyYXBPYmplY3QoSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlT24oZXZhbEZ1bmN0aW9uLCBv YmplY3QsIGV4cHJlc3Npb24pKTsKICAgICAgICAgLy8gSGFuZGxlIGVycm9yIHRoYXQgbWlnaHQg aGF2ZSBoYXBwZW5lZCB3aGlsZSBkZXNjcmliaW5nIHJlc3VsdC4KICAgICAgICAgaWYgKHJlc3Vs dC52YWx1ZS5lcnJvclRleHQpIHsKLSAgICAgICAgICAgIHJlc3VsdC52YWx1ZSA9IEluc3BlY3Rv ckNvbnRyb2xsZXIud3JhcE9iamVjdChyZXN1bHQudmFsdWUuZXJyb3JUZXh0KTsKKyAgICAgICAg ICAgIHJlc3VsdC52YWx1ZSA9IHJlc3VsdC52YWx1ZS5lcnJvclRleHQ7CiAgICAgICAgICAgICBy ZXN1bHQuaXNFeGNlcHRpb24gPSB0cnVlOwogICAgICAgICB9CiAgICAgfSBjYXRjaCAoZSkgewot ICAgICAgICByZXN1bHQudmFsdWUgPSBJbnNwZWN0b3JDb250cm9sbGVyLndyYXBPYmplY3QoZS50 b1N0cmluZygpKTsKKyAgICAgICAgcmVzdWx0LnZhbHVlID0gZS50b1N0cmluZygpOwogICAgICAg ICByZXN1bHQuaXNFeGNlcHRpb24gPSB0cnVlOwogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwpA QCAtMTA4Niw5ICsxMDg2LDcgQEAgT2JqZWN0LmRlc2NyaWJlID0gZnVuY3Rpb24ob2JqLCBhYmJy ZXZpYXRlZCkKICAgICBjYXNlICJhcnJheSI6CiAgICAgICAgIHJldHVybiAiWyIgKyBvYmoudG9T dHJpbmcoKSArICJdIjsKICAgICBjYXNlICJzdHJpbmciOgotICAgICAgICBpZiAoIWFiYnJldmlh dGVkKQotICAgICAgICAgICAgcmV0dXJuIG9iajsKLSAgICAgICAgaWYgKG9iai5sZW5ndGggPiAx MDApCisgICAgICAgIGlmIChhYmJyZXZpYXRlZCAmJiBvYmoubGVuZ3RoID4gMTAwKQogICAgICAg ICAgICAgcmV0dXJuICJcIiIgKyBvYmouc3Vic3RyaW5nKDAsIDEwMCkgKyAiXHUyMDI2XCIiOwog ICAgICAgICByZXR1cm4gIlwiIiArIG9iaiArICJcIiI7CiAgICAgY2FzZSAiZnVuY3Rpb24iOgpA QCAtMTEwMCwxMCArMTA5OCw2IEBAIE9iamVjdC5kZXNjcmliZSA9IGZ1bmN0aW9uKG9iaiwgYWJi cmV2aWF0ZWQpCiAgICAgICAgIHJldHVybiBvYmplY3RUZXh0OwogICAgIGNhc2UgInJlZ2V4cCI6 CiAgICAgICAgIHJldHVybiBTdHJpbmcob2JqKS5yZXBsYWNlKC8oW1xcXC9dKS9nLCAiXFwkMSIp LnJlcGxhY2UoL1xcKFwvW2dpbV0qKSQvLCAiJDEiKS5zdWJzdHJpbmcoMSk7Ci0gICAgY2FzZSAi Ym9vbGVhbiI6Ci0gICAgY2FzZSAibnVtYmVyIjoKLSAgICBjYXNlICJudWxsIjoKLSAgICAgICAg cmV0dXJuIG9iajsKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gU3RyaW5nKG9iaik7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVz c2lvbnNTaWRlYmFyUGFuZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4 cHJlc3Npb25zU2lkZWJhclBhbmUuanMKaW5kZXggYjU2ODkzOS4uZjE2MjA5YiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFu ZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1Np ZGViYXJQYW5lLmpzCkBAIC04NCw5ICs4NCw5IEBAIFdlYkluc3BlY3Rvci5XYXRjaEV4cHJlc3Np b25zU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBmdW5jdGlvbiBhcHBlbmRS ZXN1bHQoZXhwcmVzc2lvbiwgd2F0Y2hJbmRleCwgcmVzdWx0LCBleGNlcHRpb24pCiAgICAgICAg IHsKLSAgICAgICAgICAgIC8vIFRoZSBudWxsIGNoZWNrIGNhdGNoZXMgc29tZSBvdGhlciBjYXNl cywgbGlrZSBudWxsIGl0c2VsZiwgYW5kIE5hTgotICAgICAgICAgICAgaWYgKCh0eXBlb2YgcmVz dWx0ICE9PSAib2JqZWN0IikgfHwgKHJlc3VsdCA9PSBudWxsKSkKLSAgICAgICAgICAgICAgICBy ZXN1bHQgPSBuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFByb3h5KG51bGwsIFtdLCAwLCBTdHJpbmco cmVzdWx0KSwgZmFsc2UpOworICAgICAgICAgICAgLy8gRXhjZXB0aW9uIHJlc3VsdHMgYXJlIG5v dCB3cmFwcGVycywgYnV0IHRleHQgbWVzc2FnZXMuCisgICAgICAgICAgICBpZiAoZXhjZXB0aW9u KQorICAgICAgICAgICAgICAgIHJlc3VsdCA9IFdlYkluc3BlY3Rvci5PYmplY3RQcm94eS53cmFw UHJpbWl0aXZlVmFsdWUocmVzdWx0KTsKIAogICAgICAgICAgICAgdmFyIHByb3BlcnR5ID0gbmV3 IFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVByb3h5KGV4cHJlc3Npb24sIHJlc3VsdCk7CiAg ICAgICAgICAgICBwcm9wZXJ0eS53YXRjaEluZGV4ID0gd2F0Y2hJbmRleDsKQEAgLTk1LDcgKzk1 LDcgQEAgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIC8vIHNpbmNlIG90aGVyd2lzZSB5b3UgZ2V0IERPTVdpbmRvdwogICAgICAg ICAgICAgaWYgKHByb3BlcnR5Lm5hbWUgPT09IFdlYkluc3BlY3Rvci5XYXRjaEV4cHJlc3Npb25z U2VjdGlvbi5OZXdXYXRjaEV4cHJlc3Npb24pIAogICAgICAgICAgICAgICAgIHByb3BlcnR5LnZh bHVlLmRlc2NyaXB0aW9uID0gIiI7Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgLy8gVG8g Y2xhcmlmeSB3aGF0J3MgZ29pbmcgb24gaGVyZTogCiAgICAgICAgICAgICAvLyBJbiB0aGUgb3V0 ZXIgZnVuY3Rpb24sIHdlIGNhbGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHByb3BlcnRpZXMKICAgICAg ICAgICAgIC8vIHRoYXQgd2UncmUgZ29pbmcgdG8gYmUgdXBkYXRpbmcsIGFuZCBzZXQgdGhhdCBp biB0aGUK 40053 2009-09-24 02:09:31 -0700 2009-09-24 04:48:25 -0700 same with watch abbreviation format_api text/plain 6267 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWZjNjNhOS4uMTBjNWRhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAwOS0wOS0yNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5 IEhhdGNoZXIuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGZvcm1hdHRpbmcgZm9yIG1l c3NhZ2VzIGRlcml2ZWQgZnJvbSByZXNvdXJjZSB3YXJuaW5ncywKKyAgICAgICAgY291cGxlIG9m IGRyaXZlLWJ5IGZvcm1hdHRpbmcgZml4ZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI5NzA1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmQ6OmFk ZE1lc3NhZ2VUb0NvbnNvbGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZVZpZXcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5q czoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0Ll9ldmFsdWF0ZUFuZFdyYXApOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLnByb3RvdHlwZS51cGRh dGUpOgorCiAyMDA5LTA5LTI0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAK ICAgICAgICAgRml4ZWQgYSBiaXQgb2YgdGhlIFdpbmRvd3MgYnVpbGQuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZC5jcHAKaW5kZXggM2JkZmE5Ny4uYzk3OTNjYiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcApAQCAtODMsMTMgKzgzLDggQEAgdm9pZCBJ bnNwZWN0b3JGcm9udGVuZDo6YWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBTY3JpcHRPYmplY3Qm IG1lc3NhZ2VPYmosIGNvbnMKICAgICB9IGVsc2UgaWYgKCF3cmFwcGVkQXJndW1lbnRzLmlzRW1w dHkoKSkgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgd3JhcHBlZEFyZ3VtZW50 cy5zaXplKCk7ICsraSkKICAgICAgICAgICAgIGZ1bmN0aW9uLT5hcHBlbmRBcmd1bWVudChtX2lu c3BlY3RvckNvbnRyb2xsZXItPndyYXBPYmplY3Qod3JhcHBlZEFyZ3VtZW50c1tpXSkpOwotICAg IH0gZWxzZSB7Ci0gICAgICAgIC8vIEZJWE1FOiBhdm9pZCBtYW51YWwgd3JhcHBpbmcgaGVyZS4K LSAgICAgICAgU2NyaXB0T2JqZWN0IHRleHRXcmFwcGVyID0gU2NyaXB0T2JqZWN0OjpjcmVhdGVO ZXcobV9zY3JpcHRTdGF0ZSk7Ci0gICAgICAgIHRleHRXcmFwcGVyLnNldCgidHlwZSIsICJzdHJp bmciKTsKLSAgICAgICAgdGV4dFdyYXBwZXIuc2V0KCJkZXNjcmlwdGlvbiIsIG1lc3NhZ2UpOwot ICAgICAgICBmdW5jdGlvbi0+YXBwZW5kQXJndW1lbnQodGV4dFdyYXBwZXIpOwotICAgIH0KKyAg ICB9IGVsc2UKKyAgICAgICAgZnVuY3Rpb24tPmFwcGVuZEFyZ3VtZW50KG1lc3NhZ2UpOwogICAg IGZ1bmN0aW9uLT5jYWxsKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25z b2xlVmlldy5qcwppbmRleCA1NzViMTNhLi40ZjUwZWNjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC02MDgsNyArNjA4LDcgQEAgV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aGlzLmZvcm1h dHRlZE1lc3NhZ2UgPSBzcGFuOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuT2JqZWN0OgotICAg ICAgICAgICAgICAgIHRoaXMuZm9ybWF0dGVkTWVzc2FnZSA9IHRoaXMuX2Zvcm1hdChbV2ViSW5z cGVjdG9yLk9iamVjdFByb3h5LndyYXBQcmltaXRpdmVWYWx1ZSgiJU8iKSwgYXJnc1swXV0pOwor ICAgICAgICAgICAgICAgIHRoaXMuZm9ybWF0dGVkTWVzc2FnZSA9IHRoaXMuX2Zvcm1hdChbIiVP IiwgYXJnc1swXV0pOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVs dDoKICAgICAgICAgICAgICAgICB0aGlzLmZvcm1hdHRlZE1lc3NhZ2UgPSB0aGlzLl9mb3JtYXQo YXJncyk7CkBAIC02MzEsNiArNjMxLDEzIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghcGFyYW1ldGVycy5sZW5ndGgpCiAgICAgICAgICAg ICByZXR1cm4gZm9ybWF0dGVkUmVzdWx0OwogCisgICAgICAgIC8vIEZvcm1hdHRpbmcgY29kZSBi ZWxvdyBhc3N1bWVzIHRoYXQgcGFyYW1ldGVycyBhcmUgYWxsIHdyYXBwZXJzIHdoZXJlYXMgZnJv bnRlbmQgY29uc29sZQorICAgICAgICAvLyBBUEkgYWxsb3dzIHBhc3NpbmcgYXJiaXRyYXJ5IHZh bHVlcyBhcyBtZXNzYWdlcyAoc3RyaW5ncywgbnVtYmVydHMsIGV0Yy4pLiBXcmFwIHRoZW0gaGVy ZS4KKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwYXJhbWV0ZXJzLmxlbmd0aDsgKytpKSB7 CisgICAgICAgICAgICBpZiAodHlwZW9mIHBhcmFtZXRlcnNbaV0gIT09ICJvYmplY3QiICYmIHR5 cGVvZiBwYXJhbWV0ZXJzW2ldICE9PSAiZnVuY3Rpb24iKQorICAgICAgICAgICAgICAgIHBhcmFt ZXRlcnNbaV0gPSBXZWJJbnNwZWN0b3IuT2JqZWN0UHJveHkud3JhcFByaW1pdGl2ZVZhbHVlKHBh cmFtZXRlcnNbaV0pOworICAgICAgICB9CisKICAgICAgICAgZnVuY3Rpb24gZm9ybWF0Rm9yQ29u c29sZShvYmopCiAgICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuY29u c29sZS5fZm9ybWF0KG9iaik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5qZWN0ZWRTY3JpcHQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0 ZWRTY3JpcHQuanMKaW5kZXggNzI2YzdjYy4uMDYwM2IzMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwpAQCAtNTM2LDExICs1MzYsMTEgQEAgSW5q ZWN0ZWRTY3JpcHQuX2V2YWx1YXRlQW5kV3JhcCA9IGZ1bmN0aW9uKGV2YWxGdW5jdGlvbiwgb2Jq ZWN0LCBleHByZXNzaW9uKQogICAgICAgICByZXN1bHQudmFsdWUgPSBJbnNwZWN0b3JDb250cm9s bGVyLndyYXBPYmplY3QoSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlT24oZXZhbEZ1bmN0aW9uLCBv YmplY3QsIGV4cHJlc3Npb24pKTsKICAgICAgICAgLy8gSGFuZGxlIGVycm9yIHRoYXQgbWlnaHQg aGF2ZSBoYXBwZW5lZCB3aGlsZSBkZXNjcmliaW5nIHJlc3VsdC4KICAgICAgICAgaWYgKHJlc3Vs dC52YWx1ZS5lcnJvclRleHQpIHsKLSAgICAgICAgICAgIHJlc3VsdC52YWx1ZSA9IEluc3BlY3Rv ckNvbnRyb2xsZXIud3JhcE9iamVjdChyZXN1bHQudmFsdWUuZXJyb3JUZXh0KTsKKyAgICAgICAg ICAgIHJlc3VsdC52YWx1ZSA9IHJlc3VsdC52YWx1ZS5lcnJvclRleHQ7CiAgICAgICAgICAgICBy ZXN1bHQuaXNFeGNlcHRpb24gPSB0cnVlOwogICAgICAgICB9CiAgICAgfSBjYXRjaCAoZSkgewot ICAgICAgICByZXN1bHQudmFsdWUgPSBJbnNwZWN0b3JDb250cm9sbGVyLndyYXBPYmplY3QoZS50 b1N0cmluZygpKTsKKyAgICAgICAgcmVzdWx0LnZhbHVlID0gZS50b1N0cmluZygpOwogICAgICAg ICByZXN1bHQuaXNFeGNlcHRpb24gPSB0cnVlOwogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwpA QCAtMTEwMCwxMCArMTEwMCw2IEBAIE9iamVjdC5kZXNjcmliZSA9IGZ1bmN0aW9uKG9iaiwgYWJi cmV2aWF0ZWQpCiAgICAgICAgIHJldHVybiBvYmplY3RUZXh0OwogICAgIGNhc2UgInJlZ2V4cCI6 CiAgICAgICAgIHJldHVybiBTdHJpbmcob2JqKS5yZXBsYWNlKC8oW1xcXC9dKS9nLCAiXFwkMSIp LnJlcGxhY2UoL1xcKFwvW2dpbV0qKSQvLCAiJDEiKS5zdWJzdHJpbmcoMSk7Ci0gICAgY2FzZSAi Ym9vbGVhbiI6Ci0gICAgY2FzZSAibnVtYmVyIjoKLSAgICBjYXNlICJudWxsIjoKLSAgICAgICAg cmV0dXJuIG9iajsKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gU3RyaW5nKG9iaik7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVz c2lvbnNTaWRlYmFyUGFuZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4 cHJlc3Npb25zU2lkZWJhclBhbmUuanMKaW5kZXggYjU2ODkzOS4uNWUxYmY1YyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFu ZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1Np ZGViYXJQYW5lLmpzCkBAIC04NCw5ICs4NCwxMyBAQCBXZWJJbnNwZWN0b3IuV2F0Y2hFeHByZXNz aW9uc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgZnVuY3Rpb24gYXBwZW5k UmVzdWx0KGV4cHJlc3Npb24sIHdhdGNoSW5kZXgsIHJlc3VsdCwgZXhjZXB0aW9uKQogICAgICAg ICB7Ci0gICAgICAgICAgICAvLyBUaGUgbnVsbCBjaGVjayBjYXRjaGVzIHNvbWUgb3RoZXIgY2Fz ZXMsIGxpa2UgbnVsbCBpdHNlbGYsIGFuZCBOYU4KLSAgICAgICAgICAgIGlmICgodHlwZW9mIHJl c3VsdCAhPT0gIm9iamVjdCIpIHx8IChyZXN1bHQgPT0gbnVsbCkpCi0gICAgICAgICAgICAgICAg cmVzdWx0ID0gbmV3IFdlYkluc3BlY3Rvci5PYmplY3RQcm94eShudWxsLCBbXSwgMCwgU3RyaW5n KHJlc3VsdCksIGZhbHNlKTsKKyAgICAgICAgICAgIGlmIChleGNlcHRpb24pIHsKKyAgICAgICAg ICAgICAgICAvLyBFeGNlcHRpb24gcmVzdWx0cyBhcmUgbm90IHdyYXBwZXJzLCBidXQgdGV4dCBt ZXNzYWdlcy4KKyAgICAgICAgICAgICAgICByZXN1bHQgPSBXZWJJbnNwZWN0b3IuT2JqZWN0UHJv eHkud3JhcFByaW1pdGl2ZVZhbHVlKHJlc3VsdCk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKHJl c3VsdC50eXBlID09PSAic3RyaW5nIikgeworICAgICAgICAgICAgICAgIC8vIEV2YWx1YXRpb24g cmVzdWx0IGlzIGludGVudGlvbmFsbHkgbm90IGFiYnJldmlhdGVkLiBIb3dldmVyLCB3ZSdkIGxp a2UgdG8gZGlzdGluZ3Vpc2ggYmV0d2VlbiBudWxsIGFuZCAibnVsbCIKKyAgICAgICAgICAgICAg ICByZXN1bHQuZGVzY3JpcHRpb24gPSAiXCIiICsgcmVzdWx0LmRlc2NyaXB0aW9uICsgIlwiIjsK KyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgdmFyIHByb3BlcnR5ID0gbmV3IFdlYkluc3Bl Y3Rvci5PYmplY3RQcm9wZXJ0eVByb3h5KGV4cHJlc3Npb24sIHJlc3VsdCk7CiAgICAgICAgICAg ICBwcm9wZXJ0eS53YXRjaEluZGV4ID0gd2F0Y2hJbmRleDsKQEAgLTk1LDcgKzk5LDcgQEAgV2Vi SW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIC8vIHNpbmNlIG90aGVyd2lzZSB5b3UgZ2V0IERPTVdpbmRvdwogICAgICAgICAgICAgaWYg KHByb3BlcnR5Lm5hbWUgPT09IFdlYkluc3BlY3Rvci5XYXRjaEV4cHJlc3Npb25zU2VjdGlvbi5O ZXdXYXRjaEV4cHJlc3Npb24pIAogICAgICAgICAgICAgICAgIHByb3BlcnR5LnZhbHVlLmRlc2Ny aXB0aW9uID0gIiI7Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgLy8gVG8gY2xhcmlmeSB3 aGF0J3MgZ29pbmcgb24gaGVyZTogCiAgICAgICAgICAgICAvLyBJbiB0aGUgb3V0ZXIgZnVuY3Rp b24sIHdlIGNhbGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHByb3BlcnRpZXMKICAgICAgICAgICAgIC8v IHRoYXQgd2UncmUgZ29pbmcgdG8gYmUgdXBkYXRpbmcsIGFuZCBzZXQgdGhhdCBpbiB0aGUK