102010 2012-11-12 16:41:46 -0800 Get rid of the CrossOriginRedirectReceived message to the NetworkProcess 2012-11-13 20:36:57 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 98537 1 beidson beidson ap oldest_to_newest 764968 0 beidson 2012-11-12 16:41:46 -0800 Get rid of the CrossOriginRedirectReceived message to the NetworkProcess Redirect accounting can be handled entirely within the NetworkResourceLoadScheduler in the NetworkProcess 764970 1 173761 beidson 2012-11-12 16:46:50 -0800 Created attachment 173761 Patch v1 764987 2 beidson 2012-11-12 17:04:30 -0800 http://trac.webkit.org/changeset/134328 173761 2012-11-12 16:46:50 -0800 2012-11-12 16:51:27 -0800 Patch v1 patch.txt text/plain 8737 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZDRmNjQ2Li43NGNkZGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEg QEAKIDIwMTItMTEtMTIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIEdldCByaWQgb2YgdGhlIENyb3NzT3JpZ2luUmVkaXJlY3RSZWNlaXZlZCBtZXNzYWdlIHRv IHRoZSBOZXR3b3JrUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMjAxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgbWVzc2FnZSB3YXMgYSBzdG9wLWdhcCBtZWFzdXJlIGZvciB3aGVu IHRoZSBOZXR3b3JrUHJvY2VzcyBkaWQgc2NoZWR1bGluZyBidXQgbm90IGxvYWRpbmcuCisgICAg ICAgIE5vdyB0aGF0IHRoZSBOZXR3b3JrUHJvY2VzcyBkb2VzIGxvYWRpbmcgaXQgZG9lc24ndCBu ZWVkIHRvIGJlIHRvbGQgd2hlbiByZWRpcmVjdCBpcyByZWNlaXZlZC4KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5tZXNzYWdlcy5p bjogR2V0IHJpZCBvZiB0aGUgbWVzc2FnZSB0byB0aGUgTmV0d29ya1Byb2Nlc3MuCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtSZXF1ZXN0Ojp3aWxsU2VuZFJlcXVlc3QpOiBBZnRlciB3aWxsU2VuZFJlcXVlc3Qg aXMgZGlzcGF0Y2hlZCB0byB0aGUgV2ViUHJvY2VzcywgZGlyZWN0bHkgY2FsbAorICAgICAgICAg ICJyZWNlaXZlZFJlZGlyZWN0IiBvbiB0aGUgTmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlci4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpyZWNl aXZlZFJlZGlyZWN0KTogUmVuYW1lZCBmcm9tIGNyb3NzT3JpZ2luUmVkaXJlY3RSZWNlaXZlZCwg YXMgdGhlCisgICAgICAgICAgZnVuY3Rpb24gYWxyZWFkeSBjaGVja3MgdG8gc2VlIGlmIHRoZSBy ZWRpcmVjdCB3YXMgYWN0dWFsbHkgY3Jvc3Mtb3JpZ2luLgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXIuaDoKKworICAgICAgICAqIFdlYlByb2Nl c3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OmNyb3NzT3JpZ2luUmVkaXJlY3RSZWNlaXZlZCk6 IEEgbm8tb3Agc28gdGhlIFdlYlByb2Nlc3MgZG9lc24ndAorICAgICAgICAgIGRvIGFueSBob3N0 IHJlY29yZCBhY2NvdW50aW5nIG9mIGl0cyBvd24uCisKKzIwMTItMTEtMTIgIEJyYWR5IEVpZHNv biAgPGJlaWRzb25AYXBwbGUuY29tPgorCiAgICAgICAgIE5ldHdvcmtQcm9jZXNzOiBVc2UgYW4g YWNjdXJhdGUgc2hvdWxkQ29udGVudFNuaWZmIHZhbHVlIHdoZW4gY3JlYXRpbmcgUmVzb3VyY2VI YW5kbGVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDE4NzIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCmluZGV4IDExMzg1MmQuLmI1ZDZj ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKQEAgLTEyNSwxMSArMTI1LDYgQEAg dm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cmVtb3ZlTG9hZElkZW50aWZpZXIo UmVzb3VyY2VMb2FkSWRlbnRpZmllcgogICAgIE5ldHdvcmtQcm9jZXNzOjpzaGFyZWQoKS5uZXR3 b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyKCkucmVtb3ZlTG9hZElkZW50aWZpZXIoaWRlbnRpZmll cik7CiB9CiAKLXZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNyb3NzT3JpZ2lu UmVkaXJlY3RSZWNlaXZlZChSZXNvdXJjZUxvYWRJZGVudGlmaWVyIGlkZW50aWZpZXIsIGNvbnN0 IEtVUkwmIHJlZGlyZWN0VVJMKQotewotICAgIE5ldHdvcmtQcm9jZXNzOjpzaGFyZWQoKS5uZXR3 b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyKCkuY3Jvc3NPcmlnaW5SZWRpcmVjdFJlY2VpdmVkKGlk ZW50aWZpZXIsIHJlZGlyZWN0VVJMKTsKLX0KLQogdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzczo6c2VydmVQZW5kaW5nUmVxdWVzdHModWludDMyX3QgcmVzb3VyY2VMb2FkUHJpb3Jp dHkpCiB7CiAgICAgTmV0d29ya1Byb2Nlc3M6OnNoYXJlZCgpLm5ldHdvcmtSZXNvdXJjZUxvYWRT Y2hlZHVsZXIoKS5zZXJ2ZVBlbmRpbmdSZXF1ZXN0cyhzdGF0aWNfY2FzdDxSZXNvdXJjZUxvYWRQ cmlvcml0eT4ocmVzb3VyY2VMb2FkUHJpb3JpdHkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLm1lc3NhZ2Vz LmluIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3MubWVzc2FnZXMuaW4KaW5kZXggZmZkM2IyOS4uZmUyMzU4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KQEAgLTMxLDEwICszMSw2IEBAIG1l c3NhZ2VzIC0+IE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzIHsKICAgICBTY2hlZHVsZU5l dHdvcmtSZXF1ZXN0KFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCB1aW50MzJfdCBy ZXNvdXJjZUxvYWRQcmlvcml0eSwgYm9vbCBzaG91bGRDb250ZW50U25pZmYpIC0+ICh1aW50NjRf dCByZXNvdXJjZUxvYWRJZGVudGlmaWVyKQogICAgIEFkZExvYWRJblByb2dyZXNzKFdlYkNvcmU6 OktVUkwgdXJsKSAtPiAodWludDY0X3QgcmVzb3VyY2VMb2FkSWRlbnRpZmllcikKICAgICBSZW1v dmVMb2FkSWRlbnRpZmllcih1aW50NjRfdCByZXNvdXJjZUxvYWRJZGVudGlmaWVyKQotCi0gICAg Ly8gSXQncyBwb3NzaWJsZSB0aGF0IHdlIHdpbGwgYmUgYWJsZSB0byBkbyBhd2F5IHdpdGggdGhp cyBtZXNzYWdlIGFuZCBoYXZlIHRoZSBOZXR3b3JrUHJvY2VzcwotICAgIC8vIG1hbmFnZSBpdCBp bnRlcm5hbGx5LgotICAgIGNyb3NzT3JpZ2luUmVkaXJlY3RSZWNlaXZlZCh1aW50NjRfdCByZXNv dXJjZUxvYWRJZGVudGlmaWVyLCBXZWJDb3JlOjpLVVJMIHJlZGlyZWN0VVJMKSAtPiAoKQogICAg IAogICAgIFNlcnZlUGVuZGluZ1JlcXVlc3RzKHVpbnQzMl90IHJlc291cmNlTG9hZFByaW9yaXR5 KQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVx dWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5j cHAKaW5kZXggNTc1MTUxOS4uYWJhOWE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1JlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL05ldHdvcmtSZXF1ZXN0LmNwcApAQCAtMjA2LDYgKzIwNiw5IEBAIHZvaWQgZGlk UmVjZWl2ZVdpbGxTZW5kUmVxdWVzdEhhbmRsZWQodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBS ZXNvdXJjZVJlcXVlc3QmCiAKIHZvaWQgTmV0d29ya1JlcXVlc3Q6OndpbGxTZW5kUmVxdWVzdChS ZXNvdXJjZUhhbmRsZSosIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKIHsKKyAgICAvLyBXZSBvbmx5IGV4cGVjdCB0byBn ZXQgdGhlIHdpbGxTZW5kUmVxdWVzdCBjYWxsYmFjayBmcm9tIFJlc291cmNlSGFuZGxlIGFzIHRo ZSByZXN1bHQgb2YgYSByZWRpcmVjdAorICAgIEFTU0VSVCghcmVkaXJlY3RSZXNwb25zZS5pc051 bGwoKSk7CisKICAgICB1aW50NjRfdCByZXF1ZXN0SUQgPSBnZW5lcmF0ZVdpbGxTZW5kUmVxdWVz dElEKCk7CiAKICAgICBpZiAoIWNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MoKS0+Y29ubmVjdGlvbigp LT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OldpbGxTZW5kUmVxdWVz dChyZXF1ZXN0SUQsIG1faWRlbnRpZmllciwgcmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSksIDAp KSB7CkBAIC0yMTUsNiArMjE4LDggQEAgdm9pZCBOZXR3b3JrUmVxdWVzdDo6d2lsbFNlbmRSZXF1 ZXN0KFJlc291cmNlSGFuZGxlKiwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LAogICAgIAogICAg IE93blB0cjxSZXNvdXJjZVJlcXVlc3Q+IG5ld1JlcXVlc3QgPSByZXNwb25zZU1hcCgpLndhaXRG b3JSZXNwb25zZShyZXF1ZXN0SUQpOwogICAgIHJlcXVlc3QgPSAqbmV3UmVxdWVzdDsKKworICAg IE5ldHdvcmtQcm9jZXNzOjpzaGFyZWQoKS5uZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyKCku cmVjZWl2ZWRSZWRpcmVjdChtX2lkZW50aWZpZXIsIHJlcXVlc3QudXJsKCkpOwogfQogCiB2b2lk IE5ldHdvcmtSZXF1ZXN0OjpkaWRTZW5kRGF0YShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIHVu c2lnbmVkIGxvbmcgbG9uZyAvKmJ5dGVzU2VudCovLCB1bnNpZ25lZCBsb25nIGxvbmcgLyp0b3Rh bEJ5dGVzVG9CZVNlbnQqLykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlci5jcHAKaW5kZXggMGQ3NDU0 NS4uNTBkMGVhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlci5jcHAKQEAgLTEwNywxMCArMTA3 LDEwIEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlcjo6cmVtb3ZlTG9hZElkZW50 aWZpZXIoUmVzb3VyY2VMb2FkSWRlbnRpZmllciBpCiAgICAgc2NoZWR1bGVTZXJ2ZVBlbmRpbmdS ZXF1ZXN0cygpOwogfQogCi12b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OmNyb3Nz T3JpZ2luUmVkaXJlY3RSZWNlaXZlZChSZXNvdXJjZUxvYWRJZGVudGlmaWVyIGlkZW50aWZpZXIs IGNvbnN0IFdlYkNvcmU6OktVUkwmIHJlZGlyZWN0VVJMKQordm9pZCBOZXR3b3JrUmVzb3VyY2VM b2FkU2NoZWR1bGVyOjpyZWNlaXZlZFJlZGlyZWN0KFJlc291cmNlTG9hZElkZW50aWZpZXIgaWRl bnRpZmllciwgY29uc3QgV2ViQ29yZTo6S1VSTCYgcmVkaXJlY3RVUkwpCiB7CiAgICAgQVNTRVJU KGlzTWFpblRocmVhZCgpKTsKLSAgICBMT0coTmV0d29ya1NjaGVkdWxpbmcsICIoTmV0d29ya1By b2Nlc3MpIE5ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OmNyb3NzT3JpZ2luUmVkaXJlY3RS ZWNlaXZlZCByZXNvdXJjZSAlbGx1IHJlZGlyZWN0ZWQgdG8gJyVzJyIsIGlkZW50aWZpZXIsIHJl ZGlyZWN0VVJMLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgIExPRyhOZXR3b3JrU2NoZWR1 bGluZywgIihOZXR3b3JrUHJvY2VzcykgTmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlcjo6cmVj ZWl2ZWRSZWRpcmVjdCByZXNvdXJjZSAlbGx1IHJlZGlyZWN0ZWQgdG8gJyVzJyIsIGlkZW50aWZp ZXIsIHJlZGlyZWN0VVJMLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgSG9zdFJlY29y ZCogb2xkSG9zdCA9IG1faWRlbnRpZmllcnMuZ2V0KGlkZW50aWZpZXIpOwogICAgIEhvc3RSZWNv cmQqIG5ld0hvc3QgPSBob3N0Rm9yVVJMKHJlZGlyZWN0VVJMLCBDcmVhdGVJZk5vdEZvdW5kKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJj ZUxvYWRTY2hlZHVsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRTY2hlZHVsZXIuaAppbmRleCAyZmE4ZWIxLi4zMDg5MjhmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1 bGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNl TG9hZFNjaGVkdWxlci5oCkBAIC01Nyw3ICs1Nyw3IEBAIHB1YmxpYzoKICAgICAvLyBDYWxsZWQg d2l0aGluIHRoZSBOZXR3b3JrUHJvY2VzcyBvbiBhIGJhY2tncm91bmQgdGhyZWFkIHdoZW4gYSBy ZXNvdXJjZSBsb2FkIGhhcyBmaW5pc2hlZC4KICAgICB2b2lkIHNjaGVkdWxlUmVtb3ZlTG9hZElk ZW50aWZpZXIoUmVzb3VyY2VMb2FkSWRlbnRpZmllcik7CiAKLSAgICB2b2lkIGNyb3NzT3JpZ2lu UmVkaXJlY3RSZWNlaXZlZChSZXNvdXJjZUxvYWRJZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpL VVJMJiByZWRpcmVjdFVSTCk7CisgICAgdm9pZCByZWNlaXZlZFJlZGlyZWN0KFJlc291cmNlTG9h ZElkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OktVUkwmIHJlZGlyZWN0VVJMKTsKICAgICB2b2lk IHNlcnZlUGVuZGluZ1JlcXVlc3RzKFdlYkNvcmU6OlJlc291cmNlTG9hZFByaW9yaXR5ID0gV2Vi Q29yZTo6UmVzb3VyY2VMb2FkUHJpb3JpdHlWZXJ5TG93KTsKICAgICB2b2lkIHN1c3BlbmRQZW5k aW5nUmVxdWVzdHMoKTsKICAgICB2b2lkIHJlc3VtZVBlbmRpbmdSZXF1ZXN0cygpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNj aGVkdWxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3Vy Y2VMb2FkU2NoZWR1bGVyLmNwcAppbmRleCAxZjY2ZWY1Li4zOTg5NWM2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VM b2FkU2NoZWR1bGVyLmNwcApAQCAtMTQ4LDE3ICsxNDgsMTAgQEAgdm9pZCBXZWJSZXNvdXJjZUxv YWRTY2hlZHVsZXI6OnJlbW92ZShSZXNvdXJjZUxvYWRlciogcmVzb3VyY2VMb2FkZXIpCiAgICAg bV9hY3RpdmVSZXNvdXJjZUxvYWRlcnMucmVtb3ZlKGlkZW50aWZpZXIpOwogfQogCi12b2lkIFdl YlJlc291cmNlTG9hZFNjaGVkdWxlcjo6Y3Jvc3NPcmlnaW5SZWRpcmVjdFJlY2VpdmVkKFJlc291 cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciwgY29uc3QgS1VSTCYgcmVkaXJlY3RVUkwpCit2b2lk IFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6Y3Jvc3NPcmlnaW5SZWRpcmVjdFJlY2VpdmVkKFJl c291cmNlTG9hZGVyKiwgY29uc3QgS1VSTCYpCiB7Ci0gICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5n LCAiKFdlYlByb2Nlc3MpIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6Y3Jvc3NPcmlnaW5SZWRp cmVjdFJlY2VpdmVkLiBGcm9tICclcycgdG8gJyVzJyIsIHJlc291cmNlTG9hZGVyLT51cmwoKS5z dHJpbmcoKS51dGY4KCkuZGF0YSgpLCByZWRpcmVjdFVSTC5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KTsKLQotICAgIEFTU0VSVChyZXNvdXJjZUxvYWRlcik7Ci0gICAgQVNTRVJUKHJlc291cmNlTG9h ZGVyLT5pZGVudGlmaWVyKCkpOwotCi0gICAgaWYgKCFXZWJQcm9jZXNzOjpzaGFyZWQoKS5uZXR3 b3JrQ29ubmVjdGlvbigpLT5jb25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y3Jvc3NPcmlnaW5SZWRpcmVjdFJlY2VpdmVkKHJlc291 cmNlTG9hZGVyLT5pZGVudGlmaWVyKCksIHJlZGlyZWN0VVJMKSwgTWVzc2FnZXM6Ok5ldHdvcmtD b25uZWN0aW9uVG9XZWJQcm9jZXNzOjpjcm9zc09yaWdpblJlZGlyZWN0UmVjZWl2ZWQ6OlJlcGx5 KCksIDApKSB7Ci0gICAgICAgIC8vIEZJWE1FIChOZXR3b3JrUHJvY2Vzcyk6IFdoYXQgc2hvdWxk IHdlIGRvIGlmIHRoaXMgZmFpbHM/Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAg IH0KKyAgICAvLyBXZSBoYW5kbGUgY3Jvc3Mgb3JpZ2luIHJlZGlyZWN0cyBlbnRpcmVseSB3aXRo aW4gdGhlIE5ldHdvcmtQcm9jZXNzLgorICAgIC8vIFdlIG92ZXJyaWRlIHRoaXMgY2FsbCBpbiB0 aGUgV2ViUHJvY2VzcyB0byBtYWtlIGl0IGEgbm8tb3AuCiB9CiAKIHZvaWQgV2ViUmVzb3VyY2VM b2FkU2NoZWR1bGVyOjpzZXJ2ZVBlbmRpbmdSZXF1ZXN0cyhSZXNvdXJjZUxvYWRQcmlvcml0eSBt aW5pbXVtUHJpb3JpdHkpCg==