65185 2011-07-26 07:50:20 -0700 Web Inspector: move location conversion functions to SourceFile. 2011-07-30 05:43:22 -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 442251 0 podivilov 2011-07-26 07:50:20 -0700 Web Inspector: move location conversion functions to SourceFile. This is a step towards dealing with both pretty-print and compiler mappings uniformly in RawSource class (see https://docs.google.com/document/d/14AWiLDDxEuLaWuyG0X6deLRufrvxRu8HBP0LNJwvRZw/edit?hl=en_US&pli=1, https://bugs.webkit.org/show_bug.cgi?id=63940). 442252 1 102003 podivilov 2011-07-26 07:51:35 -0700 Created attachment 102003 Patch 443456 2 102003 pfeldman 2011-07-28 06:17:43 -0700 Comment on attachment 102003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102003&action=review > Source/WebCore/inspector/front-end/SourceFile.js:55 > + rawLocationToUILocation: function(lineNumber, columnNumber) This should receive ScriptLocation (i.e. should not change). 444275 3 podivilov 2011-07-30 05:43:22 -0700 Committed r92051: <http://trac.webkit.org/changeset/92051> 102003 2011-07-26 07:51:35 -0700 2011-07-28 06:17:43 -0700 Patch bug-65185-20110726185133.patch text/plain 15563 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2NjkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhOWY2ZDNiMmY3ZTljNTA5NTUyMjBk OWUyOGZmMzVjNWQxNjlhYmJmLi4zNDg1YWNjMzZjYWJmZjQzYTczNzhlNTVlNGFiMDA2NjcwNzg3 ZjVlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDctMjYgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBs b2NhdGlvbiBjb252ZXJzaW9uIGZ1bmN0aW9ucyB0byBTb3VyY2VGaWxlLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUxODUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9z b3VyY2UtZmlsZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1 Z2dlci9zb3VyY2UtZmlsZS5odG1sOiBBZGRlZC4KKwogMjAxMS0wNy0yNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogdXNlIGRl ZGljYXRlZCB0eXBlIGZvciBvYmplY3QgaWQgaW4gdGhlIHByb3RvY29sLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS1maWxlLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtZmlsZS1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uYTQyMGQwYjRhY2I1YWYzZjVkNDAxZDNhZTkxMzY2YTVhN2YzMTU5NAotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtZmls ZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAorVGVzdHMgbWFwcGluZyBiZXR3ZWVuIHJh dyBsb2NhdGlvbnMgYW5kIHVpIGxvY2F0aW9ucy4KKworCitSdW5uaW5nOiB0ZXN0UGxhaW5Db252 ZXJ0TG9jYXRpb24KKworUnVubmluZzogdGVzdENvbmNhdGVuYXRlZENvbnZlcnRMb2NhdGlvbgor CitSdW5uaW5nOiB0ZXN0Rm9ybWF0dGVkQ29udmVydExvY2F0aW9uCisKK1J1bm5pbmc6IHRlc3RD b25jYXRlbmF0ZWRGb3JtYXR0ZWRDb252ZXJ0TG9jYXRpb24KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS1maWxlLmh0bWwgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvc291cmNlLWZpbGUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44Mjg0NDUwNTUy OTNkMzI0M2IyN2JlZDhmZmEyMjg1NTEyNTllYTg2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS1maWxlLmh0bWwKQEAgLTAsMCArMSwxMTcg QEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0 b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorCis8c2NyaXB0PgorCitmdW5jdGlvbiB0 ZXN0KCkKK3sKKyAgICB2YXIgbW9ja1NvdXJjZU1hcHBpbmcgPSB7CisgICAgICAgIG9yaWdpbmFs VG9Gb3JtYXR0ZWQ6IGZ1bmN0aW9uKGxvY2F0aW9uKQorICAgICAgICB7CisgICAgICAgICAgICB2 YXIgZm9ybWF0dGVkTG9jYXRpb24gPSB7fTsKKyAgICAgICAgICAgIGZvcm1hdHRlZExvY2F0aW9u LmxpbmVOdW1iZXIgPSBsb2NhdGlvbi5saW5lTnVtYmVyICogMjsKKyAgICAgICAgICAgIGZvcm1h dHRlZExvY2F0aW9uLmNvbHVtbk51bWJlciA9IGxvY2F0aW9uLmNvbHVtbk51bWJlciAqIDI7Cisg ICAgICAgICAgICByZXR1cm4gZm9ybWF0dGVkTG9jYXRpb247CisgICAgICAgIH0sCisKKyAgICAg ICAgZm9ybWF0dGVkVG9PcmlnaW5hbDogZnVuY3Rpb24obG9jYXRpb24pCisgICAgICAgIHsKKyAg ICAgICAgICAgIHZhciBvcmlnaW5hbExvY2F0aW9uID0ge307CisgICAgICAgICAgICBvcmlnaW5h bExvY2F0aW9uLmxpbmVOdW1iZXIgPSBNYXRoLmZsb29yKGxvY2F0aW9uLmxpbmVOdW1iZXIgLyAy KTsKKyAgICAgICAgICAgIG9yaWdpbmFsTG9jYXRpb24uY29sdW1uTnVtYmVyID0gTWF0aC5mbG9v cihsb2NhdGlvbi5jb2x1bW5OdW1iZXIgLyAyKTsKKyAgICAgICAgICAgIHJldHVybiBvcmlnaW5h bExvY2F0aW9uOworICAgICAgICB9CisgICAgfTsKKworICAgIHZhciBtb2NrU2NyaXB0Rm9ybWF0 dGVyID0geworICAgICAgICBmb3JtYXRDb250ZW50OiBmdW5jdGlvbihtaW1lVHlwZSwgY29udGVu dCwgY2FsbGJhY2spCisgICAgICAgIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKGNvbnRlbnQsIG1v Y2tTb3VyY2VNYXBwaW5nKTsKKyAgICAgICAgfQorICAgIH07CisKKyAgICBmdW5jdGlvbiBjaGVj a1Jhd0xvY2F0aW9uKHNjcmlwdCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyLCBsb2NhdGlvbikK KyAgICB7CisgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKHNjcmlwdC5zb3VyY2VJ ZCwgbG9jYXRpb24uc291cmNlSWQpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFs cyhsaW5lTnVtYmVyLCBsb2NhdGlvbi5saW5lTnVtYmVyKTsKKyAgICAgICAgSW5zcGVjdG9yVGVz dC5hc3NlcnRFcXVhbHMoY29sdW1uTnVtYmVyLCBsb2NhdGlvbi5jb2x1bW5OdW1iZXIpOworICAg IH0KKworICAgIGZ1bmN0aW9uIGNoZWNrVUlMb2NhdGlvbihzb3VyY2VGaWxlLCBsaW5lTnVtYmVy LCBjb2x1bW5OdW1iZXIsIGxvY2F0aW9uKQorICAgIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5h c3NlcnRFcXVhbHMoc291cmNlRmlsZSwgbG9jYXRpb24uc291cmNlRmlsZSk7CisgICAgICAgIElu c3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKGxpbmVOdW1iZXIsIGxvY2F0aW9uLmxpbmVOdW1iZXIp OworICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscyhjb2x1bW5OdW1iZXIsIGxvY2F0 aW9uLmNvbHVtbk51bWJlcik7CisgICAgfQorCisgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0U3Vp dGUoWworICAgICAgICBmdW5jdGlvbiB0ZXN0UGxhaW5Db252ZXJ0TG9jYXRpb24obmV4dCkKKyAg ICAgICAgeworICAgICAgICAgICAgdmFyIHNjcmlwdCA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0 KCIxIiwgImZvby5qcyIsIDAsIDAsIDIwLCA4MCwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIGZhbHNl KTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VGaWxlID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VG aWxlKCJpZCIsIHNjcmlwdCk7CisKKyAgICAgICAgICAgIGNoZWNrVUlMb2NhdGlvbihzb3VyY2VG aWxlLCAxMCwgMjAsIHNvdXJjZUZpbGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24oMTAsIDIwKSk7 CisgICAgICAgICAgICBjaGVja1Jhd0xvY2F0aW9uKHNjcmlwdCwgMzAsIDQwLCBzb3VyY2VGaWxl LnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKDMwLCA0MCkpOworCisgICAgICAgICAgICBuZXh0KCk7 CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24gdGVzdENvbmNhdGVuYXRlZENvbnZlcnRM b2NhdGlvbihuZXh0KQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgc2NyaXB0MSA9IG5ldyBX ZWJJbnNwZWN0b3IuU2NyaXB0KCIxIiwgImZvby5qcyIsIDEwLCAyMCwgMzAsIDQwLCB1bmRlZmlu ZWQsIHVuZGVmaW5lZCwgZmFsc2UpOworICAgICAgICAgICAgdmFyIHNjcmlwdDIgPSBuZXcgV2Vi SW5zcGVjdG9yLlNjcmlwdCgiMiIsICJmb28uanMiLCA1MCwgNjAsIDcwLCA4MCwgdW5kZWZpbmVk LCB1bmRlZmluZWQsIGZhbHNlKTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VGaWxlID0gbmV3IFdl Ykluc3BlY3Rvci5Tb3VyY2VGaWxlKCJpZCIsIHNjcmlwdDEpOworICAgICAgICAgICAgc291cmNl RmlsZS5hZGRTY3JpcHQoc2NyaXB0Mik7CisKKyAgICAgICAgICAgIGNoZWNrVUlMb2NhdGlvbihz b3VyY2VGaWxlLCAyMCwgMCwgc291cmNlRmlsZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbigyMCwg MCkpOworCisgICAgICAgICAgICBjaGVja1Jhd0xvY2F0aW9uKHNjcmlwdDEsIDAsIDQwLCBzb3Vy Y2VGaWxlLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKDAsIDQwKSk7CisgICAgICAgICAgICBjaGVj a1Jhd0xvY2F0aW9uKHNjcmlwdDEsIDIwLCAwLCBzb3VyY2VGaWxlLnVpTG9jYXRpb25Ub1Jhd0xv Y2F0aW9uKDIwLCAwKSk7CisgICAgICAgICAgICBjaGVja1Jhd0xvY2F0aW9uKHNjcmlwdDIsIDUw LCA2MCwgc291cmNlRmlsZS51aUxvY2F0aW9uVG9SYXdMb2NhdGlvbig1MCwgNjApKTsKKworICAg ICAgICAgICAgbmV4dCgpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uIHRlc3RGb3Jt YXR0ZWRDb252ZXJ0TG9jYXRpb24obmV4dCkKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIHNj cmlwdCA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0KCIxIiwgImZvby5qcyIsIDAsIDAsIDIwLCA4 MCwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIGZhbHNlKTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VG aWxlID0gbmV3IFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRTb3VyY2VGaWxlKCJpZCIsIHNjcmlwdCwg bnVsbCwgbW9ja1NjcmlwdEZvcm1hdHRlcik7CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGRpZENy ZWF0ZVNvdXJjZU1hcHBpbmcoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNoZWNr VUlMb2NhdGlvbihzb3VyY2VGaWxlLCAyMiwgNDAsIHNvdXJjZUZpbGUucmF3TG9jYXRpb25Ub1VJ TG9jYXRpb24oMTEsIDIwKSk7CisgICAgICAgICAgICAgICAgY2hlY2tSYXdMb2NhdGlvbihzY3Jp cHQsIDcsIDksIHNvdXJjZUZpbGUudWlMb2NhdGlvblRvUmF3TG9jYXRpb24oMTQsIDE5KSk7Cisg ICAgICAgICAgICAgICAgbmV4dCgpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgc291cmNl RmlsZS5jcmVhdGVTb3VyY2VNYXBwaW5nSWZOZWVkZWQoZGlkQ3JlYXRlU291cmNlTWFwcGluZyk7 CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24gdGVzdENvbmNhdGVuYXRlZEZvcm1hdHRl ZENvbnZlcnRMb2NhdGlvbihuZXh0KQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgc2NyaXB0 MSA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0KCIxIiwgImZvby5qcyIsIDEwLCAyMCwgMzAsIDQw LCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgZmFsc2UpOworICAgICAgICAgICAgdmFyIHNjcmlwdDIg PSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdCgiMiIsICJmb28uanMiLCA1MCwgNjAsIDcwLCA4MCwg dW5kZWZpbmVkLCB1bmRlZmluZWQsIGZhbHNlKTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VGaWxl ID0gbmV3IFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRTb3VyY2VGaWxlKCJpZCIsIHNjcmlwdDEsIG51 bGwsIG1vY2tTY3JpcHRGb3JtYXR0ZXIpOworICAgICAgICAgICAgc291cmNlRmlsZS5hZGRTY3Jp cHQoc2NyaXB0Mik7CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGRpZENyZWF0ZVNvdXJjZU1hcHBp bmcoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNoZWNrVUlMb2NhdGlvbihzb3Vy Y2VGaWxlLCAyMiwgNjAsIHNvdXJjZUZpbGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24oMTEsIDMw KSk7CisgICAgICAgICAgICAgICAgY2hlY2tSYXdMb2NhdGlvbihzY3JpcHQxLCAxMiwgMTAsIHNv dXJjZUZpbGUudWlMb2NhdGlvblRvUmF3TG9jYXRpb24oMjQsIDIwKSk7CisgICAgICAgICAgICAg ICAgY2hlY2tSYXdMb2NhdGlvbihzY3JpcHQyLCA2MCwgMTksIHNvdXJjZUZpbGUudWlMb2NhdGlv blRvUmF3TG9jYXRpb24oMTIxLCAzOCkpOworICAgICAgICAgICAgICAgIG5leHQoKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIHNvdXJjZUZpbGUuY3JlYXRlU291cmNlTWFwcGluZ0lmTmVl ZGVkKGRpZENyZWF0ZVNvdXJjZU1hcHBpbmcpOworICAgICAgICB9CisgICAgXSk7Cit9OworCis8 L3NjcmlwdD4KKworPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD5UZXN0 cyBtYXBwaW5nIGJldHdlZW4gcmF3IGxvY2F0aW9ucyBhbmQgdWkgbG9jYXRpb25zLjwvcD4KKwor PC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGU4Njc4N2FmNDEyMjZhZGQ4MGI3MjFjNTkw YmM0MDYyOTE1YWM4YmIuLmQwMjgwOGQ5YjkzMTIyZDc4NGUyNGZlZWY0NjFmNGY3OWQ0MDE2MmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMS0wNy0yNiAgUGF2ZWwgUG9kaXZpbG92 ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3Zl IGxvY2F0aW9uIGNvbnZlcnNpb24gZnVuY3Rpb25zIHRvIFNvdXJjZUZpbGUuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTE4NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGluc3BlY3Rvci9kZWJ1 Z2dlci9zb3VyY2UtZmlsZS5odG1sCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX3NjcmlwdExvY2F0aW9uVG9VSUxvY2F0aW9u LmRpZENyZWF0ZVNvdXJjZU1hcHBpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9zY3JpcHRMb2NhdGlvblRvVUlMb2NhdGlvbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5 cGUuX3VpTG9jYXRpb25Ub1NjcmlwdExvY2F0aW9uLmRpZENyZWF0ZVNvdXJjZU1hcHBpbmcpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl Ll91aUxvY2F0aW9uVG9TY3JpcHRMb2NhdGlvbik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VGaWxlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZpbGUucHJv dG90eXBlLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGaWxlLnByb3RvdHlwZS51aUxvY2F0aW9uVG9SYXdMb2NhdGlvbik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlRmlsZS5wcm90b3R5cGUuX3NjcmlwdEZvclJhd0xvY2F0aW9uKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGaWxlLnByb3RvdHlwZS5jcmVhdGVTb3VyY2VN YXBwaW5nSWZOZWVkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFNvdXJjZUZp bGUucHJvdG90eXBlLmNyZWF0ZVNvdXJjZU1hcHBpbmdJZk5lZWRlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRm9ybWF0dGVkU291cmNlRmlsZS5wcm90b3R5cGUuX2RpZFJlcXVlc3RDb250ZW50 KToKKwogMjAxMS0wNy0yNSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogdXNlIGRlZGljYXRlZCB0eXBlIGZvciBvYmplY3QgaWQg aW4gdGhlIHByb3RvY29sLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IDViOWFj Njk3YWFjNmFiYmZkYTY4ZDk0MGEwMmI3NGNmYzc4YTNiY2UuLjAxMmFmZGQ5ZDBlZGJmZTcxZjcw Mjg5YWFiNTBmMDU0OGZiZWM3ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAg LTg3LDIzICs4NywyOSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5w cm90b3R5cGUgPSB7CiAgICAgX3NjcmlwdExvY2F0aW9uVG9VSUxvY2F0aW9uOiBmdW5jdGlvbihz b3VyY2VVUkwsIHNvdXJjZUlkLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIsIGNhbGxiYWNrKQog ICAgIHsKICAgICAgICAgdmFyIHNvdXJjZUZpbGUgPSB0aGlzLl9zb3VyY2VGaWxlRm9yU2NyaXB0 KHNvdXJjZVVSTCwgc291cmNlSWQpOwotICAgICAgICB2YXIgc2NyaXB0TG9jYXRpb24gPSB7IGxp bmVOdW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07CiAKLSAg ICAgICAgZnVuY3Rpb24gZGlkUmVxdWVzdFNvdXJjZU1hcHBpbmcobWFwcGluZykKKyAgICAgICAg ZnVuY3Rpb24gZGlkQ3JlYXRlU291cmNlTWFwcGluZygpCiAgICAgICAgIHsKLSAgICAgICAgICAg IHZhciBsaW5lTnVtYmVyID0gbWFwcGluZy5zY3JpcHRMb2NhdGlvblRvU291cmNlTGluZShzY3Jp cHRMb2NhdGlvbik7Ci0gICAgICAgICAgICBjYWxsYmFjayhzb3VyY2VGaWxlLmlkLCBsaW5lTnVt YmVyKTsKKyAgICAgICAgICAgIHZhciB1aUxvY2F0aW9uID0gc291cmNlRmlsZS5yYXdMb2NhdGlv blRvVUlMb2NhdGlvbihsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAgICAgICAgY2Fs bGJhY2sodWlMb2NhdGlvbi5zb3VyY2VGaWxlLmlkLCB1aUxvY2F0aW9uLmxpbmVOdW1iZXIpOwog ICAgICAgICB9Ci0gICAgICAgIHNvdXJjZUZpbGUucmVxdWVzdFNvdXJjZU1hcHBpbmcoZGlkUmVx dWVzdFNvdXJjZU1hcHBpbmcpOworICAgICAgICAvLyBGSVhNRTogZm9yY2Ugc291cmNlIGZvcm1h dHRpbmcgaWYgbmVlZGVkLiBUaGlzIHdpbGwgZ28gYXdheSBvbmNlIGZvcm1hdHRpbmcKKyAgICAg ICAgLy8gaXMgZnVsbHkgZW5jYXBzdWxhdGVkIGluIFNvdXJjZUZpbGUuCisgICAgICAgIHNvdXJj ZUZpbGUuY3JlYXRlU291cmNlTWFwcGluZ0lmTmVlZGVkKGRpZENyZWF0ZVNvdXJjZU1hcHBpbmcp OwogICAgIH0sCiAKICAgICBfdWlMb2NhdGlvblRvU2NyaXB0TG9jYXRpb246IGZ1bmN0aW9uKHNv dXJjZUZpbGVJZCwgbGluZU51bWJlciwgY2FsbGJhY2spCiAgICAgewotICAgICAgICBmdW5jdGlv biBkaWRSZXF1ZXN0U291cmNlTWFwcGluZyhtYXBwaW5nKQorICAgICAgICB2YXIgc291cmNlRmls ZSA9IHRoaXMuX3NvdXJjZUZpbGVzW3NvdXJjZUZpbGVJZF07CisKKyAgICAgICAgZnVuY3Rpb24g ZGlkQ3JlYXRlU291cmNlTWFwcGluZygpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGNhbGxiYWNr KG1hcHBpbmcuc291cmNlTGluZVRvU2NyaXB0TG9jYXRpb24obGluZU51bWJlcikpOworICAgICAg ICAgICAgdmFyIHJhd0xvY2F0aW9uID0gc291cmNlRmlsZS51aUxvY2F0aW9uVG9SYXdMb2NhdGlv bihsaW5lTnVtYmVyLCAwKTsKKyAgICAgICAgICAgIGNhbGxiYWNrKHJhd0xvY2F0aW9uKTsKICAg ICAgICAgfQotICAgICAgICB0aGlzLl9zb3VyY2VGaWxlc1tzb3VyY2VGaWxlSWRdLnJlcXVlc3RT b3VyY2VNYXBwaW5nKGRpZFJlcXVlc3RTb3VyY2VNYXBwaW5nLmJpbmQodGhpcykpOworICAgICAg ICAvLyBGSVhNRTogZm9yY2Ugc291cmNlIGZvcm1hdHRpbmcgaWYgbmVlZGVkLiBUaGlzIHdpbGwg Z28gYXdheSBvbmNlIGZvcm1hdHRpbmcKKyAgICAgICAgLy8gaXMgZnVsbHkgZW5jYXBzdWxhdGVk IGluIFNvdXJjZUZpbGUuCisgICAgICAgIHNvdXJjZUZpbGUuY3JlYXRlU291cmNlTWFwcGluZ0lm TmVlZGVkKGRpZENyZWF0ZVNvdXJjZU1hcHBpbmcpOwogICAgIH0sCiAKICAgICByZXF1ZXN0U291 cmNlRmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCwgY2FsbGJhY2spCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKaW5kZXggZTFk YWNkNGQ3M2VmNWE4OGVjNTc4MmE4NmZiNmQ3OTIwM2Q2MThmMy4uMzViYWQwOTg0MDU0MTRkYmU3 ZjhhY2I5YjY2ZDM4ZDgyNWFiN2Q5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRmlsZS5qcwpAQCAtNTIsNiArNTIsMzkgQEAgV2ViSW5zcGVjdG9y LlNvdXJjZUZpbGUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zY3JpcHRzLnB1c2goc2Ny aXB0KTsKICAgICB9LAogCisgICAgcmF3TG9jYXRpb25Ub1VJTG9jYXRpb246IGZ1bmN0aW9uKGxp bmVOdW1iZXIsIGNvbHVtbk51bWJlcikKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fbWFwcGlu ZykKKyAgICAgICAgICAgIHJldHVybiB7IHNvdXJjZUZpbGU6IHRoaXMsIGxpbmVOdW1iZXI6IGxp bmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07CisKKyAgICAgICAgdmFyIHVp TG9jYXRpb24gPSB0aGlzLl9tYXBwaW5nLm9yaWdpbmFsVG9Gb3JtYXR0ZWQoeyBsaW5lTnVtYmVy OiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVtbk51bWJlciB9KTsKKyAgICAgICAgdWlM b2NhdGlvbi5zb3VyY2VGaWxlID0gdGhpczsKKyAgICAgICAgcmV0dXJuIHVpTG9jYXRpb247Cisg ICAgfSwKKworICAgIHVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVy LCBjb2x1bW5OdW1iZXIpCisgICAgeworICAgICAgICB2YXIgcmF3TG9jYXRpb24gPSB7IGxpbmVO dW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07CisgICAgICAg IGlmICh0aGlzLl9tYXBwaW5nKQorICAgICAgICAgICAgcmF3TG9jYXRpb24gPSB0aGlzLl9tYXBw aW5nLmZvcm1hdHRlZFRvT3JpZ2luYWwocmF3TG9jYXRpb24pOworICAgICAgICByYXdMb2NhdGlv bi5zb3VyY2VJZCA9IHRoaXMuX3NjcmlwdEZvclJhd0xvY2F0aW9uKHJhd0xvY2F0aW9uLmxpbmVO dW1iZXIsIHJhd0xvY2F0aW9uLmNvbHVtbk51bWJlcikuc291cmNlSWQ7CisgICAgICAgIHJldHVy biByYXdMb2NhdGlvbjsKKyAgICB9LAorCisgICAgX3NjcmlwdEZvclJhd0xvY2F0aW9uOiBmdW5j dGlvbihsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCisgICAgeworICAgICAgICB2YXIgY2xvc2Vz dFNjcmlwdCA9IHRoaXMuX3NjcmlwdHNbMF07CisgICAgICAgIGZvciAodmFyIGkgPSAxOyBpIDwg dGhpcy5fc2NyaXB0cy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgc2NyaXB0ID0gdGhpcy5f c2NyaXB0c1tpXTsKKyAgICAgICAgICAgIGlmIChzY3JpcHQubGluZU9mZnNldCA+IGxpbmVOdW1i ZXIgfHwgKHNjcmlwdC5saW5lT2Zmc2V0ID09PSBsaW5lTnVtYmVyICYmIHNjcmlwdC5jb2x1bW5P ZmZzZXQgPiBjb2x1bW5OdW1iZXIpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICAgICAgaWYgKHNjcmlwdC5saW5lT2Zmc2V0ID4gY2xvc2VzdFNjcmlwdC5saW5lT2Zmc2V0IHx8 CisgICAgICAgICAgICAgICAgKHNjcmlwdC5saW5lT2Zmc2V0ID09PSBjbG9zZXN0U2NyaXB0Lmxp bmVPZmZzZXQgJiYgc2NyaXB0LmNvbHVtbk9mZnNldCA+IGNsb3Nlc3RTY3JpcHQuY29sdW1uT2Zm c2V0KSkKKyAgICAgICAgICAgICAgICBjbG9zZXN0U2NyaXB0ID0gc2NyaXB0OworICAgICAgICB9 CisgICAgICAgIHJldHVybiBjbG9zZXN0U2NyaXB0OworICAgIH0sCisKICAgICByZXF1ZXN0Q29u dGVudDogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewogICAgICAgICBpZiAodGhpcy5fY29udGVu dExvYWRlZCkgewpAQCAtNzQsMTEgKzEwNywxMCBAQCBXZWJJbnNwZWN0b3IuU291cmNlRmlsZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NvbnRlbnQgPSBjb250ZW50OwogICAgIH0sCiAK LSAgICByZXF1ZXN0U291cmNlTWFwcGluZzogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgY3JlYXRl U291cmNlTWFwcGluZ0lmTmVlZGVkOiBmdW5jdGlvbihjYWxsYmFjaykKICAgICB7Ci0gICAgICAg IGlmICghdGhpcy5fbWFwcGluZykKLSAgICAgICAgICAgIHRoaXMuX21hcHBpbmcgPSBuZXcgV2Vi SW5zcGVjdG9yLlNvdXJjZU1hcHBpbmcodGhpcy5fc2NyaXB0cyk7Ci0gICAgICAgIGNhbGxiYWNr KHRoaXMuX21hcHBpbmcpOworICAgICAgICAvLyBQbGFpbiBzb3VyY2Ugd2l0aG91dCBtYXBwaW5n LgorICAgICAgICBjYWxsYmFjaygpOwogICAgIH0sCiAKICAgICBmb3JjZUxvYWRDb250ZW50OiBm dW5jdGlvbihzY3JpcHQpCkBAIC0yMzYsMTIgKzI2OCwxMyBAQCBXZWJJbnNwZWN0b3IuRm9ybWF0 dGVkU291cmNlRmlsZSA9IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCwgc2NyaXB0LCBjb250ZW50Q2hh bmdlZAogfQogCiBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkU291cmNlRmlsZS5wcm90b3R5cGUgPSB7 Ci0gICAgcmVxdWVzdFNvdXJjZU1hcHBpbmc6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIGNyZWF0 ZVNvdXJjZU1hcHBpbmdJZk5lZWRlZDogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewogICAgICAg ICBmdW5jdGlvbiBkaWRSZXF1ZXN0Q29udGVudCgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGNh bGxiYWNrKHRoaXMuX21hcHBpbmcpOworICAgICAgICAgICAgY2FsbGJhY2soKTsKICAgICAgICAg fQorICAgICAgICAvLyBGb3JjZSBjb250ZW50IGZvcm1hdHRpbmcgdG8gb2J0YWluIHRoZSBtYXBw aW5nLgogICAgICAgICB0aGlzLnJlcXVlc3RDb250ZW50KGRpZFJlcXVlc3RDb250ZW50LmJpbmQo dGhpcykpOwogICAgIH0sCiAKQEAgLTI0OSw3ICsyODIsNyBAQCBXZWJJbnNwZWN0b3IuRm9ybWF0 dGVkU291cmNlRmlsZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBmdW5jdGlvbiBkaWRG b3JtYXRDb250ZW50KGZvcm1hdHRlZFRleHQsIG1hcHBpbmcpCiAgICAgICAgIHsKLSAgICAgICAg ICAgIHRoaXMuX21hcHBpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmdGb3JGb3Jt YXR0ZWRTb3VyY2VGaWxlKHRoaXMuX3NjcmlwdHMsIG1hcHBpbmcpOworICAgICAgICAgICAgdGhp cy5fbWFwcGluZyA9IG1hcHBpbmc7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuU291cmNlRmls ZS5wcm90b3R5cGUuX2RpZFJlcXVlc3RDb250ZW50LmNhbGwodGhpcywgbWltZVR5cGUsIGZvcm1h dHRlZFRleHQpOwogICAgICAgICB9CiAgICAgICAgIHRoaXMuX2Zvcm1hdHRlci5mb3JtYXRDb250 ZW50KG1pbWVUeXBlLCB0ZXh0LCBkaWRGb3JtYXRDb250ZW50LmJpbmQodGhpcykpOwpAQCAtMjU3 LDU0ICsyOTAsMyBAQCBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkU291cmNlRmlsZS5wcm90b3R5cGUg PSB7CiB9CiAKIFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRTb3VyY2VGaWxlLnByb3RvdHlwZS5fX3By b3RvX18gPSBXZWJJbnNwZWN0b3IuU291cmNlRmlsZS5wcm90b3R5cGU7Ci0KLVdlYkluc3BlY3Rv ci5Tb3VyY2VNYXBwaW5nID0gZnVuY3Rpb24oc2NyaXB0cykKLXsKLSAgICB0aGlzLl9zb3J0ZWRT Y3JpcHRzID0gc2NyaXB0cy5zbGljZSgpOwotICAgIHRoaXMuX3NvcnRlZFNjcmlwdHMuc29ydChm dW5jdGlvbih4LCB5KSB7IHJldHVybiB4LmxpbmVPZmZzZXQgLSB5LmxpbmVPZmZzZXQgfHwgeC5j b2x1bW5PZmZzZXQgLSB5LmNvbHVtbk9mZnNldDsgfSk7Ci19Ci0KLVdlYkluc3BlY3Rvci5Tb3Vy Y2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKLSAgICBzY3JpcHRMb2NhdGlvblRvU291cmNlTGluZTog ZnVuY3Rpb24obG9jYXRpb24pCi0gICAgewotICAgICAgICByZXR1cm4gbG9jYXRpb24ubGluZU51 bWJlcjsKLSAgICB9LAotCi0gICAgc291cmNlTGluZVRvU2NyaXB0TG9jYXRpb246IGZ1bmN0aW9u KGxpbmVOdW1iZXIpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlTG9jYXRpb25U b1NjcmlwdExvY2F0aW9uKGxpbmVOdW1iZXIsIDApOwotICAgIH0sCi0KLSAgICBfc291cmNlTG9j YXRpb25Ub1NjcmlwdExvY2F0aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIp Ci0gICAgewotICAgICAgICB2YXIgY2xvc2VzdFNjcmlwdCA9IHRoaXMuX3NvcnRlZFNjcmlwdHNb MF07Ci0gICAgICAgIGZvciAodmFyIGkgPSAxOyBpIDwgdGhpcy5fc29ydGVkU2NyaXB0cy5sZW5n dGg7ICsraSkgewotICAgICAgICAgICAgc2NyaXB0ID0gdGhpcy5fc29ydGVkU2NyaXB0c1tpXTsK LSAgICAgICAgICAgIGlmIChzY3JpcHQubGluZU9mZnNldCA+IGxpbmVOdW1iZXIgfHwgKHNjcmlw dC5saW5lT2Zmc2V0ID09PSBsaW5lTnVtYmVyICYmIHNjcmlwdC5jb2x1bW5PZmZzZXQgPiBjb2x1 bW5OdW1iZXIpKQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2xvc2VzdFNj cmlwdCA9IHNjcmlwdDsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4geyBzb3VyY2VJZDogY2xv c2VzdFNjcmlwdC5zb3VyY2VJZCwgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVy OiBjb2x1bW5OdW1iZXIgfTsKLSAgICB9Ci19Ci0KLVdlYkluc3BlY3Rvci5Tb3VyY2VNYXBwaW5n Rm9yRm9ybWF0dGVkU291cmNlRmlsZSA9IGZ1bmN0aW9uKHNjcmlwdHMsIG1hcHBpbmcpCi17Ci0g ICAgV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmcuY2FsbCh0aGlzLCBzY3JpcHRzKTsKLSAgICB0 aGlzLl9tYXBwaW5nID0gbWFwcGluZzsKLX0KLQotV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmdG b3JGb3JtYXR0ZWRTb3VyY2VGaWxlLnByb3RvdHlwZSA9IHsKLSAgICBzY3JpcHRMb2NhdGlvblRv U291cmNlTGluZTogZnVuY3Rpb24obG9jYXRpb24pCi0gICAgewotICAgICAgICByZXR1cm4gdGhp cy5fbWFwcGluZy5vcmlnaW5hbFRvRm9ybWF0dGVkKGxvY2F0aW9uKS5saW5lTnVtYmVyOwotICAg IH0sCi0KLSAgICBzb3VyY2VMaW5lVG9TY3JpcHRMb2NhdGlvbjogZnVuY3Rpb24obGluZU51bWJl cikKLSAgICB7Ci0gICAgICAgIHZhciBvcmlnaW5hbExvY2F0aW9uID0gdGhpcy5fbWFwcGluZy5m b3JtYXR0ZWRUb09yaWdpbmFsKHsgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVy OiAwIH0pOwotICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmcucHJvdG90 eXBlLl9zb3VyY2VMb2NhdGlvblRvU2NyaXB0TG9jYXRpb24uY2FsbCh0aGlzLCBvcmlnaW5hbExv Y2F0aW9uLmxpbmVOdW1iZXIsIG9yaWdpbmFsTG9jYXRpb24uY29sdW1uTnVtYmVyKTsKLSAgICB9 Ci19Ci0KLVdlYkluc3BlY3Rvci5Tb3VyY2VNYXBwaW5nRm9yRm9ybWF0dGVkU291cmNlRmlsZS5w cm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmcucHJvdG90eXBl Owo=