67789 2011-09-08 10:52:21 -0700 Web Inspector: extract RawSourceCode source mapping logic to helper classes. 2011-09-20 02:28:09 -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 464160 0 podivilov 2011-09-08 10:52:21 -0700 Web Inspector: extract RawSourceCode source mapping logic to helper classes. 464161 1 106762 podivilov 2011-09-08 10:54:15 -0700 Created attachment 106762 Patch 469271 2 106762 pfeldman 2011-09-19 00:40:09 -0700 Comment on attachment 106762 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=106762&action=review > Source/WebCore/inspector/front-end/SourceFile.js:225 > +WebInspector.RawSourceCode.FormattedSourceMapping = function(rawSourceCode, uiSourceCode, mapping) Why does formatted source mapping live under the raw source code? I was expecting formatting to be a part of the UI* hierarchy. 469311 3 podivilov 2011-09-19 03:40:46 -0700 (In reply to comment #2) > (From update of attachment 106762 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=106762&action=review > > > Source/WebCore/inspector/front-end/SourceFile.js:225 > > +WebInspector.RawSourceCode.FormattedSourceMapping = function(rawSourceCode, uiSourceCode, mapping) > > Why does formatted source mapping live under the raw source code? I was expecting formatting to be a part of the UI* hierarchy. This is not a new code. It's a part of existing RawSourceCode implementation that was moved to a separate class to remove duplicated state checks (e.g. "if formatted" and "if source map installed"). 469315 4 podivilov 2011-09-19 03:53:20 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 106762 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=106762&action=review > > > > > Source/WebCore/inspector/front-end/SourceFile.js:225 > > > +WebInspector.RawSourceCode.FormattedSourceMapping = function(rawSourceCode, uiSourceCode, mapping) > > > > Why does formatted source mapping live under the raw source code? I was expecting formatting to be a part of the UI* hierarchy. Also, source mapping is a part of RawSourceCode interface, a link to UISourceCode and ui locations. 469966 5 podivilov 2011-09-20 02:28:09 -0700 Committed r95522: <http://trac.webkit.org/changeset/95522> 106762 2011-09-08 10:54:15 -0700 2011-09-19 08:22:42 -0700 Patch bug-67789-20110908215413.patch text/plain 7890 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ3NjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxMjBmNWYwM2VjMzgyNTYz ZDExYzJjNjVkYjVlMzA4YjI4M2UzNzNhLi4wOGM3OTViNGU0NDRlNWVhYzg3ZDM4OGQ1ODc3ZDZm OWZiMjU4NDNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDktMDggIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogZXh0cmFjdCBSYXdTb3VyY2VDb2RlIHNvdXJjZSBtYXBwaW5nIGxvZ2ljIHRvIGhlbHBl ciBjbGFzc2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Njc3ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5nZXQgdWlTb3VyY2VDb2RlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5yYXdMb2NhdGlvblRvVUlMb2Nh dGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUudWlM b2NhdGlvblRvUmF3TG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNv ZGUucHJvdG90eXBlLl9jcmVhdGVTb3VyY2VNYXBwaW5nLmRpZFJlcXVlc3RDb250ZW50LmRpZEZv cm1hdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90 eXBlLl9jcmVhdGVTb3VyY2VNYXBwaW5nLmRpZFJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5fY3JlYXRlU291cmNlTWFwcGluZyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUuX3NhdmVTb3Vy Y2VNYXBwaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLlBsYWluU291 cmNlTWFwcGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5QbGFpblNv dXJjZU1hcHBpbmcucHJvdG90eXBlLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLlBsYWluU291cmNlTWFwcGluZy5wcm90b3R5cGUu dWlMb2NhdGlvblRvUmF3TG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJj ZUNvZGUuUGxhaW5Tb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5nZXQgdWlTb3VyY2VDb2RlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkZvcm1hdHRlZFNvdXJjZU1hcHBpbmcp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRm9ybWF0dGVkU291cmNlTWFw cGluZy5wcm90b3R5cGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJhd1NvdXJjZUNvZGUuRm9ybWF0dGVkU291cmNlTWFwcGluZy5wcm90b3R5cGUudWlM b2NhdGlvblRvUmF3TG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNv ZGUuRm9ybWF0dGVkU291cmNlTWFwcGluZy5wcm90b3R5cGUuZ2V0IHVpU291cmNlQ29kZSk6CisK IDIwMTEtMDktMDcgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogZ2V0IHJpZCBvZiBSYXdTb3VyY2VDb2RlLmNyZWF0ZVNv dXJjZU1hcHBpbmdJZk5lZWRlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRmlsZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRmlsZS5qcwppbmRleCBjODEyMGY2MjEzMjQ5ZGM4ZjQ3MDU5YzQ0MDQ2NDVh OGE1MDM2NTRiLi40ZGM4YmIxMzZmMDlmNzY4MjlhOWQ1YzE0NjBkZDU4OGNhMDVkMWNiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCkBA IC02Nyw3ICs2Nyw4IEBAIFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZSA9IHsK IAogICAgIGdldCB1aVNvdXJjZUNvZGUoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Vp U291cmNlQ29kZTsKKyAgICAgICAgLy8gRklYTUU6IGNsaWVudHMgc2hvdWxkIHVzZSBzb3VyY2VN YXBwaW5nIGRpcmVjdGx5LgorICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlTWFwcGluZyAmJiB0 aGlzLl9zb3VyY2VNYXBwaW5nLnVpU291cmNlQ29kZTsKICAgICB9LAogCiAgICAgc2V0Rm9ybWF0 dGVkOiBmdW5jdGlvbihmb3JtYXR0ZWQpCkBAIC05MSwxNyArOTIsMTQgQEAgV2ViSW5zcGVjdG9y LlJhd1NvdXJjZUNvZGUucHJvdG90eXBlID0gewogCiAgICAgcmF3TG9jYXRpb25Ub1VJTG9jYXRp b246IGZ1bmN0aW9uKHJhd0xvY2F0aW9uKQogICAgIHsKLSAgICAgICAgdmFyIGxvY2F0aW9uID0g dGhpcy5fbWFwcGluZyA/IHRoaXMuX21hcHBpbmcub3JpZ2luYWxUb0Zvcm1hdHRlZChyYXdMb2Nh dGlvbikgOiByYXdMb2NhdGlvbjsKLSAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuVUlM b2NhdGlvbih0aGlzLnVpU291cmNlQ29kZSwgbG9jYXRpb24ubGluZU51bWJlciwgbG9jYXRpb24u Y29sdW1uTnVtYmVyKTsKKyAgICAgICAgLy8gRklYTUU6IGNsaWVudHMgc2hvdWxkIHVzZSBzb3Vy Y2VNYXBwaW5nIGRpcmVjdGx5LgorICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlTWFwcGluZy5y YXdMb2NhdGlvblRvVUlMb2NhdGlvbihyYXdMb2NhdGlvbik7CiAgICAgfSwKIAogICAgIHVpTG9j YXRpb25Ub1Jhd0xvY2F0aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCiAg ICAgewotICAgICAgICB2YXIgcmF3TG9jYXRpb24gPSB7IGxpbmVOdW1iZXI6IGxpbmVOdW1iZXIs IGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07Ci0gICAgICAgIGlmICh0aGlzLl9tYXBwaW5n KQotICAgICAgICAgICAgcmF3TG9jYXRpb24gPSB0aGlzLl9tYXBwaW5nLmZvcm1hdHRlZFRvT3Jp Z2luYWwocmF3TG9jYXRpb24pOwotICAgICAgICByYXdMb2NhdGlvbi5zY3JpcHRJZCA9IHRoaXMu X3NjcmlwdEZvclJhd0xvY2F0aW9uKHJhd0xvY2F0aW9uLmxpbmVOdW1iZXIsIHJhd0xvY2F0aW9u LmNvbHVtbk51bWJlcikuc2NyaXB0SWQ7Ci0gICAgICAgIHJldHVybiByYXdMb2NhdGlvbjsKKyAg ICAgICAgLy8gRklYTUU6IGNsaWVudHMgc2hvdWxkIHVzZSBzb3VyY2VNYXBwaW5nIGRpcmVjdGx5 LgorICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlTWFwcGluZy51aUxvY2F0aW9uVG9SYXdMb2Nh dGlvbihsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOwogICAgIH0sCiAKICAgICBfc2NyaXB0Rm9y UmF3TG9jYXRpb246IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKQEAgLTE2MCw3 ICsxNTgsOSBAQCBXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAg X2NyZWF0ZVNvdXJjZU1hcHBpbmc6IGZ1bmN0aW9uKG9yaWdpbmFsQ29udGVudFByb3ZpZGVyLCBj YWxsYmFjaykKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fZm9ybWF0dGVkKSB7Ci0gICAgICAg ICAgICBjYWxsYmFjayhvcmlnaW5hbENvbnRlbnRQcm92aWRlciwgbnVsbCk7CisgICAgICAgICAg ICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUodGhpcy5p ZCwgdGhpcy51cmwsIHRoaXMuaXNDb250ZW50U2NyaXB0LCB0aGlzLCBvcmlnaW5hbENvbnRlbnRQ cm92aWRlcik7CisgICAgICAgICAgICB2YXIgc291cmNlTWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0 b3IuUmF3U291cmNlQ29kZS5QbGFpblNvdXJjZU1hcHBpbmcodGhpcywgdWlTb3VyY2VDb2RlKTsK KyAgICAgICAgICAgIGNhbGxiYWNrKHNvdXJjZU1hcHBpbmcpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAKQEAgLTE2OSwxOSArMTY5LDIxIEBAIFdlYkluc3BlY3Rvci5SYXdTb3Vy Y2VDb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZEZvcm1hdENvbnRl bnQoZm9ybWF0dGVkQ29udGVudCwgbWFwcGluZykKICAgICAgICAgICAgIHsKICAgICAgICAgICAg ICAgICB2YXIgY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0aWNDb250ZW50 UHJvdmlkZXIobWltZVR5cGUsIGZvcm1hdHRlZENvbnRlbnQpCi0gICAgICAgICAgICAgICAgY2Fs bGJhY2soY29udGVudFByb3ZpZGVyLCBtYXBwaW5nKTsKKyAgICAgICAgICAgICAgICB2YXIgdWlT b3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUoImRlb2JmdXNjYXRlZDoi ICsgdGhpcy5pZCwgdGhpcy51cmwsIHRoaXMuaXNDb250ZW50U2NyaXB0LCB0aGlzLCBjb250ZW50 UHJvdmlkZXIpOworICAgICAgICAgICAgICAgIHZhciBzb3VyY2VNYXBwaW5nID0gbmV3IFdlYklu c3BlY3Rvci5SYXdTb3VyY2VDb2RlLkZvcm1hdHRlZFNvdXJjZU1hcHBpbmcodGhpcywgdWlTb3Vy Y2VDb2RlLCBtYXBwaW5nKTsKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhzb3VyY2VNYXBwaW5n KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlci5mb3JtYXRDb250 ZW50KG1pbWVUeXBlLCBjb250ZW50LCBkaWRGb3JtYXRDb250ZW50LmJpbmQodGhpcykpOwogICAg ICAgICB9CiAgICAgICAgIG9yaWdpbmFsQ29udGVudFByb3ZpZGVyLnJlcXVlc3RDb250ZW50KGRp ZFJlcXVlc3RDb250ZW50LmJpbmQodGhpcykpOwogICAgIH0sCiAKLSAgICBfc2F2ZVNvdXJjZU1h cHBpbmc6IGZ1bmN0aW9uKGNvbnRlbnRQcm92aWRlciwgbWFwcGluZykKKyAgICBfc2F2ZVNvdXJj ZU1hcHBpbmc6IGZ1bmN0aW9uKHNvdXJjZU1hcHBpbmcpCiAgICAgewotICAgICAgICB2YXIgb2xk VUlTb3VyY2VDb2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlOwotICAgICAgICB2YXIgdWlTb3VyY2VD b2RlSWQgPSAodGhpcy5fZm9ybWF0dGVkID8gImRlb2JmdXNjYXRlZDoiIDogIiIpICsgKHRoaXMu X3NjcmlwdHNbMF0uc291cmNlVVJMIHx8IHRoaXMuX3NjcmlwdHNbMF0uc2NyaXB0SWQpOwotICAg ICAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSh1 aVNvdXJjZUNvZGVJZCwgdGhpcy51cmwsIHRoaXMuaXNDb250ZW50U2NyaXB0LCB0aGlzLCBjb250 ZW50UHJvdmlkZXIpOwotICAgICAgICB0aGlzLl9tYXBwaW5nID0gbWFwcGluZzsKKyAgICAgICAg dmFyIG9sZFVJU291cmNlQ29kZTsKKyAgICAgICAgaWYgKHRoaXMuX3NvdXJjZU1hcHBpbmcpCisg ICAgICAgICAgICBvbGRVSVNvdXJjZUNvZGUgPSB0aGlzLl9zb3VyY2VNYXBwaW5nLnVpU291cmNl Q29kZTsKKyAgICAgICAgdGhpcy5fc291cmNlTWFwcGluZyA9IHNvdXJjZU1hcHBpbmc7CiAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VD b2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBkYXRlZCwgeyBvbGRVSVNvdXJjZUNvZGU6IG9sZFVJ U291cmNlQ29kZSB9KTsKICAgICB9CiB9CkBAIC0xOTIsNiArMTk0LDY1IEBAIFdlYkluc3BlY3Rv ci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0 LnByb3RvdHlwZTsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKi8KK1dlYkluc3BlY3Rvci5SYXdT b3VyY2VDb2RlLlBsYWluU291cmNlTWFwcGluZyA9IGZ1bmN0aW9uKHJhd1NvdXJjZUNvZGUsIHVp U291cmNlQ29kZSkKK3sKKyAgICB0aGlzLl9yYXdTb3VyY2VDb2RlID0gcmF3U291cmNlQ29kZTsK KyAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7Cit9CisKK1dlYkluc3BlY3Rv ci5SYXdTb3VyY2VDb2RlLlBsYWluU291cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CisgICAgcmF3 TG9jYXRpb25Ub1VJTG9jYXRpb246IGZ1bmN0aW9uKHJhd0xvY2F0aW9uKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbih0aGlzLl91aVNvdXJjZUNvZGUs IHJhd0xvY2F0aW9uLmxpbmVOdW1iZXIsIHJhd0xvY2F0aW9uLmNvbHVtbk51bWJlcik7CisgICAg fSwKKworICAgIHVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBj b2x1bW5OdW1iZXIpCisgICAgeworICAgICAgICB2YXIgcmF3TG9jYXRpb24gPSB7IGxpbmVOdW1i ZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07CisgICAgICAgIHJh d0xvY2F0aW9uLnNjcmlwdElkID0gdGhpcy5fcmF3U291cmNlQ29kZS5fc2NyaXB0Rm9yUmF3TG9j YXRpb24ocmF3TG9jYXRpb24ubGluZU51bWJlciwgcmF3TG9jYXRpb24uY29sdW1uTnVtYmVyKS5z Y3JpcHRJZDsKKyAgICAgICAgcmV0dXJuIHJhd0xvY2F0aW9uOworICAgIH0sCisKKyAgICBnZXQg dWlTb3VyY2VDb2RlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl91aVNvdXJjZUNvZGU7 CisgICAgfQorfQorCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCitXZWJJbnNwZWN0b3IuUmF3 U291cmNlQ29kZS5Gb3JtYXR0ZWRTb3VyY2VNYXBwaW5nID0gZnVuY3Rpb24ocmF3U291cmNlQ29k ZSwgdWlTb3VyY2VDb2RlLCBtYXBwaW5nKQoreworICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGUgPSBy YXdTb3VyY2VDb2RlOworICAgIHRoaXMuX3VpU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsKKyAg ICB0aGlzLl9tYXBwaW5nID0gbWFwcGluZzsKK30KKworV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNv ZGUuRm9ybWF0dGVkU291cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CisgICAgcmF3TG9jYXRpb25U b1VJTG9jYXRpb246IGZ1bmN0aW9uKHJhd0xvY2F0aW9uKQorICAgIHsKKyAgICAgICAgdmFyIGxv Y2F0aW9uID0gdGhpcy5fbWFwcGluZy5vcmlnaW5hbFRvRm9ybWF0dGVkKHJhd0xvY2F0aW9uKTsK KyAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbih0aGlzLl91aVNvdXJj ZUNvZGUsIGxvY2F0aW9uLmxpbmVOdW1iZXIsIGxvY2F0aW9uLmNvbHVtbk51bWJlcik7CisgICAg fSwKKworICAgIHVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBj b2x1bW5OdW1iZXIpCisgICAgeworICAgICAgICB2YXIgcmF3TG9jYXRpb24gPSB0aGlzLl9tYXBw aW5nLmZvcm1hdHRlZFRvT3JpZ2luYWwoeyBsaW5lTnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5O dW1iZXI6IGNvbHVtbk51bWJlciB9KTsKKyAgICAgICAgcmF3TG9jYXRpb24uc2NyaXB0SWQgPSB0 aGlzLl9yYXdTb3VyY2VDb2RlLl9zY3JpcHRGb3JSYXdMb2NhdGlvbihyYXdMb2NhdGlvbi5saW5l TnVtYmVyLCByYXdMb2NhdGlvbi5jb2x1bW5OdW1iZXIpLnNjcmlwdElkOworICAgICAgICByZXR1 cm4gcmF3TG9jYXRpb247CisgICAgfSwKKworICAgIGdldCB1aVNvdXJjZUNvZGUoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHRoaXMuX3VpU291cmNlQ29kZTsKKyAgICB9Cit9CisKKworLyoqCisg KiBAY29uc3RydWN0b3IKKyAqLwogV2ViSW5zcGVjdG9yLlVJTG9jYXRpb24gPSBmdW5jdGlvbih1 aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKIHsKICAgICB0aGlzLnVpU291 cmNlQ29kZSA9IHVpU291cmNlQ29kZTsK