60263 2011-05-05 05:08:33 -0700 Web Inspector: fix source mapping for formatted scripts. 2011-05-13 10:27:41 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 398665 0 podivilov 2011-05-05 05:08:33 -0700 Web Inspector: fix source mapping for formatted scripts. Source mapping is broken for script chunks that are already formatted at the beginning and at the end of the script. 398666 1 92404 podivilov 2011-05-05 05:09:29 -0700 Created attachment 92404 Patch. 403472 2 92404 yurys 2011-05-13 04:40:58 -0700 Comment on attachment 92404 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=92404&action=review > LayoutTests/inspector/debugger/script-formatter.html:69 > + testMapping("function"); Can we just dump formatted source to see the correct result? 403638 3 podivilov 2011-05-13 10:24:46 -0700 (In reply to comment #2) > (From update of attachment 92404 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=92404&action=review > > > LayoutTests/inspector/debugger/script-formatter.html:69 > > + testMapping("function"); > > Can we just dump formatted source to see the correct result? This is a test for source mapping. How would dumping formatted source help us to test the mapping? 403644 4 podivilov 2011-05-13 10:27:41 -0700 Committed r86443: <http://trac.webkit.org/changeset/86443> 92404 2011-05-05 05:09:29 -0700 2011-05-13 04:40:58 -0700 Patch. patch text/plain 13810 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2OWI5OWMwLi43YWMxNWQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDUt MDUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZml4 IHNvdXJjZSBtYXBwaW5nIGZvciBmb3JtYXR0ZWQgc2NyaXB0cy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMjYzCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZGVidWdnZXIvcmVzb3VyY2VzL29iZnVzY2F0ZWQuanM6CisgICAgICAgIChmb3JtYXR0ZWQx KToKKyAgICAgICAgKGZvcm1hdHRlZDIpOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9z Y3JpcHQtZm9ybWF0dGVyLmh0bWw6CisKIDIwMTEtMDUtMDUgIFBoaWxpcHBlIE5vcm1hbmQgIDxw bm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIEdUSyBiYXNlbGluZXMg Zm9yIG5ldyB0ZXN0cy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9yZXNvdXJjZXMvb2JmdXNjYXRlZC5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9yZXNvdXJjZXMvb2JmdXNjYXRlZC5qcwppbmRleCA0Yzk3Yzg1Li4wYTkzMzM0IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcmVzb3VyY2VzL29iZnVzY2F0ZWQu anMKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Jlc291cmNlcy9vYmZ1c2Nh dGVkLmpzCkBAIC0xLDQgKzEsMTQgQEAKK2Z1bmN0aW9uIGZvcm1hdHRlZDEoKQoreworICAgIHZh ciB2YXJpYWJsZTEgPSAwOworfQorCiB0cnl7b25tZXNzYWdlPWZ1bmN0aW9uKGV2ZW50KXt2YXIg c291cmNlPWV2ZW50LmRhdGE7dmFyIGZvcm1hdHRlZFNvdXJjZT1iZWF1dGlmeShzb3VyY2UpO3Zh ciBtYXBwaW5nPWJ1aWxkTWFwcGluZyhzb3VyY2UsZm9ybWF0dGVkU291cmNlKTtwb3N0TWVzc2Fn ZSh7Zm9ybWF0dGVkU291cmNlOmZvcm1hdHRlZFNvdXJjZSxtYXBwaW5nOm1hcHBpbmd9KX07ZnVu Y3Rpb24gYmVhdXRpZnkoc291cmNlKXt2YXIgYXN0PXBhcnNlLnBhcnNlKHNvdXJjZSk7dmFyIGJl YXV0aWZ5T3B0aW9ucz0KIHtpbmRlbnRfbGV2ZWw6NCxpbmRlbnRfc3RhcnQ6MCxxdW90ZV9rZXlz OmZhbHNlLHNwYWNlX2NvbG9uOmZhbHNlfTtyZXR1cm4gcHJvY2Vzcy5nZW5fY29kZShhc3QsYmVh dXRpZnlPcHRpb25zKX1mdW5jdGlvbiBidWlsZE1hcHBpbmcoc291cmNlLGZvcm1hdHRlZFNvdXJj ZSl7dmFyIG1hcHBpbmc9e29yaWdpbmFsOltdLGZvcm1hdHRlZDpbXX07dmFyIGxhc3RQb3NpdGlv bj0wO3ZhciByZWdleHA9LyhefFteXFxdKVxiKCg/PVxEKVtcJFwuXHddKylcYi9nO3doaWxlKHRy dWUpCiB7dmFyIG1hdGNoPXJlZ2V4cC5leGVjKGZvcm1hdHRlZFNvdXJjZSk7aWYoIW1hdGNoKWJy ZWFrO3ZhciBwb3NpdGlvbj1zb3VyY2UuaW5kZXhPZihtYXRjaFsyXSxsYXN0UG9zaXRpb24pO2lm KHBvc2l0aW9uPT09LTEpdGhyb3ciTm8gbWF0Y2ggZm91bmQgaW4gb3JpZ2luYWwgc291cmNlIGZv ciAiK21hdGNoWzJdO21hcHBpbmcub3JpZ2luYWwucHVzaChwb3NpdGlvbik7bWFwcGluZy5mb3Jt YXR0ZWQucHVzaChtYXRjaC5pbmRleCttYXRjaFsxXS5sZW5ndGgpOwogbGFzdFBvc2l0aW9uPXBv c2l0aW9uK21hdGNoWzJdLmxlbmd0aH1yZXR1cm4gbWFwcGluZ31mdW5jdGlvbiByZXF1aXJlKCl7 cmV0dXJuIHBhcnNlfXZhciBleHBvcnRzPXt9O2ltcG9ydFNjcmlwdHMoIlVnbGlmeUpTL3BhcnNl LWpzLmpzIik7dmFyIHBhcnNlPWV4cG9ydHM7dmFyIGV4cG9ydHM9e307aW1wb3J0U2NyaXB0cygi VWdsaWZ5SlMvcHJvY2Vzcy5qcyIpO3ZhciBwcm9jZXNzPWV4cG9ydHM7fWNhdGNoKGUpe30KKwor ZnVuY3Rpb24gZm9ybWF0dGVkMigpCit7CisgICAgdmFyIHZhcmlhYmxlMiA9IDA7Cit9CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci5o dG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXIuaHRt bAppbmRleCAwNWZiNDlmLi44ZGZmNTEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLmh0bWwKQEAgLTQ0LDQxICs0NCw0MiBAQCB2 YXIgdGVzdCA9IGZ1bmN0aW9uKCkKIAogICAgICAgICBmdW5jdGlvbiB0ZXN0U291cmNlTWFwcGlu ZyhuZXh0KQogICAgICAgICB7Ci0gICAgICAgICAgICB3b3JrZXIub25tZXNzYWdlID0gSW5zcGVj dG9yVGVzdC5zYWZlV3JhcChmdW5jdGlvbihldmVudCkKKyAgICAgICAgICAgIHZhciBmb3JtYXR0 ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRlcigpOworCisgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LnNob3dTY3JpcHRTb3VyY2UoIm9iZnVzY2F0ZWQuanMiLCBkaWRTaG93U2Ny aXB0U291cmNlKTsKKyAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRTb3VyY2Uoc291 cmNlRnJhbWUpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgZm9ybWF0dGVyLmZvcm1h dENvbnRlbnQoInRleHQvamF2YXNjcmlwdCIsIHNvdXJjZUZyYW1lLl9jb250ZW50LCBkaWRGb3Jt YXRDb250ZW50KTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gZGlkRm9y bWF0Q29udGVudChjb250ZW50LCBtYXBwaW5nKQogICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgIHZhciBzb3VyY2UgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudmlzaWJsZVZpZXcu X2NvbnRlbnQ7Ci0gICAgICAgICAgICAgICAgdmFyIGZvcm1hdHRlZFNvdXJjZSA9IGV2ZW50LmRh dGEuY29udGVudDsKLSAgICAgICAgICAgICAgICB2YXIgbWFwcGluZyA9IGV2ZW50LmRhdGEubWFw cGluZzsKKyAgICAgICAgICAgICAgICB2YXIgZm9ybWF0dGVkU291cmNlID0gY29udGVudDsKIAog ICAgICAgICAgICAgICAgIGZ1bmN0aW9uIHRlc3RNYXBwaW5nKHN0cmluZykKICAgICAgICAgICAg ICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBwb3NpdGlvbiA9IHNvdXJjZS5pbmRleE9m KHN0cmluZyk7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBpbmRleCA9IG1hcHBpbmcub3JpZ2lu YWwudXBwZXJCb3VuZChwb3NpdGlvbikgLSAxOwotICAgICAgICAgICAgICAgICAgICB2YXIgZGVs dGEgPSBwb3NpdGlvbiAtIG1hcHBpbmcub3JpZ2luYWxbaW5kZXhdOwotICAgICAgICAgICAgICAg ICAgICB2YXIgZm9ybWF0dGVkUG9zaXRpb24gPSBNYXRoLm1pbihtYXBwaW5nLmZvcm1hdHRlZFtp bmRleF0gKyBkZWx0YSwgbWFwcGluZy5mb3JtYXR0ZWRbaW5kZXggKyAxXSk7Ci0gICAgICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKHN0cmluZywgZm9ybWF0dGVkU291 cmNlLnN1YnN0cihmb3JtYXR0ZWRQb3NpdGlvbiwgc3RyaW5nLmxlbmd0aCkpOworICAgICAgICAg ICAgICAgICAgICB2YXIgb3JpZ2luYWxMb2NhdGlvbiA9IFdlYkluc3BlY3Rvci5TY3JpcHRGb3Jt YXR0ZXIucG9zaXRpb25Ub0xvY2F0aW9uKHNvdXJjZS5saW5lRW5kaW5ncygpLCBzb3VyY2UuaW5k ZXhPZihzdHJpbmcpKTsKKyAgICAgICAgICAgICAgICAgICAgdmFyIGZvcm1hdHRlZExvY2F0aW9u ID0gbWFwcGluZy5vcmlnaW5hbFRvRm9ybWF0dGVkKG9yaWdpbmFsTG9jYXRpb24pOworICAgICAg ICAgICAgICAgICAgICB2YXIgZm9ybWF0dGVkUG9zaXRpb24gPSBXZWJJbnNwZWN0b3IuU2NyaXB0 Rm9ybWF0dGVyLmxvY2F0aW9uVG9Qb3NpdGlvbihmb3JtYXR0ZWRTb3VyY2UubGluZUVuZGluZ3Mo KSwgZm9ybWF0dGVkTG9jYXRpb24pOworICAgICAgICAgICAgICAgICAgICB2YXIgZXhwZWN0ZWRG b3JtYXR0ZWRQb3NpdGlvbiA9IGZvcm1hdHRlZFNvdXJjZS5pbmRleE9mKHN0cmluZyk7CisgICAg ICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKGV4cGVjdGVkRm9ybWF0 dGVkUG9zaXRpb24sIGZvcm1hdHRlZFBvc2l0aW9uKTsKICAgICAgICAgICAgICAgICB9CiAKKyAg ICAgICAgICAgICAgICB0ZXN0TWFwcGluZygiZnVuY3Rpb24iKTsKKyAgICAgICAgICAgICAgICB0 ZXN0TWFwcGluZygiZm9ybWF0dGVkMSIpOworICAgICAgICAgICAgICAgIHRlc3RNYXBwaW5nKCJ2 YXJpYWJsZTEiKTsKKwogICAgICAgICAgICAgICAgIHRlc3RNYXBwaW5nKCJvbm1lc3NhZ2UiKTsK ICAgICAgICAgICAgICAgICB0ZXN0TWFwcGluZygiaW5kZW50X3N0YXJ0Iik7CiAgICAgICAgICAg ICAgICAgdGVzdE1hcHBpbmcoImZ1bmN0aW9uIHJlcXVpcmUiKTsKICAgICAgICAgICAgICAgICB0 ZXN0TWFwcGluZygidmFyIHJlZ2V4cCIpOwogICAgICAgICAgICAgICAgIHRlc3RNYXBwaW5nKCJp bXBvcnRTY3JpcHRzIik7CiAKLSAgICAgICAgICAgICAgICBuZXh0KCk7Ci0gICAgICAgICAgICB9 KTsKKyAgICAgICAgICAgICAgICB0ZXN0TWFwcGluZygiZm9ybWF0dGVkMiIpOworICAgICAgICAg ICAgICAgIHRlc3RNYXBwaW5nKCJ2YXJpYWJsZTIiKTsKIAotICAgICAgICAgICAgd29ya2VyLm9u ZXJyb3IgPSBmdW5jdGlvbihldmVudCkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiRXJyb3IgaW4gd29ya2VyOiAiICsgZXZlbnQuZGF0YSk7 CiAgICAgICAgICAgICAgICAgbmV4dCgpOwotICAgICAgICAgICAgfTsKLQotICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlKCJvYmZ1c2NhdGVkLmpzIiwgZGlkU2hvd1Nj cmlwdFNvdXJjZSk7Ci0KLSAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRTb3VyY2Uo c291cmNlRnJhbWUpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgd29ya2VyLnBvc3RN ZXNzYWdlKHsgbWltZVR5cGU6ICJ0ZXh0L2phdmFzY3JpcHQiLCBjb250ZW50OiBzb3VyY2VGcmFt ZS5fY29udGVudCB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSwKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDdjYTg4ZDYuLjE0ZTI0MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMS0wNS0w NSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBmaXgg c291cmNlIG1hcHBpbmcgZm9yIGZvcm1hdHRlZCBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjAyNjMKKworICAgICAgICBTb3VyY2UgbWFw cGluZyBpcyBicm9rZW4gZm9yIHNjcmlwdCBjaHVua3MgdGhhdCBhcmUgYWxyZWFkeSBmb3JtYXR0 ZWQgYXQgdGhlIGJlZ2lubmluZworICAgICAgICBhbmQgYXQgdGhlIGVuZCBvZiB0aGUgc2NyaXB0 IChzZWUgc2NyaXB0LWZvcm1hdHRlci5odG1sKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0Rm9ybWF0dGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdEZv cm1hdHRlci5wcm90b3R5cGUuX2RpZEZvcm1hdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkZvcm1hdHRlZFNvdXJjZU1hcHBpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvcm1h dHRlZFNvdXJjZU1hcHBpbmcucHJvdG90eXBlLm9yaWdpbmFsVG9Gb3JtYXR0ZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFNvdXJjZU1hcHBpbmcucHJvdG90eXBlLmZvcm1hdHRl ZFRvT3JpZ2luYWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFNvdXJjZU1hcHBp bmcucHJvdG90eXBlLl9jb252ZXJ0UG9zaXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0Rm9ybWF0dGVyV29ya2VyLmpzOgorICAgICAgICAob25tZXNzYWdlKToKKyAg ICAgICAgKEhUTUxTY3JpcHRGb3JtYXR0ZXIucHJvdG90eXBlLmZvcm1hdCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkZvcm1hdHRlZFNvdXJjZUZpbGUucHJvdG90eXBlLl9kaWRSZXF1ZXN0Q29udGVudCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlTWFwcGluZ0ZvckZvcm1hdHRlZFNvdXJjZUZpbGUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmdGb3JGb3JtYXR0ZWRTb3VyY2VGaWxl LnByb3RvdHlwZS5zY3JpcHRMb2NhdGlvblRvU291cmNlTGluZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlTWFwcGluZ0ZvckZvcm1hdHRlZFNvdXJjZUZpbGUucHJvdG90eXBlLnNvdXJj ZUxpbmVUb1NjcmlwdExvY2F0aW9uKToKKwogMjAxMS0wNS0wNCAgWXVyeSBTZW1pa2hhdHNreSAg PHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFu LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRG b3JtYXR0ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdEZv cm1hdHRlci5qcwppbmRleCAwNmIxMDU2Li4zYzE0NGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdEZvcm1hdHRlci5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdEZvcm1hdHRlci5qcwpAQCAtNDEsMTEg KzQxLDYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRlci5sb2NhdGlvblRvUG9zaXRpb24g PSBmdW5jdGlvbihsaW5lRW5kaW5ncywgbG9jYXRpb24KICAgICByZXR1cm4gcG9zaXRpb24gKyBs b2NhdGlvbi5jb2x1bW5OdW1iZXI7CiB9CiAKLVdlYkluc3BlY3Rvci5TY3JpcHRGb3JtYXR0ZXIu bGluZVRvUG9zaXRpb24gPSBmdW5jdGlvbihsaW5lRW5kaW5ncywgbGluZU51bWJlcikKLXsKLSAg ICByZXR1cm4gdGhpcy5sb2NhdGlvblRvUG9zaXRpb24obGluZUVuZGluZ3MsIHsgbGluZU51bWJl cjogbGluZU51bWJlciwgY29sdW1uTnVtYmVyOiAwIH0pOwotfQotCiBXZWJJbnNwZWN0b3IuU2Ny aXB0Rm9ybWF0dGVyLnBvc2l0aW9uVG9Mb2NhdGlvbiA9IGZ1bmN0aW9uKGxpbmVFbmRpbmdzLCBw b3NpdGlvbikKIHsKICAgICB2YXIgbG9jYXRpb24gPSB7fTsKQEAgLTY5LDcgKzY0LDQxIEBAIFdl Ykluc3BlY3Rvci5TY3JpcHRGb3JtYXR0ZXIucHJvdG90eXBlID0gewogICAgIF9kaWRGb3JtYXRD b250ZW50OiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZhciB0YXNrID0gdGhpcy5f dGFza3Muc2hpZnQoKTsKLSAgICAgICAgZXZlbnQuZGF0YS5tYXBwaW5nLm9yaWdpbmFsTGluZUVu ZGluZ3MgPSB0YXNrLmRhdGEuY29udGVudC5saW5lRW5kaW5ncygpOwotICAgICAgICB0YXNrLmNh bGxiYWNrKGV2ZW50LmRhdGEuY29udGVudCwgZXZlbnQuZGF0YS5tYXBwaW5nKTsKKyAgICAgICAg dmFyIG9yaWdpbmFsQ29udGVudCA9IHRhc2suZGF0YS5jb250ZW50OworICAgICAgICB2YXIgZm9y bWF0dGVkQ29udGVudCA9IGV2ZW50LmRhdGEuY29udGVudDsKKyAgICAgICAgdmFyIHNvdXJjZU1h cHBpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFNvdXJjZU1hcHBpbmcob3JpZ2luYWxD b250ZW50LmxpbmVFbmRpbmdzKCksIGZvcm1hdHRlZENvbnRlbnQubGluZUVuZGluZ3MoKSwgZXZl bnQuZGF0YS5tYXBwaW5nKTsKKyAgICAgICAgdGFzay5jYWxsYmFjayhmb3JtYXR0ZWRDb250ZW50 LCBzb3VyY2VNYXBwaW5nKTsKKyAgICB9Cit9CisKK1dlYkluc3BlY3Rvci5Gb3JtYXR0ZWRTb3Vy Y2VNYXBwaW5nID0gZnVuY3Rpb24ob3JpZ2luYWxMaW5lRW5kaW5ncywgZm9ybWF0dGVkTGluZUVu ZGluZ3MsIG1hcHBpbmcpCit7CisgICAgdGhpcy5fb3JpZ2luYWxMaW5lRW5kaW5ncyA9IG9yaWdp bmFsTGluZUVuZGluZ3M7CisgICAgdGhpcy5fZm9ybWF0dGVkTGluZUVuZGluZ3MgPSBmb3JtYXR0 ZWRMaW5lRW5kaW5nczsKKyAgICB0aGlzLl9tYXBwaW5nID0gbWFwcGluZzsKK30KKworV2ViSW5z cGVjdG9yLkZvcm1hdHRlZFNvdXJjZU1hcHBpbmcucHJvdG90eXBlID0geworICAgIG9yaWdpbmFs VG9Gb3JtYXR0ZWQ6IGZ1bmN0aW9uKGxvY2F0aW9uKQorICAgIHsKKyAgICAgICAgdmFyIG9yaWdp bmFsUG9zaXRpb24gPSBXZWJJbnNwZWN0b3IuU2NyaXB0Rm9ybWF0dGVyLmxvY2F0aW9uVG9Qb3Np dGlvbih0aGlzLl9vcmlnaW5hbExpbmVFbmRpbmdzLCBsb2NhdGlvbik7CisgICAgICAgIHZhciBm b3JtYXR0ZWRQb3NpdGlvbiA9IHRoaXMuX2NvbnZlcnRQb3NpdGlvbih0aGlzLl9tYXBwaW5nLm9y aWdpbmFsLCB0aGlzLl9tYXBwaW5nLmZvcm1hdHRlZCwgb3JpZ2luYWxQb3NpdGlvbik7CisgICAg ICAgIHJldHVybiBXZWJJbnNwZWN0b3IuU2NyaXB0Rm9ybWF0dGVyLnBvc2l0aW9uVG9Mb2NhdGlv bih0aGlzLl9mb3JtYXR0ZWRMaW5lRW5kaW5ncywgZm9ybWF0dGVkUG9zaXRpb24pOworICAgIH0s CisKKyAgICBmb3JtYXR0ZWRUb09yaWdpbmFsOiBmdW5jdGlvbihsb2NhdGlvbikKKyAgICB7Cisg ICAgICAgIHZhciBmb3JtYXR0ZWRQb3NpdGlvbiA9IFdlYkluc3BlY3Rvci5TY3JpcHRGb3JtYXR0 ZXIubG9jYXRpb25Ub1Bvc2l0aW9uKHRoaXMuX2Zvcm1hdHRlZExpbmVFbmRpbmdzLCBsb2NhdGlv bik7CisgICAgICAgIHZhciBvcmlnaW5hbFBvc2l0aW9uID0gdGhpcy5fY29udmVydFBvc2l0aW9u KHRoaXMuX21hcHBpbmcuZm9ybWF0dGVkLCB0aGlzLl9tYXBwaW5nLm9yaWdpbmFsLCBmb3JtYXR0 ZWRQb3NpdGlvbik7CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuU2NyaXB0Rm9ybWF0dGVy LnBvc2l0aW9uVG9Mb2NhdGlvbih0aGlzLl9vcmlnaW5hbExpbmVFbmRpbmdzLCBvcmlnaW5hbFBv c2l0aW9uKTsKKyAgICB9LAorCisgICAgX2NvbnZlcnRQb3NpdGlvbjogZnVuY3Rpb24ocG9zaXRp b25zMSwgcG9zaXRpb25zMiwgcG9zaXRpb24pCisgICAgeworICAgICAgICB2YXIgaW5kZXggPSBw b3NpdGlvbnMxLnVwcGVyQm91bmQocG9zaXRpb24pIC0gMTsKKyAgICAgICAgdmFyIGNvbnZlcnRl ZFBvc2l0aW9uID0gcG9zaXRpb25zMltpbmRleF0gKyBwb3NpdGlvbiAtIHBvc2l0aW9uczFbaW5k ZXhdOworICAgICAgICBpZiAoaW5kZXggPCBwb3NpdGlvbnMyLmxlbmd0aCAtIDEgJiYgY29udmVy dGVkUG9zaXRpb24gPiBwb3NpdGlvbnMyW2luZGV4ICsgMV0pCisgICAgICAgICAgICBjb252ZXJ0 ZWRQb3NpdGlvbiA9IHBvc2l0aW9uczJbaW5kZXggKyAxXTsKKyAgICAgICAgcmV0dXJuIGNvbnZl cnRlZFBvc2l0aW9uOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0Rm9ybWF0dGVyV29ya2VyLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXJXb3JrZXIuanMKaW5kZXggYTNkN2E5 MC4uNTBkY2QxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRGb3JtYXR0ZXJXb3JrZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXJXb3JrZXIuanMKQEAgLTM0LDcgKzM0LDcgQEAgb25t ZXNzYWdlID0gZnVuY3Rpb24oZXZlbnQpIHsKICAgICAgICAgdmFyIGZvcm1hdHRlciA9IG5ldyBI VE1MU2NyaXB0Rm9ybWF0dGVyKCk7CiAgICAgICAgIHJlc3VsdCA9IGZvcm1hdHRlci5mb3JtYXQo ZXZlbnQuZGF0YS5jb250ZW50KTsKICAgICB9IGVsc2UgewotICAgICAgICByZXN1bHQubWFwcGlu ZyA9IHsgb3JpZ2luYWw6IFtdLCBmb3JtYXR0ZWQ6IFtdIH07CisgICAgICAgIHJlc3VsdC5tYXBw aW5nID0geyBvcmlnaW5hbDogWzBdLCBmb3JtYXR0ZWQ6IFswXSB9OwogICAgICAgICByZXN1bHQu Y29udGVudCA9IGZvcm1hdFNjcmlwdChldmVudC5kYXRhLmNvbnRlbnQsIHJlc3VsdC5tYXBwaW5n LCAwLCAwKTsKICAgICB9CiAgICAgcG9zdE1lc3NhZ2UocmVzdWx0KTsKQEAgLTcwLDcgKzcwLDcg QEAgSFRNTFNjcmlwdEZvcm1hdHRlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMubGluZSA9 IGNvbnRlbnQ7CiAgICAgICAgIHRoaXMuX2NvbnRlbnQgPSBjb250ZW50OwogICAgICAgICB0aGlz Ll9mb3JtYXR0ZWRDb250ZW50ID0gIiI7Ci0gICAgICAgIHRoaXMuX21hcHBpbmcgPSB7IG9yaWdp bmFsOiBbXSwgZm9ybWF0dGVkOiBbXSB9OworICAgICAgICB0aGlzLl9tYXBwaW5nID0geyBvcmln aW5hbDogWzBdLCBmb3JtYXR0ZWQ6IFswXSB9OwogICAgICAgICB0aGlzLl9wb3NpdGlvbiA9IDA7 CiAKICAgICAgICAgdmFyIGN1cnNvciA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKaW5kZXggMWFjN2U4MS4uYjkzNjk0NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qcwpAQCAt MjU0LDcgKzI1NCw3IEBAIFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRTb3VyY2VGaWxlLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIGZ1bmN0aW9uIGRpZEZvcm1hdENvbnRlbnQoZm9ybWF0dGVk VGV4dCwgbWFwcGluZykKICAgICAgICAgewotICAgICAgICAgICAgdGhpcy5fbWFwcGluZyA9IG5l dyBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkU291cmNlTWFwcGluZyh0aGlzLl9zY3JpcHRzLCBtYXBw aW5nLm9yaWdpbmFsTGluZUVuZGluZ3MsIGZvcm1hdHRlZFRleHQubGluZUVuZGluZ3MoKSwgbWFw cGluZyk7CisgICAgICAgICAgICB0aGlzLl9tYXBwaW5nID0gbmV3IFdlYkluc3BlY3Rvci5Tb3Vy Y2VNYXBwaW5nRm9yRm9ybWF0dGVkU291cmNlRmlsZSh0aGlzLl9zY3JpcHRzLCBtYXBwaW5nKTsK ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VGaWxlLnByb3RvdHlwZS5fZGlkUmVxdWVz dENvbnRlbnQuY2FsbCh0aGlzLCBtaW1lVHlwZSwgZm9ybWF0dGVkVGV4dCk7CiAgICAgICAgIH0K ICAgICAgICAgdGhpcy5fZm9ybWF0dGVyLmZvcm1hdENvbnRlbnQobWltZVR5cGUsIHRleHQsIGRp ZEZvcm1hdENvbnRlbnQuYmluZCh0aGlzKSk7CkBAIC0yOTMsMzYgKzI5MywyMyBAQCBXZWJJbnNw ZWN0b3IuU291cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCi1XZWJJbnNwZWN0 b3IuRm9ybWF0dGVkU291cmNlTWFwcGluZyA9IGZ1bmN0aW9uKHNjcmlwdHMsIG9yaWdpbmFsTGlu ZUVuZGluZ3MsIGZvcm1hdHRlZExpbmVFbmRpbmdzLCBtYXBwaW5nKQorV2ViSW5zcGVjdG9yLlNv dXJjZU1hcHBpbmdGb3JGb3JtYXR0ZWRTb3VyY2VGaWxlID0gZnVuY3Rpb24oc2NyaXB0cywgbWFw cGluZykKIHsKICAgICBXZWJJbnNwZWN0b3IuU291cmNlTWFwcGluZy5jYWxsKHRoaXMsIHNjcmlw dHMpOwotICAgIHRoaXMuX29yaWdpbmFsTGluZUVuZGluZ3MgPSBvcmlnaW5hbExpbmVFbmRpbmdz OwotICAgIHRoaXMuX2Zvcm1hdHRlZExpbmVFbmRpbmdzID0gZm9ybWF0dGVkTGluZUVuZGluZ3M7 CiAgICAgdGhpcy5fbWFwcGluZyA9IG1hcHBpbmc7CiB9CiAKLVdlYkluc3BlY3Rvci5Gb3JtYXR0 ZWRTb3VyY2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKK1dlYkluc3BlY3Rvci5Tb3VyY2VNYXBwaW5n Rm9yRm9ybWF0dGVkU291cmNlRmlsZS5wcm90b3R5cGUgPSB7CiAgICAgc2NyaXB0TG9jYXRpb25U b1NvdXJjZUxpbmU6IGZ1bmN0aW9uKGxvY2F0aW9uKQogICAgIHsKLSAgICAgICAgdmFyIG9yaWdp bmFsUG9zaXRpb24gPSBXZWJJbnNwZWN0b3IuU2NyaXB0Rm9ybWF0dGVyLmxvY2F0aW9uVG9Qb3Np dGlvbih0aGlzLl9vcmlnaW5hbExpbmVFbmRpbmdzLCBsb2NhdGlvbik7Ci0gICAgICAgIHZhciBm b3JtYXR0ZWRQb3NpdGlvbiA9IHRoaXMuX2NvbnZlcnRQb3NpdGlvbih0aGlzLl9tYXBwaW5nLm9y aWdpbmFsLCB0aGlzLl9tYXBwaW5nLmZvcm1hdHRlZCwgb3JpZ2luYWxQb3NpdGlvbik7Ci0gICAg ICAgIHJldHVybiBXZWJJbnNwZWN0b3IuU2NyaXB0Rm9ybWF0dGVyLnBvc2l0aW9uVG9Mb2NhdGlv bih0aGlzLl9mb3JtYXR0ZWRMaW5lRW5kaW5ncywgZm9ybWF0dGVkUG9zaXRpb24pLmxpbmVOdW1i ZXI7CisgICAgICAgIHJldHVybiB0aGlzLl9tYXBwaW5nLm9yaWdpbmFsVG9Gb3JtYXR0ZWQobG9j YXRpb24pLmxpbmVOdW1iZXI7CiAgICAgfSwKIAogICAgIHNvdXJjZUxpbmVUb1NjcmlwdExvY2F0 aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgdmFyIGZvcm1hdHRlZFBv c2l0aW9uID0gV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRlci5saW5lVG9Qb3NpdGlvbih0aGlz Ll9mb3JtYXR0ZWRMaW5lRW5kaW5ncywgbGluZU51bWJlcik7Ci0gICAgICAgIHZhciBvcmlnaW5h bFBvc2l0aW9uID0gdGhpcy5fY29udmVydFBvc2l0aW9uKHRoaXMuX21hcHBpbmcuZm9ybWF0dGVk LCB0aGlzLl9tYXBwaW5nLm9yaWdpbmFsLCBmb3JtYXR0ZWRQb3NpdGlvbik7Ci0gICAgICAgIHZh ciBvcmlnaW5hbExvY2F0aW9uID0gV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRlci5wb3NpdGlv blRvTG9jYXRpb24odGhpcy5fb3JpZ2luYWxMaW5lRW5kaW5ncywgb3JpZ2luYWxQb3NpdGlvbik7 CisgICAgICAgIHZhciBvcmlnaW5hbExvY2F0aW9uID0gdGhpcy5fbWFwcGluZy5mb3JtYXR0ZWRU b09yaWdpbmFsKHsgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVyOiAwIH0pOwog ICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmcucHJvdG90eXBlLl9zb3Vy Y2VMb2NhdGlvblRvU2NyaXB0TG9jYXRpb24uY2FsbCh0aGlzLCBvcmlnaW5hbExvY2F0aW9uLmxp bmVOdW1iZXIsIG9yaWdpbmFsTG9jYXRpb24uY29sdW1uTnVtYmVyKTsKLSAgICB9LAotCi0gICAg X2NvbnZlcnRQb3NpdGlvbjogZnVuY3Rpb24ocG9zaXRpb25zMSwgcG9zaXRpb25zMiwgcG9zaXRp b24pCi0gICAgewotICAgICAgICB2YXIgaW5kZXggPSBwb3NpdGlvbnMxLnVwcGVyQm91bmQocG9z aXRpb24pIC0gMTsKLSAgICAgICAgdmFyIGRlbHRhID0gcG9zaXRpb24gLSBwb3NpdGlvbnMxW2lu ZGV4XTsKLSAgICAgICAgcmV0dXJuIE1hdGgubWluKHBvc2l0aW9uczJbaW5kZXhdICsgZGVsdGEs IHBvc2l0aW9uczJbaW5kZXggKyAxXSk7CiAgICAgfQogfQogCi1XZWJJbnNwZWN0b3IuRm9ybWF0 dGVkU291cmNlTWFwcGluZy5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJj ZU1hcHBpbmcucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmdGb3JGb3JtYXR0 ZWRTb3VyY2VGaWxlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU291cmNlTWFw cGluZy5wcm90b3R5cGU7Cg==