108673 2013-02-01 11:59:23 -0800 Clean up WebArchive loading with the NetworkProcess 2013-02-01 13:20:12 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson japhet webkit.review.bot oldest_to_newest 823087 0 beidson 2013-02-01 11:59:23 -0800 Clean up WebArchive loading with the NetworkProcess In radar as <rdar://problem/12695840> 823098 1 186099 beidson 2013-02-01 12:05:23 -0800 Created attachment 186099 Patch v1 823133 2 186099 ap 2013-02-01 12:33:04 -0800 Comment on attachment 186099 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=186099&action=review > Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp:91 > + // If the DocumentLoader schedule's this as an archive resource load, then we should remember the ResourceLoader I'm not sure if this parses. Should it say "schedules", not "schedule's"? 823186 3 beidson 2013-02-01 13:20:12 -0800 http://trac.webkit.org/changeset/141635 186099 2013-02-01 12:05:23 -0800 2013-02-01 12:33:04 -0800 Patch v1 patch text/plain 8964 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NmE0ZTIyLi4xZDBiMzVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTMtMDItMDEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIENsZWFuIHVwIFdlYkFyY2hpdmUgbG9hZGluZyB3aXRoIHRoZSBOZXR3b3JrUHJvY2Vzcwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTI2OTU4NDA+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4NjczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChObyBjaGFuZ2UgaW4gV2ViQ29yZSBi ZWhhdmlvcikuCisKKyAgICAgICAgUmVtb3ZlIGEgbm93IHVubmVlZGVkIGZ1bmN0aW9uIGFuZCBh ZGQgYSBuZWVkZWQgZXhwb3J0LgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAg ICogbG9hZGVyL1Jlc291cmNlTG9hZFNjaGVkdWxlci5jcHA6CisgICAgICAgICogbG9hZGVyL1Jl c291cmNlTG9hZFNjaGVkdWxlci5oOgorCisyMDEzLTAyLTAxICBCcmFkeSBFaWRzb24gIDxiZWlk c29uQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgcGFyYW1ldGVyIGZy b20gRG9jdW1lbnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODY1NAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CmluZGV4IDA1MDAwNDAuLmQzMmY2NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0yNjEsNiAr MjYxLDcgQEAgX19aTjdXZWJDb3JlMjFTZXJpYWxpemVkU2NyaXB0VmFsdWU2Y3JlYXRlRVBOM0pT QzlFeGVjU3RhdGVFTlMxXzdKU1ZhbHVlRVBOM1dURjYKIF9fWk43V2ViQ29yZTIxU2VyaWFsaXpl ZFNjcmlwdFZhbHVlNmNyZWF0ZUVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTIxU2VyaWFs aXplZFNjcmlwdFZhbHVlQzFFUk4zV1RGNlZlY3RvckloTG0wRUVFCiBfX1pON1dlYkNvcmU0dG9K U0VQTjNKU0M5RXhlY1N0YXRlRVBOU18xN0pTRE9NR2xvYmFsT2JqZWN0RVBOM1dURjExQXJyYXlC dWZmZXJFCitfX1pON1dlYkNvcmUxNERvY3VtZW50TG9hZGVyMTlzY2hlZHVsZUFyY2hpdmVMb2Fk RVBOU18xNFJlc291cmNlTG9hZGVyRVJLTlNfMTVSZXNvdXJjZVJlcXVlc3RFCiBfX1pON1dlYkNv cmUxNERvY3VtZW50TG9hZGVyMjFhZGRQbHVnSW5TdHJlYW1Mb2FkZXJFUE5TXzE0UmVzb3VyY2VM b2FkZXJFCiBfX1pON1dlYkNvcmUxNERvY3VtZW50TG9hZGVyMjJhZGRBbGxBcmNoaXZlUmVzb3Vy Y2VzRVBOU183QXJjaGl2ZUUKIF9fWk43V2ViQ29yZTE0RG9jdW1lbnRMb2FkZXIyMmNhbmNlbE1h aW5SZXNvdXJjZUxvYWRFUktOU18xM1Jlc291cmNlRXJyb3JFCkBAIC02MDEsNyArNjAyLDYgQEAg X19aTjdXZWJDb3JlMjFCYWNrRm9yd2FyZENvbnRyb2xsZXIxMWl0ZW1BdEluZGV4RWkKIF9fWk43 V2ViQ29yZTIxTWVtb3J5UHJlc3N1cmVIYW5kbGVyN2luc3RhbGxFdgogX19aTjdXZWJDb3JlMjFO ZXR3b3JrU3RvcmFnZVNlc3Npb24yOGNyZWF0ZVByaXZhdGVCcm93c2luZ1Nlc3Npb25FUktOM1dU RjZTdHJpbmdFCiBfX1pON1dlYkNvcmUyMVBsYXRmb3JtS2V5Ym9hcmRFdmVudDI0ZGlzYW1iaWd1 YXRlS2V5RG93bkV2ZW50RU5TXzEzUGxhdGZvcm1FdmVudDRUeXBlRWIKLV9fWk43V2ViQ29yZTIx UmVzb3VyY2VMb2FkU2NoZWR1bGVyMTlzdGFydFJlc291cmNlTG9hZGVyRVBOU18xNFJlc291cmNl TG9hZGVyRQogX19aTjdXZWJDb3JlMjFSZXNvdXJjZUxvYWRTY2hlZHVsZXIyMHNlcnZlUGVuZGlu Z1JlcXVlc3RzRU5TXzIwUmVzb3VyY2VMb2FkUHJpb3JpdHlFCiBfX1pON1dlYkNvcmUyMVJlc291 cmNlTG9hZFNjaGVkdWxlcjIwc2VydmVQZW5kaW5nUmVxdWVzdHNFUE5TMF8xNUhvc3RJbmZvcm1h dGlvbkVOU18yMFJlc291cmNlTG9hZFByaW9yaXR5RQogX19aTjdXZWJDb3JlMjFSZXNvdXJjZUxv YWRTY2hlZHVsZXIyMXJlc3VtZVBlbmRpbmdSZXF1ZXN0c0V2CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwCmluZGV4IGZhM2MwOTYuLmI0Y2RhMWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3Bw CkBAIC0zMzIsMTAgKzMzMiw0IEBAIGJvb2wgUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpIb3N0SW5m b3JtYXRpb246OmxpbWl0UmVxdWVzdHMoUmVzb3VyY2VMb2FkUHJpb3JpdHkKICAgICByZXR1cm4g bV9yZXF1ZXN0c0xvYWRpbmcuc2l6ZSgpID49IChyZXNvdXJjZUxvYWRTY2hlZHVsZXIoKS0+aXNT ZXJpYWxMb2FkaW5nRW5hYmxlZCgpID8gMSA6IG1fbWF4UmVxdWVzdHNJbkZsaWdodCk7CiB9CiAK LXZvaWQgUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzdGFydFJlc291cmNlTG9hZGVyKFJlc291cmNl TG9hZGVyKiBsb2FkZXIpCi17Ci0gICAgQVNTRVJUKGxvYWRlcik7Ci0gICAgbG9hZGVyLT5zdGFy dCgpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgKaW5kZXggY2M0OGZjNS4uMmExZTQxMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFNjaGVkdWxlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIuaApAQCAtNjYsNyAr NjYsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgUmVzb3VyY2VMb2FkU2NoZWR1bGVyKCk7CiAgICAgdmly dHVhbCB+UmVzb3VyY2VMb2FkU2NoZWR1bGVyKCk7CiAKLSAgICB2b2lkIHN0YXJ0UmVzb3VyY2VM b2FkZXIoUmVzb3VyY2VMb2FkZXIqKTsKICAgICB2b2lkIG5vdGlmeURpZFNjaGVkdWxlUmVzb3Vy Y2VSZXF1ZXN0KFJlc291cmNlTG9hZGVyKik7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDRk YjUzYi4uY2IwOTY4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAyLTAxICBC cmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBXZWJB cmNoaXZlIGxvYWRpbmcgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzEyNjk1ODQwPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwODY3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvSG9zdFJlY29yZC5jcHA6CisgICAgICAgIChXZWJLaXQ6Okhv c3RSZWNvcmQ6OnNlcnZlUGVuZGluZ1JlcXVlc3RzRm9yUXVldWUpOiAgQWRkIG5ldyBsb2dnaW5n LgorICAgICAgICAoV2ViS2l0OjpIb3N0UmVjb3JkOjpzZXJ2ZVBlbmRpbmdSZXF1ZXN0cyk6IFR3 ZWFrIGV4aXN0aW5nIGxvZ2dpbmcuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291 cmNlTG9hZFNjaGVkdWxlcjo6c2VydmVQZW5kaW5nUmVxdWVzdHMpOiBUd2VhayBleGlzdGluZyBs b2dnaW5nLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNj aGVkdWxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6 c2NoZWR1bGVMb2FkKTogSGFuZGxlIGFyY2hpdmUgcmVzb3VyY2Ugc2NoZWR1bGluZyBiZXR0ZXIs CisgICAgICAgICAgYW5kIGFkZCBuZXcgbG9nZ2luZyB0byBiZXR0ZXIgZXhwbG9yZSBhcmNoaXZl IGxvYWRpbmcgYmVoYXZpb3IgaW4gdGhlIGZ1dHVyZS4KKwogMjAxMy0wMi0wMSAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRhcHQg V29ya1F1ZXVlR3RrIHRvIHRoZSBsYXRlc3QgY2hhbmdlcyBpbiBXZWJLaXQyIGFmdGVyIHIxNDE0 OTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0hvc3RSZWNvcmQu Y3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvSG9zdFJlY29yZC5jcHAKaW5kZXgg NDg3OGU1OC4uMDc3NWQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvSG9zdFJlY29yZC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvSG9z dFJlY29yZC5jcHAKQEAgLTE0NiwxMyArMTQ2LDE0IEBAIHZvaWQgSG9zdFJlY29yZDo6c2VydmVQ ZW5kaW5nUmVxdWVzdHNGb3JRdWV1ZShMb2FkZXJRdWV1ZSYgcXVldWUsIFJlc291cmNlTG9hZFBy CiAgICAgICAgIG1fbG9hZGVyc0luUHJvZ3Jlc3MuYWRkKGxvYWRlcik7CiAgICAgICAgIHF1ZXVl LnJlbW92ZUZpcnN0KCk7CiAKKyAgICAgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5nLCAiKE5ldHdv cmtQcm9jZXNzKSBIb3N0UmVjb3JkOjpzZXJ2ZVBlbmRpbmdSZXF1ZXN0c0ZvclF1ZXVlIC0gU3Rh cnRpbmcgbG9hZCBvZiAlc1xuIiwgbG9hZGVyLT5yZXF1ZXN0KCkudXJsKCkuc3RyaW5nKCkudXRm OCgpLmRhdGEoKSk7CiAgICAgICAgIGxvYWRlci0+c3RhcnQoKTsKICAgICB9CiB9CiAKIHZvaWQg SG9zdFJlY29yZDo6c2VydmVQZW5kaW5nUmVxdWVzdHMoUmVzb3VyY2VMb2FkUHJpb3JpdHkgbWlu aW11bVByaW9yaXR5KQogewotICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywgIkhvc3RSZWNvcmQ6 OnNlcnZlUGVuZGluZ1JlcXVlc3RzIEhvc3QgbmFtZT0nJXMnIiwgbmFtZSgpLnV0ZjgoKS5kYXRh KCkpOworICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywgIihOZXR3b3JrUHJvY2VzcykgSG9zdFJl Y29yZDo6c2VydmVQZW5kaW5nUmVxdWVzdHMgSG9zdCBuYW1lPSclcyciLCBuYW1lKCkudXRmOCgp LmRhdGEoKSk7CiAKICAgICAvLyBXZSBzZXJ2ZSBzeW5jaHJvbm91cyByZXF1ZXN0cyBiZWZvcmUg YW55IG90aGVyIHJlcXVlc3RzIHRvIGltcHJvdmUgcmVzcG9uc2l2ZW5lc3MgaW4gYW55CiAgICAg Ly8gV2ViUHJvY2VzcyB0aGF0IGlzIHdhaXRpbmcgb24gYSBzeW5jaHJvbm91cyBsb2FkLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9h ZFNjaGVkdWxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkU2NoZWR1bGVyLmNwcAppbmRleCAyNWNkMDNmLi44YzMzMzJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1 bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkU2NoZWR1bGVyLmNwcApAQCAtMTE3LDcgKzExNyw3IEBAIHZvaWQgTmV0d29ya1Jlc291 cmNlTG9hZFNjaGVkdWxlcjo6cmVjZWl2ZWRSZWRpcmVjdChTY2hlZHVsYWJsZUxvYWRlciogbG9h ZGVyLCBjCiAKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlcjo6c2VydmVQZW5kaW5n UmVxdWVzdHMoUmVzb3VyY2VMb2FkUHJpb3JpdHkgbWluaW11bVByaW9yaXR5KQogewotICAgIExP RyhOZXR3b3JrU2NoZWR1bGluZywgIihOZXR3b3JrUHJvY2VzcykgTmV0d29ya1Jlc291cmNlTG9h ZFNjaGVkdWxlcjo6c2VydmVQZW5kaW5nUmVxdWVzdHMgU2VydmluZyByZXF1ZXN0cyBmb3IgdXAg dG8gJWkgaG9zdHMiLCBtX2hvc3RzLnNpemUoKSk7CisgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5n LCAiKE5ldHdvcmtQcm9jZXNzKSBOZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzZXJ2ZVBl bmRpbmdSZXF1ZXN0cyBTZXJ2aW5nIHJlcXVlc3RzIGZvciB1cCB0byAlaSBob3N0cyB3aXRoIG1p bmltdW0gcHJpb3JpdHkgJWkiLCBtX2hvc3RzLnNpemUoKSwgbWluaW11bVByaW9yaXR5KTsKIAog ICAgIG1fcmVxdWVzdFRpbWVyLnN0b3AoKTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5j cHAKaW5kZXggNmZkYTg4OC4uYzRkODdkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAK QEAgLTgxLDggKzgxLDYgQEAgUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcj4g V2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzY2hlZHVsZVBsdWdpblMKIAogdm9pZCBXZWJSZXNv dXJjZUxvYWRTY2hlZHVsZXI6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciogcmVzb3VyY2VM b2FkZXIsIFJlc291cmNlTG9hZFByaW9yaXR5IHByaW9yaXR5KQogewotICAgIExPRyhOZXR3b3Jr U2NoZWR1bGluZywgIihXZWJQcm9jZXNzKSBXZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OnNjaGVk dWxlTG9hZCwgdXJsICclcycgcHJpb3JpdHkgJWkiLCByZXNvdXJjZUxvYWRlci0+dXJsKCkuc3Ry aW5nKCkudXRmOCgpLmRhdGEoKSwgcHJpb3JpdHkpOwotCiAgICAgQVNTRVJUKHJlc291cmNlTG9h ZGVyKTsKICAgICBBU1NFUlQocHJpb3JpdHkgIT0gUmVzb3VyY2VMb2FkUHJpb3JpdHlVbnJlc29s dmVkKTsKICAgICBwcmlvcml0eSA9IFJlc291cmNlTG9hZFByaW9yaXR5SGlnaGVzdDsKQEAgLTkw LDE1ICs4OCwxNiBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVMb2Fk KFJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciwgUmVzbwogICAgIFJlc291cmNlTG9hZElk ZW50aWZpZXIgaWRlbnRpZmllciA9IHJlc291cmNlTG9hZGVyLT5pZGVudGlmaWVyKCk7CiAgICAg QVNTRVJUKGlkZW50aWZpZXIpOwogCi0gICAgLy8gSWYgdGhlcmUncyBhIHdlYiBhcmNoaXZlIHJl c291cmNlIGZvciB0aGlzIFVSTCwgd2UgZG9uJ3QgbmVlZCB0byBzY2hlZHVsZSB0aGUgbG9hZCBz aW5jZSBpdCB3aWxsIG5ldmVyIHRvdWNoIHRoZSBuZXR3b3JrLgotICAgIGlmIChyZXNvdXJjZUxv YWRlci0+ZG9jdW1lbnRMb2FkZXIoKS0+YXJjaGl2ZVJlc291cmNlRm9yVVJMKHJlc291cmNlTG9h ZGVyLT5yZXF1ZXN0KCkudXJsKCkpKSB7CisgICAgLy8gSWYgdGhlIERvY3VtZW50TG9hZGVyIHNj aGVkdWxlJ3MgdGhpcyBhcyBhbiBhcmNoaXZlIHJlc291cmNlIGxvYWQsIHRoZW4gd2Ugc2hvdWxk IHJlbWVtYmVyIHRoZSBSZXNvdXJjZUxvYWRlcgorICAgIC8vIGluIG91ciByZWNvcmRzIGJ1dCBu b3Qgc2NoZWR1bGUgaXQgaW4gdGhlIE5ldHdvcmtQcm9jZXNzLgorICAgIGlmIChyZXNvdXJjZUxv YWRlci0+ZG9jdW1lbnRMb2FkZXIoKS0+c2NoZWR1bGVBcmNoaXZlTG9hZChyZXNvdXJjZUxvYWRl ciwgcmVzb3VyY2VMb2FkZXItPnJlcXVlc3QoKSkpIHsKKyAgICAgICAgTE9HKE5ldHdvcmtTY2hl ZHVsaW5nLCAiKFdlYlByb2Nlc3MpIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVM b2FkLCB1cmwgJyVzJyB3aWxsIGJlIGhhbmRsZWQgYXMgYW4gYXJjaGl2ZSByZXNvdXJjZS4iLCBy ZXNvdXJjZUxvYWRlci0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIG1f d2ViUmVzb3VyY2VMb2FkZXJzLnNldChpZGVudGlmaWVyLCBXZWJSZXNvdXJjZUxvYWRlcjo6Y3Jl YXRlKHJlc291cmNlTG9hZGVyKSk7Ci0gICAgICAgIHN0YXJ0UmVzb3VyY2VMb2FkZXIocmVzb3Vy Y2VMb2FkZXIpOwotCiAgICAgICAgIHJldHVybjsKICAgICB9Ci0KICAgICAKKyAgICBMT0coTmV0 d29ya1NjaGVkdWxpbmcsICIoV2ViUHJvY2VzcykgV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpz Y2hlZHVsZUxvYWQsIHVybCAnJXMnIHdpbGwgYmUgc2NoZWR1bGVkIHdpdGggdGhlIE5ldHdvcmtQ cm9jZXNzIHdpdGggcHJpb3JpdHkgJWkiLCByZXNvdXJjZUxvYWRlci0+dXJsKCkuc3RyaW5nKCku dXRmOCgpLmRhdGEoKSwgcHJpb3JpdHkpOworCiAgICAgQ29udGVudFNuaWZmaW5nUG9saWN5IGNv bnRlbnRTbmlmZmluZ1BvbGljeSA9IHJlc291cmNlTG9hZGVyLT5zaG91bGRTbmlmZkNvbnRlbnQo KSA/IFNuaWZmQ29udGVudCA6IERvTm90U25pZmZDb250ZW50OwogICAgIFN0b3JlZENyZWRlbnRp YWxzIGFsbG93U3RvcmVkQ3JlZGVudGlhbHMgPSByZXNvdXJjZUxvYWRlci0+c2hvdWxkVXNlQ3Jl ZGVudGlhbFN0b3JhZ2UoKSA/IEFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBEb05vdEFsbG93U3Rv cmVkQ3JlZGVudGlhbHM7CiAgICAgYm9vbCBwcml2YXRlQnJvd3NpbmdFbmFibGVkID0gcmVzb3Vy Y2VMb2FkZXItPmZyYW1lTG9hZGVyKCktPmZyYW1lKCktPnNldHRpbmdzKCktPnByaXZhdGVCcm93 c2luZ0VuYWJsZWQoKTsK