66237 2011-08-15 10:12:32 -0700 Web Inspector: extract content loading functions from RawSourceCode to SourceCodeProvider implementations. 2011-08-18 07:56:35 -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 451104 0 podivilov 2011-08-15 10:12:32 -0700 Web Inspector: extract content loading functions from RawSourceCode to SourceCodeProvider implementations. This is needed to move requestContent implementation from RawSourceCode to UISourceCode. 451106 1 103921 podivilov 2011-08-15 10:14:04 -0700 Created attachment 103921 Patch 453042 2 podivilov 2011-08-18 07:56:35 -0700 Committed r93308: <http://trac.webkit.org/changeset/93308> 103921 2011-08-15 10:14:04 -0700 2011-08-18 02:14:36 -0700 Patch bug-66237-20110815211402.patch text/plain 14699 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTI5NjMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmYzEwMDU3ODk4OGE0MGNmMTcwYTVm ZDU3ZDg0YzQzMzQxN2U3YTNkLi42YzAzMTgxY2EwMTUwZTBmMjE0OTEwNGUxMTU5MTJiNmJmMzEz NTc2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMTUgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZXh0cmFj dCBjb250ZW50IGxvYWRpbmcgZnVuY3Rpb25zIGZyb20gUmF3U291cmNlQ29kZSB0byBTb3VyY2VD b2RlUHJvdmlkZXIgaW1wbGVtZW50YXRpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYyMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtY29kZS1wcm92 aWRlcnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIv c291cmNlLWNvZGUtcHJvdmlkZXJzLmh0bWw6IEFkZGVkLgorCiAyMDExLTA4LTEyICBZdXJ5IFNl bWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGV4cGFuZCBleGNlcHRpb24gcHJvcGVydGllcyB3aGVuIHdyYXBwaW5nIGl0IGFzIG9iamVjdC4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtY29kZS1w cm92aWRlcnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Nv dXJjZS1jb2RlLXByb3ZpZGVycy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDI5ZGJjNzhkNTA5 ZDZjOGU3ZGMzNzgwMzAxZjg2MWIzNTBmMDBhZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtY29kZS1wcm92aWRlcnMtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMjMgQEAKK1Rlc3RzIFNvdXJjZUNvZGVQcm92aWRlciBpbXBsZW1lbnRhdGlv bnMuCisKKworUnVubmluZzogdGVzdFNjcmlwdFNvdXJjZUNvZGVQcm92aWRlcgorUmVxdWVzdCBm b28uanMgc291cmNlLgorCitSdW5uaW5nOiB0ZXN0Q29uY2F0ZW5hdGVkU2NyaXB0c1NvdXJjZUNv ZGVQcm92aWRlcgorUmVxdWVzdCBmb28uanMgc291cmNlLgorUmVxdWVzdCBiYXIuanMgc291cmNl LgorUmVxdWVzdCBiYXouanMgc291cmNlLgorCisgIDxzY3JpcHQ+ZnVuY3Rpb24gZm9vKCkgeyBy ZXR1cm4gMDsgfTwvc2NyaXB0PiAgICAgICAgICAgICAgIDxzY3JpcHQ+ZnVuY3Rpb24gYmFyKCkg eyByZXR1cm4gMDsgfTwvc2NyaXB0PgorCisgICAgICAgICAgICA8c2NyaXB0PgorZnVuY3Rpb24g YmF6KCkKK3sKKyAgcmV0dXJuIDA7Cit9Cis8L3NjcmlwdD4KKworUnVubmluZzogdGVzdFJlc291 cmNlU291cmNlQ29kZVByb3ZpZGVyCitSZXF1ZXN0IHJlc291cmNlIGNvbnRlbnQuCisKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtY29kZS1wcm92aWRl cnMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtY29kZS1wcm92 aWRlcnMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hMTZmYjEwOTAxZTI3MjAyMTVmZTgyM2M5MmNiMWE4ZWZi Y2M2YWM4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L3NvdXJjZS1jb2RlLXByb3ZpZGVycy5odG1sCkBAIC0wLDAgKzEsODMgQEAKKzxodG1sPgorPGhl YWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRl c3QuanMiPjwvc2NyaXB0PgorCis8c2NyaXB0PgorCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBm dW5jdGlvbiBjcmVhdGVNb2NrU2NyaXB0KGlkLCBzb3VyY2UsIHJhbmdlKQorICAgIHsKKyAgICAg ICAgcmFuZ2UgPSByYW5nZSB8fCBbMCwgMCwgMTAwLCAwXTsKKyAgICAgICAgcmV0dXJuIHsKKyAg ICAgICAgICAgIHJlcXVlc3RTb3VyY2U6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgICAgICAgICAg eworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJSZXF1ZXN0ICIgKyBp ZCArICIgc291cmNlLiIpOworICAgICAgICAgICAgICAgIGNhbGxiYWNrKHNvdXJjZSk7CisgICAg ICAgICAgICB9LAorICAgICAgICAgICAgZ2V0IGxpbmVPZmZzZXQoKSB7IHJldHVybiByYW5nZVsw XTsgfSwKKyAgICAgICAgICAgIGdldCBjb2x1bW5PZmZzZXQoKSB7IHJldHVybiByYW5nZVsxXTsg fQorICAgICAgICB9OworICAgIH0KKworICAgIEluc3BlY3RvclRlc3QucnVuVGVzdFN1aXRlKFsK KyAgICAgICAgZnVuY3Rpb24gdGVzdFNjcmlwdFNvdXJjZUNvZGVQcm92aWRlcihuZXh0KQorICAg ICAgICB7CisgICAgICAgICAgICB2YXIgbW9ja1NjcmlwdFNvdXJjZSA9ICJmdW5jdGlvbiBmb28o KSB7IHJldHVybiAwOyB9IjsKKyAgICAgICAgICAgIHZhciBtb2NrU2NyaXB0ID0gY3JlYXRlTW9j a1NjcmlwdCgiZm9vLmpzIiwgbW9ja1NjcmlwdFNvdXJjZSk7CisgICAgICAgICAgICB2YXIgc291 cmNlQ29kZVByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRTb3VyY2VDb2RlUHJvdmlk ZXIobW9ja1NjcmlwdCk7CisgICAgICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0Q29udGVudCht aW1lVHlwZSwgY29udGVudCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmFzc2VydEVxdWFscygidGV4dC9qYXZhc2NyaXB0IiwgbWltZVR5cGUpOworICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKG1vY2tTY3JpcHRTb3VyY2UsIGNv bnRlbnQpOworICAgICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIHNvdXJjZUNvZGVQcm92aWRlci5yZXF1ZXN0Q29udGVudChkaWRSZXF1ZXN0Q29udGVudCk7 CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24gdGVzdENvbmNhdGVuYXRlZFNjcmlwdHNT b3VyY2VDb2RlUHJvdmlkZXIobmV4dCkKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIHNjcmlw dHMgPSBbXTsKKyAgICAgICAgICAgIHNjcmlwdHMucHVzaChjcmVhdGVNb2NrU2NyaXB0KCJiYXou anMiLCAiXG5mdW5jdGlvbiBiYXooKVxue1xuICByZXR1cm4gMDtcbn1cbiIsIFszLCAyMF0pKTsK KyAgICAgICAgICAgIHNjcmlwdHMucHVzaChjcmVhdGVNb2NrU2NyaXB0KCJmb28uanMiLCAiZnVu Y3Rpb24gZm9vKCkgeyByZXR1cm4gMDsgfSIsIFsxLCAxMF0pKTsKKyAgICAgICAgICAgIHNjcmlw dHMucHVzaChjcmVhdGVNb2NrU2NyaXB0KCJiYXIuanMiLCAiZnVuY3Rpb24gYmFyKCkgeyByZXR1 cm4gMDsgfSIsIFsxLCA3MF0pKTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VDb2RlUHJvdmlkZXIg PSBuZXcgV2ViSW5zcGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNTb3VyY2VDb2RlUHJvdmlkZXIo c2NyaXB0cyk7CisgICAgICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0Q29udGVudChtaW1lVHlw ZSwgY29udGVudCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFzc2VydEVxdWFscygidGV4dC9odG1sIiwgbWltZVR5cGUpOworICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuYWRkUmVzdWx0KGNvbnRlbnQpOworICAgICAgICAgICAgICAgIG5leHQoKTsK KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHNvdXJjZUNvZGVQcm92aWRlci5yZXF1ZXN0Q29u dGVudChkaWRSZXF1ZXN0Q29udGVudCk7CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24g dGVzdFJlc291cmNlU291cmNlQ29kZVByb3ZpZGVyKG5leHQpCisgICAgICAgIHsKKyAgICAgICAg ICAgIHZhciBtb2NrUmVzb3VyY2VDb250ZW50ID0gIjxzY3JpcHQ+dmFyIHggPSAwOzwvIiArICJz Y3JpcHQ+IjsKKyAgICAgICAgICAgIHZhciBtb2NrUmVzb3VyY2UgPSB7CisgICAgICAgICAgICAg ICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlJlcXVlc3QgcmVz b3VyY2UgY29udGVudC4iKTsKKyAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2sobW9ja1Jlc291 cmNlQ29udGVudCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfTsKKyAgICAgICAg ICAgIHZhciBzb3VyY2VDb2RlUHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlU291 cmNlQ29kZVByb3ZpZGVyKG1vY2tSZXNvdXJjZSk7CisgICAgICAgICAgICBmdW5jdGlvbiBkaWRS ZXF1ZXN0Q29udGVudChtaW1lVHlwZSwgY29udGVudCkKKyAgICAgICAgICAgIHsKKyAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygidGV4dC9odG1sIiwgbWltZVR5cGUp OworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKG1vY2tSZXNvdXJj ZUNvbnRlbnQsIGNvbnRlbnQpOworICAgICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIHNvdXJjZUNvZGVQcm92aWRlci5yZXF1ZXN0Q29udGVudChkaWRSZXF1 ZXN0Q29udGVudCk7CisgICAgICAgIH0KKyAgICBdKTsKK307CisKKzwvc2NyaXB0PgorCis8L2hl YWQ+CisKKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzxwPlRlc3RzIFNvdXJjZUNvZGVQcm92 aWRlciBpbXBsZW1lbnRhdGlvbnMuPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGFmZWQ0NTY4ZmU0MjBkZGRmN2Q1NGRlZDQzOGFkNDg3NTViMzBhMTUuLmM3NmU1YzBlYzhkNmYy ODYxYzY2MmQwNzViYWQxMWE1NTBmZWNkNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAor MjAxMS0wOC0xNSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBleHRyYWN0IGNvbnRlbnQgbG9hZGluZyBmdW5jdGlvbnMg ZnJvbSBSYXdTb3VyY2VDb2RlIHRvIFNvdXJjZUNvZGVQcm92aWRlciBpbXBsZW1lbnRhdGlvbnMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjIzNwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGlu c3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtY29kZS1wcm92aWRlcnMuaHRtbAorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLl9sb2FkUmVzb3VyY2VDb250ZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5fbG9hZFNjcmlwdENvbnRlbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLl9sb2FkQW5k Q29uY2F0ZW5hdGVTY3JpcHRzQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNl Q29kZVByb3ZpZGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlUHJvdmlkZXIu cHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRT b3VyY2VDb2RlUHJvdmlkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFNvdXJjZUNv ZGVQcm92aWRlci5wcm90b3R5cGUucmVxdWVzdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNTb3VyY2VDb2RlUHJvdmlkZXIpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBl LnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25jYXRlbmF0ZWRTY3Jp cHRzU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZS5fY29uY2F0ZW5hdGVTY3JpcHRzQ29udGVu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VDb2RlUHJvdmlkZXIpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlw ZS5yZXF1ZXN0Q29udGVudCk6CisKIDIwMTEtMDgtMTIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBnb29nbGUuY29tPgogCiAgICAgICAgIE5vdCByZXZpZXdlZDogZm9sbG93IHVwIHRvIGluc3Bl Y3RvciB0ZXN0IGJyZWFrYWdlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VGaWxlLmpzCmluZGV4IGZiYjk1MDEzMGVjNjBiZGU5YTYzNGIyNGY2YWQwM2Q1 YTE3NTNhYjcuLjA0Y2VkOTU3ODc0ZmMzMjk5ZGM5NzIzMjdmNzkyYTg1YTI4ZWI5ZDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKQEAg LTE4OSw4MiArMTg5LDI0IEBAIFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZSA9 IHsKIAogICAgIF9sb2FkUmVzb3VyY2VDb250ZW50OiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7 Ci0gICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RDb250ZW50KHRleHQpCi0gICAgICAgIHsKLSAg ICAgICAgICAgIGlmICghdGV4dCkgewotICAgICAgICAgICAgICAgIHRoaXMuX2xvYWRBbmRDb25j YXRlbmF0ZVNjcmlwdHNDb250ZW50KCk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAgICAgfQotCi0gICAgICAgICAgICB2YXIgbWltZVR5cGUgPSByZXNvdXJjZS50eXBlID09PSBX ZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5TY3JpcHQgPyAidGV4dC9qYXZhc2NyaXB0IiA6ICJ0 ZXh0L2h0bWwiOwotICAgICAgICAgICAgdGhpcy5fZGlkUmVxdWVzdENvbnRlbnQobWltZVR5cGUs IHRleHQpOwotICAgICAgICB9Ci0gICAgICAgIHJlc291cmNlLnJlcXVlc3RDb250ZW50KGRpZFJl cXVlc3RDb250ZW50LmJpbmQodGhpcykpOworICAgICAgICB2YXIgc291cmNlQ29kZVByb3ZpZGVy ID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUNvZGVQcm92aWRlcihyZXNvdXJjZSk7 CisgICAgICAgIHNvdXJjZUNvZGVQcm92aWRlci5yZXF1ZXN0Q29udGVudCh0aGlzLl9kaWRSZXF1 ZXN0Q29udGVudC5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgX2xvYWRTY3JpcHRDb250ZW50 OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9zY3JpcHRzWzBdLnJlcXVlc3RTb3Vy Y2UodGhpcy5fZGlkUmVxdWVzdENvbnRlbnQuYmluZCh0aGlzLCAidGV4dC9qYXZhc2NyaXB0Iikp OworICAgICAgICB2YXIgc291cmNlQ29kZVByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5TY3Jp cHRTb3VyY2VDb2RlUHJvdmlkZXIodGhpcy5fc2NyaXB0c1swXSk7CisgICAgICAgIHNvdXJjZUNv ZGVQcm92aWRlci5yZXF1ZXN0Q29udGVudCh0aGlzLl9kaWRSZXF1ZXN0Q29udGVudC5iaW5kKHRo aXMpKTsKICAgICB9LAogCiAgICAgX2xvYWRBbmRDb25jYXRlbmF0ZVNjcmlwdHNDb250ZW50OiBm dW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0cyA9IHRoaXMuX3NjcmlwdHMuc2xp Y2UoKTsKLSAgICAgICAgc2NyaXB0cy5zb3J0KGZ1bmN0aW9uKHgsIHkpIHsgcmV0dXJuIHgubGlu ZU9mZnNldCAtIHkubGluZU9mZnNldCB8fCB4LmNvbHVtbk9mZnNldCAtIHkuY29sdW1uT2Zmc2V0 OyB9KTsKLSAgICAgICAgdmFyIHNvdXJjZXMgPSBbXTsKLSAgICAgICAgZnVuY3Rpb24gZGlkUmVx dWVzdFNvdXJjZShzb3VyY2UpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHNvdXJjZXMucHVzaChz b3VyY2UpOwotICAgICAgICAgICAgaWYgKHNvdXJjZXMubGVuZ3RoIDwgc2NyaXB0cy5sZW5ndGgp Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgaWYgKHNjcmlwdHMubGVuZ3Ro ID09PSAxICYmICFzY3JpcHRzWzBdLmxpbmVPZmZzZXQgJiYgIXNjcmlwdHNbMF0uY29sdW1uT2Zm c2V0KQotICAgICAgICAgICAgICAgIHRoaXMuX2RpZFJlcXVlc3RDb250ZW50KCJ0ZXh0L2phdmFz Y3JpcHQiLCBzb3VyY2UpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHRoaXMu X2NvbmNhdGVuYXRlU2NyaXB0c0NvbnRlbnQoc2NyaXB0cywgc291cmNlcyk7Ci0gICAgICAgIH0K LSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY3JpcHRzLmxlbmd0aDsgKytpKQotICAgICAg ICAgICAgc2NyaXB0c1tpXS5yZXF1ZXN0U291cmNlKGRpZFJlcXVlc3RTb3VyY2UuYmluZCh0aGlz KSk7Ci0gICAgfSwKLQotICAgIF9jb25jYXRlbmF0ZVNjcmlwdHNDb250ZW50OiBmdW5jdGlvbihz Y3JpcHRzLCBzb3VyY2VzKQotICAgIHsKLSAgICAgICAgdmFyIGNvbnRlbnQgPSAiIjsKLSAgICAg ICAgdmFyIGxpbmVOdW1iZXIgPSAwOwotICAgICAgICB2YXIgY29sdW1uTnVtYmVyID0gMDsKLSAg ICAgICAgdmFyIHNjcmlwdFJhbmdlcyA9IFtdOwotICAgICAgICBmdW5jdGlvbiBhcHBlbmRDaHVu ayhjaHVuaywgc2NyaXB0KQotICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgc3RhcnQgPSB7IGxp bmVOdW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07Ci0gICAg ICAgICAgICBjb250ZW50ICs9IGNodW5rOwotICAgICAgICAgICAgdmFyIGxpbmVFbmRpbmdzID0g Y2h1bmsubGluZUVuZGluZ3MoKTsKLSAgICAgICAgICAgIHZhciBsaW5lQ291bnQgPSBsaW5lRW5k aW5ncy5sZW5ndGg7Ci0gICAgICAgICAgICBpZiAobGluZUNvdW50ID09PSAxKQotICAgICAgICAg ICAgICAgIGNvbHVtbk51bWJlciArPSBjaHVuay5sZW5ndGg7Ci0gICAgICAgICAgICBlbHNlIHsK LSAgICAgICAgICAgICAgICBsaW5lTnVtYmVyICs9IGxpbmVDb3VudCAtIDE7Ci0gICAgICAgICAg ICAgICAgY29sdW1uTnVtYmVyID0gbGluZUVuZGluZ3NbbGluZUNvdW50IC0gMV0gLSBsaW5lRW5k aW5nc1tsaW5lQ291bnQgLSAyXSAtIDE7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICB2YXIg ZW5kID0geyBsaW5lTnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVtbk51bWJl ciB9OwotICAgICAgICAgICAgaWYgKHNjcmlwdCkKLSAgICAgICAgICAgICAgICBzY3JpcHRSYW5n ZXMucHVzaCh7IHN0YXJ0OiBzdGFydCwgZW5kOiBlbmQsIHNjcmlwdElkOiBzY3JpcHQuc2NyaXB0 SWQgfSk7Ci0gICAgICAgIH0KLQotICAgICAgICB2YXIgc2NyaXB0T3BlblRhZyA9ICI8c2NyaXB0 PiI7Ci0gICAgICAgIHZhciBzY3JpcHRDbG9zZVRhZyA9ICI8L3NjcmlwdD4iOwotICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHNjcmlwdHMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIC8v IEZpbGwgdGhlIGdhcCB3aXRoIHdoaXRlc3BhY2UgY2hhcmFjdGVycy4KLSAgICAgICAgICAgIHdo aWxlIChsaW5lTnVtYmVyIDwgc2NyaXB0c1tpXS5saW5lT2Zmc2V0KQotICAgICAgICAgICAgICAg IGFwcGVuZENodW5rKCJcbiIpOwotICAgICAgICAgICAgd2hpbGUgKGNvbHVtbk51bWJlciA8IHNj cmlwdHNbaV0uY29sdW1uT2Zmc2V0IC0gc2NyaXB0T3BlblRhZy5sZW5ndGgpCi0gICAgICAgICAg ICAgICAgYXBwZW5kQ2h1bmsoIiAiKTsKLQotICAgICAgICAgICAgLy8gQWRkIHNjcmlwdCB0YWcu Ci0gICAgICAgICAgICBhcHBlbmRDaHVuayhzY3JpcHRPcGVuVGFnKTsKLSAgICAgICAgICAgIGFw cGVuZENodW5rKHNvdXJjZXNbaV0sIHNjcmlwdHNbaV0pOwotICAgICAgICAgICAgYXBwZW5kQ2h1 bmsoc2NyaXB0Q2xvc2VUYWcpOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5fZGlkUmVxdWVz dENvbnRlbnQoInRleHQvaHRtbCIsIGNvbnRlbnQpOworICAgICAgICB2YXIgc291cmNlQ29kZVBy b3ZpZGVyOworICAgICAgICBpZiAodGhpcy5fc2NyaXB0cy5sZW5ndGggPT09IDEgJiYgIXRoaXMu X3NjcmlwdHNbMF0ubGluZU9mZnNldCAmJiAhdGhpcy5fc2NyaXB0c1swXS5jb2x1bW5PZmZzZXQp CisgICAgICAgICAgICBzb3VyY2VDb2RlUHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlw dFNvdXJjZUNvZGVQcm92aWRlcih0aGlzLl9zY3JpcHRzWzBdKTsKKyAgICAgICAgZWxzZQorICAg ICAgICAgICAgc291cmNlQ29kZVByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5Db25jYXRlbmF0 ZWRTY3JpcHRzU291cmNlQ29kZVByb3ZpZGVyKHRoaXMuX3NjcmlwdHMpOworICAgICAgICBzb3Vy Y2VDb2RlUHJvdmlkZXIucmVxdWVzdENvbnRlbnQodGhpcy5fZGlkUmVxdWVzdENvbnRlbnQuYmlu ZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF9kaWRSZXF1ZXN0Q29udGVudDogZnVuY3Rpb24obWlt ZVR5cGUsIGNvbnRlbnQpCkBAIC0zMDQsMyArMjQ2LDEyMiBAQCBXZWJJbnNwZWN0b3IuUmF3U291 cmNlQ29kZS5wcm90b3R5cGUgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnBy b3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKKworCitX ZWJJbnNwZWN0b3IuU291cmNlQ29kZVByb3ZpZGVyID0gZnVuY3Rpb24oKQoreworfQorCitXZWJJ bnNwZWN0b3IuU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZSA9IHsKKyAgICByZXF1ZXN0Q29u dGVudDogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAgICAvLyBTaG91bGQgYmUgaW1w bGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KKyAgICB9Cit9CisKKworV2ViSW5zcGVjdG9yLlNjcmlw dFNvdXJjZUNvZGVQcm92aWRlciA9IGZ1bmN0aW9uKHNjcmlwdCkKK3sKKyAgICB0aGlzLl9taW1l VHlwZSA9ICJ0ZXh0L2phdmFzY3JpcHQiOworICAgIHRoaXMuX3NjcmlwdCA9IHNjcmlwdDsKK307 CisKK1dlYkluc3BlY3Rvci5TY3JpcHRTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlID0gewor cmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQoreworICAgIGZ1bmN0aW9uIGRpZFJl cXVlc3RTb3VyY2Uoc291cmNlKQorICAgIHsKKyAgICAgICAgY2FsbGJhY2sodGhpcy5fbWltZVR5 cGUsIHNvdXJjZSk7CisgICAgfQorICAgIHRoaXMuX3NjcmlwdC5yZXF1ZXN0U291cmNlKGRpZFJl cXVlc3RTb3VyY2UuYmluZCh0aGlzKSk7Cit9Cit9CisKK1dlYkluc3BlY3Rvci5TY3JpcHRTb3Vy Y2VDb2RlUHJvdmlkZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VD b2RlUHJvdmlkZXIucHJvdG90eXBlOworCisKK1dlYkluc3BlY3Rvci5Db25jYXRlbmF0ZWRTY3Jp cHRzU291cmNlQ29kZVByb3ZpZGVyID0gZnVuY3Rpb24oc2NyaXB0cykKK3sKKyAgICB0aGlzLl9t aW1lVHlwZSA9ICJ0ZXh0L2h0bWwiOworICAgIHRoaXMuX3NjcmlwdHMgPSBzY3JpcHRzOworfTsK KworV2ViSW5zcGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNTb3VyY2VDb2RlUHJvdmlkZXIucHJv dG90eXBlID0geworICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgewor ICAgICAgIHZhciBzY3JpcHRzID0gdGhpcy5fc2NyaXB0cy5zbGljZSgpOworICAgICAgIHNjcmlw dHMuc29ydChmdW5jdGlvbih4LCB5KSB7IHJldHVybiB4LmxpbmVPZmZzZXQgLSB5LmxpbmVPZmZz ZXQgfHwgeC5jb2x1bW5PZmZzZXQgLSB5LmNvbHVtbk9mZnNldDsgfSk7CisgICAgICAgdmFyIHNv dXJjZXMgPSBbXTsKKyAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0U291cmNlKHNvdXJjZSkKKyAg ICAgICB7CisgICAgICAgICAgIHNvdXJjZXMucHVzaChzb3VyY2UpOworICAgICAgICAgICBpZiAo c291cmNlcy5sZW5ndGggPT0gc2NyaXB0cy5sZW5ndGgpCisgICAgICAgICAgICAgICBjYWxsYmFj ayh0aGlzLl9taW1lVHlwZSwgdGhpcy5fY29uY2F0ZW5hdGVTY3JpcHRzQ29udGVudChzY3JpcHRz LCBzb3VyY2VzKSk7CisgICAgICAgfQorICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2NyaXB0 cy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgc2NyaXB0c1tpXS5yZXF1ZXN0U291cmNlKGRpZFJl cXVlc3RTb3VyY2UuYmluZCh0aGlzKSk7CisgICB9LAorCisgICBfY29uY2F0ZW5hdGVTY3JpcHRz Q29udGVudDogZnVuY3Rpb24oc2NyaXB0cywgc291cmNlcykKKyAgIHsKKyAgICAgICB2YXIgY29u dGVudCA9ICIiOworICAgICAgIHZhciBsaW5lTnVtYmVyID0gMDsKKyAgICAgICB2YXIgY29sdW1u TnVtYmVyID0gMDsKKyAgICAgICB2YXIgc2NyaXB0UmFuZ2VzID0gW107CisgICAgICAgZnVuY3Rp b24gYXBwZW5kQ2h1bmsoY2h1bmssIHNjcmlwdCkKKyAgICAgICB7CisgICAgICAgICAgIHZhciBz dGFydCA9IHsgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVyOiBjb2x1bW5OdW1i ZXIgfTsKKyAgICAgICAgICAgY29udGVudCArPSBjaHVuazsKKyAgICAgICAgICAgdmFyIGxpbmVF bmRpbmdzID0gY2h1bmsubGluZUVuZGluZ3MoKTsKKyAgICAgICAgICAgdmFyIGxpbmVDb3VudCA9 IGxpbmVFbmRpbmdzLmxlbmd0aDsKKyAgICAgICAgICAgaWYgKGxpbmVDb3VudCA9PT0gMSkKKyAg ICAgICAgICAgICAgIGNvbHVtbk51bWJlciArPSBjaHVuay5sZW5ndGg7CisgICAgICAgICAgIGVs c2UgeworICAgICAgICAgICAgICAgbGluZU51bWJlciArPSBsaW5lQ291bnQgLSAxOworICAgICAg ICAgICAgICAgY29sdW1uTnVtYmVyID0gbGluZUVuZGluZ3NbbGluZUNvdW50IC0gMV0gLSBsaW5l RW5kaW5nc1tsaW5lQ291bnQgLSAyXSAtIDE7CisgICAgICAgICAgIH0KKyAgICAgICAgICAgdmFy IGVuZCA9IHsgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVyOiBjb2x1bW5OdW1i ZXIgfTsKKyAgICAgICAgICAgaWYgKHNjcmlwdCkKKyAgICAgICAgICAgICAgIHNjcmlwdFJhbmdl cy5wdXNoKHsgc3RhcnQ6IHN0YXJ0LCBlbmQ6IGVuZCwgc291cmNlSWQ6IHNjcmlwdC5zb3VyY2VJ ZCB9KTsKKyAgICAgICB9CisKKyAgICAgICB2YXIgc2NyaXB0T3BlblRhZyA9ICI8c2NyaXB0PiI7 CisgICAgICAgdmFyIHNjcmlwdENsb3NlVGFnID0gIjwvc2NyaXB0PiI7CisgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBzY3JpcHRzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgIC8vIEZpbGwg dGhlIGdhcCB3aXRoIHdoaXRlc3BhY2UgY2hhcmFjdGVycy4KKyAgICAgICAgICAgd2hpbGUgKGxp bmVOdW1iZXIgPCBzY3JpcHRzW2ldLmxpbmVPZmZzZXQpCisgICAgICAgICAgICAgICBhcHBlbmRD aHVuaygiXG4iKTsKKyAgICAgICAgICAgd2hpbGUgKGNvbHVtbk51bWJlciA8IHNjcmlwdHNbaV0u Y29sdW1uT2Zmc2V0IC0gc2NyaXB0T3BlblRhZy5sZW5ndGgpCisgICAgICAgICAgICAgICBhcHBl bmRDaHVuaygiICIpOworCisgICAgICAgICAgIC8vIEFkZCBzY3JpcHQgdGFnLgorICAgICAgICAg ICBhcHBlbmRDaHVuayhzY3JpcHRPcGVuVGFnKTsKKyAgICAgICAgICAgYXBwZW5kQ2h1bmsoc291 cmNlc1tpXSwgc2NyaXB0c1tpXSk7CisgICAgICAgICAgIGFwcGVuZENodW5rKHNjcmlwdENsb3Nl VGFnKTsKKyAgICAgICB9CisKKyAgICAgICByZXR1cm4gY29udGVudDsKKyAgIH0KK30KKworV2Vi SW5zcGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBl Ll9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlOwor CisKK1dlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUNvZGVQcm92aWRlciA9IGZ1bmN0aW9uKHJl c291cmNlKQoreworICAgIHRoaXMuX21pbWVUeXBlID0gcmVzb3VyY2UudHlwZSA9PT0gV2ViSW5z cGVjdG9yLlJlc291cmNlLlR5cGUuU2NyaXB0ID8gInRleHQvamF2YXNjcmlwdCIgOiAidGV4dC9o dG1sIjsKKyAgICB0aGlzLl9yZXNvdXJjZSA9IHJlc291cmNlOworfTsKKworV2ViSW5zcGVjdG9y LlJlc291cmNlU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZSA9IHsKKyAgICByZXF1ZXN0Q29u dGVudDogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAgICBmdW5jdGlvbiBkaWRSZXF1 ZXN0Q29udGVudChjb250ZW50KQorICAgICAgICB7CisgICAgICAgICAgICBjYWxsYmFjayh0aGlz Ll9taW1lVHlwZSwgY29udGVudCk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fcmVzb3VyY2Uu cmVxdWVzdENvbnRlbnQoZGlkUmVxdWVzdENvbnRlbnQuYmluZCh0aGlzKSk7CisgICAgfQorfQor CitXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlLl9fcHJv dG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlOwo=