54448 2011-02-15 04:46:13 -0800 Web Inspector: [Text editor] Add updateHighlight method to the highlighter 2011-02-17 05:20:31 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 53588 0 aandrey webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 351193 0 aandrey 2011-02-15 04:46:13 -0800 We need a method to effectively update existing highlights in the editor. To do that, we should save pre- and post- conditions of the highlighter for each line. 351195 1 82438 aandrey 2011-02-15 04:50:14 -0800 Created attachment 82438 Patch 352763 2 82438 pfeldman 2011-02-17 05:11:02 -0800 Comment on attachment 82438 Patch Please test this thoroughly for the cases with nested highlighters. Also, as we agreed offline, you should add tests for highlighter as your next change. 352769 3 82438 podivilov 2011-02-17 05:20:20 -0800 Comment on attachment 82438 Patch Clearing flags on attachment: 82438 Committed r78815: <http://trac.webkit.org/changeset/78815> 352770 4 podivilov 2011-02-17 05:20:31 -0800 All reviewed patches have been landed. Closing bug. 82438 2011-02-15 04:50:14 -0800 2011-02-17 05:20:20 -0800 Patch bug-54448-20110215155009.patch text/plain 9046 aandrey ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YjliZTdmMmM5ZDc2NWZkZWJhY2IwNjkyNWIyNDdkM2FiMDk2NmU1Li4y ZjVlNTY5YzFiMzA0MDkyMWQxMzM3NGRkNzJmZTNjMjE3NGQ5ZmYwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTEtMDItMTUgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtUZXh0IGVkaXRvcl0gQWRkIHVwZGF0ZUhpZ2hsaWdodCBtZXRob2QgdG8g dGhlIGhpZ2hsaWdodGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NDQ0OAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VUb2tl bml6ZXIuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9ySGlnaGxp Z2h0ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckhpZ2hsaWdodGVyLnBy b3RvdHlwZS5zZXQgbWltZVR5cGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JI aWdobGlnaHRlci5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3JIaWdobGlnaHRlci5wcm90b3R5cGUudXBkYXRlSGlnaGxpZ2h0KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9ySGlnaGxpZ2h0ZXIucHJvdG90eXBlLl9oaWdobGlnaHRJbkNo dW5rcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckhpZ2hsaWdodGVyLnByb3Rv dHlwZS5faGlnaGxpZ2h0TGluZXMpOgorCiAyMDExLTAyLTE1ICBNT1JJVEEgSGFqaW1lICA8bW9y cml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VUb2tlbml6ZXIu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVRva2VuaXplci5q cwppbmRleCBkMzA3NDRjNGY5M2JmMzBmYWExYTJiNjI1MzI3YmFhMmJjMzI3YWQwLi5iYjQ0YTg2 ZWQxZDA4MWFhNDgzNGQ0ODM3NjM1Y2ZmMGFhYWMxODgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVRva2VuaXplci5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVRva2VuaXplci5qcwpAQCAtNDgsMTEg KzQ4LDYgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZVRva2VuaXplci5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHJldHVybiB0aGlzLl9jb25kaXRpb247CiAgICAgfSwKIAotICAgIGdldCBzdWJUb2tlbml6 ZXIoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2NvbmRpdGlvbi5zdWJUb2tlbml6ZXI7 Ci0gICAgfSwKLQogICAgIGdldExleENvbmRpdGlvbjogZnVuY3Rpb24oKQogICAgIHsKICAgICAg ICAgcmV0dXJuIHRoaXMuY29uZGl0aW9uLmxleENvbmRpdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVkaXRvckhpZ2hsaWdodGVyLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9ySGlnaGxpZ2h0ZXIu anMKaW5kZXggNGFjODMxZWE0ZmU1Y2QwZGNiMDljNGZkMzU3Y2Q3ZDIzYWE2ZDhkYS4uOTFhZTQ3 MTg2ZGJkNzJmNzAxZTc0MzdmMDNhMGQ2YTNhMmQ1MTlkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9ySGlnaGxpZ2h0ZXIuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9ySGlnaGxpZ2h0ZXIu anMKQEAgLTQzLDcgKzQzLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JIaWdobGlnaHRlci5w cm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB0b2tlbml6ZXIgPSBXZWJJbnNwZWN0b3IuU291cmNl VG9rZW5pemVyLlJlZ2lzdHJ5LmdldEluc3RhbmNlKCkuZ2V0VG9rZW5pemVyKG1pbWVUeXBlKTsK ICAgICAgICAgaWYgKHRva2VuaXplcikgewogICAgICAgICAgICAgdGhpcy5fdG9rZW5pemVyID0g dG9rZW5pemVyOwotICAgICAgICAgICAgdGhpcy5fdG9rZW5pemVyQ29uZGl0aW9uID0gdGhpcy5f dG9rZW5pemVyLmluaXRpYWxDb25kaXRpb247CisgICAgICAgICAgICB0aGlzLl90b2tlbml6ZXJD b25kaXRpb25TdHJpbmdpZmllZCA9IEpTT04uc3RyaW5naWZ5KHRoaXMuX3Rva2VuaXplci5pbml0 aWFsQ29uZGl0aW9uKTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTUxLDcgKzUxLDcgQEAgV2Vi SW5zcGVjdG9yLlRleHRFZGl0b3JIaWdobGlnaHRlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAg ICAgICB0aGlzLl9sYXN0SGlnaGxpZ2h0ZWRMaW5lID0gMDsKICAgICAgICAgdGhpcy5fbGFzdEhp Z2hsaWdodGVkQ29sdW1uID0gMDsKLSAgICAgICAgdGhpcy5fdG9rZW5pemVyQ29uZGl0aW9uID0g dGhpcy5fdG9rZW5pemVyLmluaXRpYWxDb25kaXRpb247CisgICAgICAgIHRoaXMuX3Rva2VuaXpl ckNvbmRpdGlvblN0cmluZ2lmaWVkID0gSlNPTi5zdHJpbmdpZnkodGhpcy5fdG9rZW5pemVyLmlu aXRpYWxDb25kaXRpb24pOwogICAgIH0sCiAKICAgICBoaWdobGlnaHQ6IGZ1bmN0aW9uKGVuZExp bmUpCkBAIC03NSw2ICs3NSw1NiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckhpZ2hsaWdodGVy LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2hpZ2hsaWdodFRpbWVyID0gc2V0VGlt ZW91dCh0aGlzLl9oaWdobGlnaHRJbkNodW5rcy5iaW5kKHRoaXMsIGVuZExpbmUpLCAxMDApOwog ICAgIH0sCiAKKyAgICB1cGRhdGVIaWdobGlnaHQ6IGZ1bmN0aW9uKHN0YXJ0TGluZSwgZW5kTGlu ZSkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9sYXN0SGlnaGxpZ2h0ZWRMaW5lIDwgc3RhcnRM aW5lKSB7CisgICAgICAgICAgICAvLyBIaWdobGlnaHRlciBkaWQgbm90IHJlYWNoIHRoaXMgcG9p bnQgeWV0LCBub3RoaW5nIHRvIHVwZGF0ZS4gSXQgd2lsbCByZWFjaCBpdCBvbiBzdWJzZXF1ZW50 IHRpbWVyIHRpY2sgYW5kIGRvIHRoZSBqb2IuCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIH0KKworICAgICAgICB2YXIgc2F2ZWRMYXN0SGlnaGxpZ2h0ZWRMaW5lID0gdGhpcy5f bGFzdEhpZ2hsaWdodGVkTGluZTsKKyAgICAgICAgdmFyIHNhdmVkTGFzdEhpZ2hsaWdodGVkQ29s dW1uID0gdGhpcy5fbGFzdEhpZ2hsaWdodGVkQ29sdW1uOworICAgICAgICB2YXIgc2F2ZWRUb2tl bml6ZXJDb25kaXRpb24gPSB0aGlzLl90b2tlbml6ZXJDb25kaXRpb25TdHJpbmdpZmllZDsKKwor ICAgICAgICB0aGlzLl9sYXN0SGlnaGxpZ2h0ZWRMaW5lID0gc3RhcnRMaW5lOworICAgICAgICB0 aGlzLl9sYXN0SGlnaGxpZ2h0ZWRDb2x1bW4gPSAwOworCisgICAgICAgIC8vIFJlc3RvcmUgaGln aGxpZ2h0ZXIgY29udGV4dCB0YWtlbiBmcm9tIHRoZSBwcmV2aW91cyBsaW5lLgorICAgICAgICB2 YXIgYXR0cmlidXRlcyA9IHRoaXMuX3RleHRNb2RlbC5nZXRBdHRyaWJ1dGUoc3RhcnRMaW5lIC0g MSwgImhpZ2hsaWdodCIpIHx8IHt9OworICAgICAgICB0aGlzLl90b2tlbml6ZXJDb25kaXRpb25T dHJpbmdpZmllZCA9IGF0dHJpYnV0ZXMucG9zdENvbmRpdGlvblN0cmluZ2lmaWVkIHx8IEpTT04u c3RyaW5naWZ5KHRoaXMuX3Rva2VuaXplci5pbml0aWFsQ29uZGl0aW9uKTsKKworICAgICAgICAv LyBUcnkgdG8gdXBkYXRlIGhpZ2hsaWdodCBzeW5jaHJvbm91c2x5LgorICAgICAgICB0aGlzLl9o aWdobGlnaHRMaW5lcyhlbmRMaW5lKTsKKworICAgICAgICBpZiAodGhpcy5fbGFzdEhpZ2hsaWdo dGVkTGluZSA+PSB0aGlzLl90ZXh0TW9kZWwubGluZXNDb3VudCkgeworICAgICAgICAgICAgLy8g QWxsIGlzIGRvbmUgdXAgdG8gdGhlIGVuZC4KKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICB9CisKKyAgICAgICAgdmFyIGF0dHJpYnV0ZXMxID0gdGhpcy5fdGV4dE1vZGVsLmdldEF0 dHJpYnV0ZSh0aGlzLl9sYXN0SGlnaGxpZ2h0ZWRMaW5lIC0gMSwgImhpZ2hsaWdodCIpIHx8IHt9 OworICAgICAgICB2YXIgYXR0cmlidXRlczIgPSB0aGlzLl90ZXh0TW9kZWwuZ2V0QXR0cmlidXRl KHRoaXMuX2xhc3RIaWdobGlnaHRlZExpbmUsICJoaWdobGlnaHQiKSB8fCB7fTsKKyAgICAgICAg aWYgKHRoaXMuX2xhc3RIaWdobGlnaHRlZENvbHVtbiA9PT0gMCAmJiBhdHRyaWJ1dGVzMi5wcmVD b25kaXRpb25TdHJpbmdpZmllZCAmJiBhdHRyaWJ1dGVzMS5wb3N0Q29uZGl0aW9uU3RyaW5naWZp ZWQgPT09IGF0dHJpYnV0ZXMyLnByZUNvbmRpdGlvblN0cmluZ2lmaWVkKSB7CisgICAgICAgICAg ICAvLyBIaWdobGlnaHRpbmcgZW5kZWQgYWhlYWQgb2YgdGltZS4gUmVzdG9yZSBwcmV2aW91c2x5 IHNhdmVkIHN0YXRlLgorICAgICAgICAgICAgdGhpcy5fbGFzdEhpZ2hsaWdodGVkTGluZSA9IHNh dmVkTGFzdEhpZ2hsaWdodGVkTGluZTsKKyAgICAgICAgICAgIHRoaXMuX2xhc3RIaWdobGlnaHRl ZENvbHVtbiA9IHNhdmVkTGFzdEhpZ2hsaWdodGVkQ29sdW1uOworICAgICAgICAgICAgdGhpcy5f dG9rZW5pemVyQ29uZGl0aW9uU3RyaW5naWZpZWQgPSBzYXZlZFRva2VuaXplckNvbmRpdGlvbjsK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg Ly8gSWYgZmFpbGVkIHRvIHVwZGF0ZSBoaWdobGlnaHQgc3luY2hyb25vdXNseSwgaW52YWxpZGF0 ZSBoaWdobGlnaHQgZGF0YSBmb3IgdGhlIHN1YnNlcXVlbnQgbGluZXMuCisgICAgICAgICAgICBp ZiAodGhpcy5fbGFzdEhpZ2hsaWdodGVkQ29sdW1uID09PSAwKQorICAgICAgICAgICAgICAgIHRo aXMuX3RleHRNb2RlbC5yZW1vdmVBdHRyaWJ1dGUodGhpcy5fbGFzdEhpZ2hsaWdodGVkTGluZSwg ImhpZ2hsaWdodCIpOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IHRoaXMuX2xhc3RIaWdobGln aHRlZExpbmUgKyAxOyBpIDwgdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQ7ICsraSkKKyAgICAg ICAgICAgICAgICB0aGlzLl90ZXh0TW9kZWwucmVtb3ZlQXR0cmlidXRlKGksICJoaWdobGlnaHQi KTsKKworICAgICAgICAgICAgLy8gQ29udGludWUgaGlnaGxpZ2h0aW5nIG9uIHN1YnNlcXVlbnQg dGltZXIgdGlja3MuCisgICAgICAgICAgICB0aGlzLl9yZXF1ZXN0ZWRFbmRMaW5lID0gZW5kTGlu ZTsKKyAgICAgICAgICAgIGlmICghdGhpcy5faGlnaGxpZ2h0VGltZXIpCisgICAgICAgICAgICAg ICAgdGhpcy5faGlnaGxpZ2h0VGltZXIgPSBzZXRUaW1lb3V0KHRoaXMuX2hpZ2hsaWdodEluQ2h1 bmtzLmJpbmQodGhpcywgZW5kTGluZSksIDEwMCk7CisKKyAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgfQorICAgIH0sCisKICAgICBfaGlnaGxpZ2h0SW5DaHVua3M6IGZ1bmN0aW9u KGVuZExpbmUpCiAgICAgewogICAgICAgICBkZWxldGUgdGhpcy5faGlnaGxpZ2h0VGltZXI7CkBA IC04OSw2ICsxMzksMTAgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JIaWdobGlnaHRlci5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAorICAgICAgICAvLyBU aGUgdGV4dE1vZGVsIG1heSBoYXZlIGJlZW4gYWxyZWFkeSB1cGRhdGVkLgorICAgICAgICBpZiAo dGhpcy5fcmVxdWVzdGVkRW5kTGluZSA+IHRoaXMuX3RleHRNb2RlbC5saW5lc0NvdW50KQorICAg ICAgICAgICAgdGhpcy5fcmVxdWVzdGVkRW5kTGluZSA9IHRoaXMuX3RleHRNb2RlbC5saW5lc0Nv dW50OworCiAgICAgICAgIHRoaXMuX2hpZ2hsaWdodExpbmVzKHRoaXMuX3JlcXVlc3RlZEVuZExp bmUpOwogCiAgICAgICAgIC8vIFNjaGVkdWxlIHRhaWwgaGlnaGxpZ2h0IGlmIG5lY2Vzc2FyeS4K QEAgLTk4LDM1ICsxNTIsNDggQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JIaWdobGlnaHRlci5w cm90b3R5cGUgPSB7CiAKICAgICBfaGlnaGxpZ2h0TGluZXM6IGZ1bmN0aW9uKGVuZExpbmUpCiAg ICAgewotICAgICAgICAvLyBUb2tlbml6ZXIgaXMgc3RhdGVsZXNzIGFuZCByZXVzZWQgYWNjcm9z cyB2aWV3ZXJzLCByZXN0b3JlIGl0cyBjb25kaXRpb24gYmVmb3JlIGhpZ2hsaWdodCBhbmQgc2F2 ZSBpdCBhZnRlci4KLSAgICAgICAgdGhpcy5fdG9rZW5pemVyLmNvbmRpdGlvbiA9IHRoaXMuX3Rv a2VuaXplckNvbmRpdGlvbjsKKyAgICAgICAgLy8gVG9rZW5pemVyIGlzIHN0YXRlbGVzcyBhbmQg cmV1c2VkIGFjcm9zcyB2aWV3ZXJzLCByZXN0b3JlIGl0cyBjb25kaXRpb24gYmVmb3JlIGhpZ2hs aWdodCBhbmQgc2F2ZSBpdCBhZnRlci4KKyAgICAgICAgdGhpcy5fdG9rZW5pemVyLmNvbmRpdGlv biA9IEpTT04ucGFyc2UodGhpcy5fdG9rZW5pemVyQ29uZGl0aW9uU3RyaW5naWZpZWQpOwogICAg ICAgICB2YXIgdG9rZW5zQ291bnQgPSAwOwogICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyID0g dGhpcy5fbGFzdEhpZ2hsaWdodGVkTGluZTsgbGluZU51bWJlciA8IGVuZExpbmU7ICsrbGluZU51 bWJlcikgewogICAgICAgICAgICAgdmFyIGxpbmUgPSB0aGlzLl90ZXh0TW9kZWwubGluZShsaW5l TnVtYmVyKTsKICAgICAgICAgICAgIHRoaXMuX3Rva2VuaXplci5saW5lID0gbGluZTsKLSAgICAg ICAgICAgIHZhciBhdHRyaWJ1dGVzID0gdGhpcy5fdGV4dE1vZGVsLmdldEF0dHJpYnV0ZShsaW5l TnVtYmVyLCAiaGlnaGxpZ2h0IikgfHwge307CisKKyAgICAgICAgICAgIHZhciBhdHRyaWJ1dGVz ID0ge307CisgICAgICAgICAgICB0aGlzLl90ZXh0TW9kZWwuc2V0QXR0cmlidXRlKGxpbmVOdW1i ZXIsICJoaWdobGlnaHQiLCBhdHRyaWJ1dGVzKTsKKworICAgICAgICAgICAgaWYgKHRoaXMuX2xh c3RIaWdobGlnaHRlZENvbHVtbiA9PT0gMCkKKyAgICAgICAgICAgICAgICBhdHRyaWJ1dGVzLnBy ZUNvbmRpdGlvblN0cmluZ2lmaWVkID0gSlNPTi5zdHJpbmdpZnkodGhpcy5fdG9rZW5pemVyLmNv bmRpdGlvbik7CiAKICAgICAgICAgICAgIC8vIEhpZ2hsaWdodCBsaW5lLgogICAgICAgICAgICAg ZG8gewogICAgICAgICAgICAgICAgIHZhciBuZXdDb2x1bW4gPSB0aGlzLl90b2tlbml6ZXIubmV4 dFRva2VuKHRoaXMuX2xhc3RIaWdobGlnaHRlZENvbHVtbik7CiAgICAgICAgICAgICAgICAgdmFy IHRva2VuVHlwZSA9IHRoaXMuX3Rva2VuaXplci50b2tlblR5cGU7CiAgICAgICAgICAgICAgICAg aWYgKHRva2VuVHlwZSkKLSAgICAgICAgICAgICAgICAgICAgYXR0cmlidXRlc1t0aGlzLl9sYXN0 SGlnaGxpZ2h0ZWRDb2x1bW5dID0geyBsZW5ndGg6IG5ld0NvbHVtbiAtIHRoaXMuX2xhc3RIaWdo bGlnaHRlZENvbHVtbiwgdG9rZW5UeXBlOiB0b2tlblR5cGUsIHN1YlRva2VuaXplcjogdGhpcy5f dG9rZW5pemVyLnN1YlRva2VuaXplciB9OworICAgICAgICAgICAgICAgICAgICBhdHRyaWJ1dGVz W3RoaXMuX2xhc3RIaWdobGlnaHRlZENvbHVtbl0gPSB7IGxlbmd0aDogbmV3Q29sdW1uIC0gdGhp cy5fbGFzdEhpZ2hsaWdodGVkQ29sdW1uLCB0b2tlblR5cGU6IHRva2VuVHlwZSB9OwogICAgICAg ICAgICAgICAgIHRoaXMuX2xhc3RIaWdobGlnaHRlZENvbHVtbiA9IG5ld0NvbHVtbjsKICAgICAg ICAgICAgICAgICBpZiAoKyt0b2tlbnNDb3VudCA+IDEwMDApCiAgICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgfSB3aGlsZSAodGhpcy5fbGFzdEhpZ2hsaWdodGVkQ29sdW1u IDwgbGluZS5sZW5ndGgpCisgICAgICAgICAgICB9IHdoaWxlICh0aGlzLl9sYXN0SGlnaGxpZ2h0 ZWRDb2x1bW4gPCBsaW5lLmxlbmd0aCk7CiAKLSAgICAgICAgICAgIHRoaXMuX3RleHRNb2RlbC5z ZXRBdHRyaWJ1dGUobGluZU51bWJlciwgImhpZ2hsaWdodCIsIGF0dHJpYnV0ZXMpOwogICAgICAg ICAgICAgaWYgKHRoaXMuX2xhc3RIaWdobGlnaHRlZENvbHVtbiA8IGxpbmUubGVuZ3RoKSB7CiAg ICAgICAgICAgICAgICAgLy8gVG9vIG11Y2ggd29yayBmb3Igc2luZ2xlIGNodW5rIC0gZXhpdC4K ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICAgICB0aGlzLl9sYXN0SGlnaGxpZ2h0ZWRDb2x1bW4gPSAw OworICAgICAgICAgICAgICAgIGF0dHJpYnV0ZXMucG9zdENvbmRpdGlvblN0cmluZ2lmaWVkID0g SlNPTi5zdHJpbmdpZnkodGhpcy5fdG9rZW5pemVyLmNvbmRpdGlvbik7CisKKyAgICAgICAgICAg ICAgICB2YXIgbmV4dEF0dHJpYnV0ZXMgPSB0aGlzLl90ZXh0TW9kZWwuZ2V0QXR0cmlidXRlKGxp bmVOdW1iZXIgKyAxLCAiaGlnaGxpZ2h0IikgfHwge307CisgICAgICAgICAgICAgICAgaWYgKG5l eHRBdHRyaWJ1dGVzLnByZUNvbmRpdGlvblN0cmluZ2lmaWVkID09PSBhdHRyaWJ1dGVzLnBvc3RD b25kaXRpb25TdHJpbmdpZmllZCkgeworICAgICAgICAgICAgICAgICAgICAvLyBGb2xsb3dpbmcg bGluZXMgYXJlIHVwIHRvIGRhdGUsIG5vIG5lZWQgdG8gcmUtaGlnaGxpZ2h0LgorICAgICAgICAg ICAgICAgICAgICArK2xpbmVOdW1iZXI7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIHRoaXMu X2RhbWFnZUNhbGxiYWNrKHRoaXMuX2xhc3RIaWdobGlnaHRlZExpbmUsIGxpbmVOdW1iZXIpOwot ICAgICAgICB0aGlzLl90b2tlbml6ZXJDb25kaXRpb24gPSB0aGlzLl90b2tlbml6ZXIuY29uZGl0 aW9uOworICAgICAgICB0aGlzLl90b2tlbml6ZXJDb25kaXRpb25TdHJpbmdpZmllZCA9IEpTT04u c3RyaW5naWZ5KHRoaXMuX3Rva2VuaXplci5jb25kaXRpb24pOwogICAgICAgICB0aGlzLl9sYXN0 SGlnaGxpZ2h0ZWRMaW5lID0gbGluZU51bWJlcjsKICAgICB9CiB9Cg==