128309 2014-02-06 09:23:24 -0800 Modernize CrossOriginPreflightResultCache 2014-02-06 10:21:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue japhet oldest_to_newest 977374 0 andersca 2014-02-06 09:23:24 -0800 Modernize CrossOriginPreflightResultCache 977380 1 223340 andersca 2014-02-06 09:25:51 -0800 Created attachment 223340 Patch 977413 2 andersca 2014-02-06 10:03:59 -0800 Committed r163545: <http://trac.webkit.org/changeset/163545> 977416 3 ap 2014-02-06 10:21:23 -0800 This broke Windows build: http://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/57537/steps/compile-webkit/logs/stdio EWS bubble turned red two minutes before the patch was landed. 223340 2014-02-06 09:25:51 -0800 2014-02-06 09:28:07 -0800 Patch bug-128309-20140206092606.patch text/plain 12504 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJlYThlYTI2MTBhYmE5 Zjc5ODMyYzQ4Zjg5OGRjMjQyMjM3MjE5Yy4uMzJjNWZhZmIyNzQ4NTZlZmMwODNiMjI1MDcyMzg3 ZWVmNGRjYmRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAyLTA2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuaXplIENy b3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODMwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFVzZSBzdGQ6OmNocm9ubzo6c3RlYWR5X2Nsb2NrIGluc3Rl YWQgb2YgY3VycmVudFRpbWUoKSBmb3IgZGV0ZXJtaW5pbmcgd2hlbgorICAgICAgICBjYWNoZSBp dGVtcyBleHBpcmUsIFVzZSBzdGQ6OnVuaXF1ZV9wdHIgaW5zdGVhZCBvZiBPd25QdHIsIHVzZSBO ZXZlckRlc3Ryb3llZCwKKyAgICAgICAgZ2V0IHJpZCBvZiB1bm5lY2Vzc2FyeSBjb250YWluZXIg dHlwZWRlZnMgbm93IHRoYXQgd2UgaGF2ZSBhdXRvLiBGaW5hbGx5LAorICAgICAgICBkZS1pbmRl bnQgdGhlIGVudGlyZSBjbGFzcyBkZWNsYXJhdGlvbi4KKworICAgICAgICAqIGxvYWRlci9Dcm9z c09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNyb3Nz T3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGU6OkNyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2Fj aGUpOgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VBY2Nlc3NDb250cm9sTWF4QWdlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtOjpwYXJzZSk6 CisgICAgICAgIChXZWJDb3JlOjpDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlSXRlbTo6 YWxsb3dzUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpDcm9zc09yaWdpblByZWZsaWdodFJl c3VsdENhY2hlOjpzaGFyZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q3Jvc3NPcmlnaW5QcmVmbGln aHRSZXN1bHRDYWNoZTo6YXBwZW5kRW50cnkpOgorICAgICAgICAoV2ViQ29yZTo6Q3Jvc3NPcmln aW5QcmVmbGlnaHRSZXN1bHRDYWNoZTo6Y2FuU2tpcFByZWZsaWdodCk6CisgICAgICAgICogbG9h ZGVyL0Nyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGUuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkNyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtOjpDcm9zc09yaWdpblByZWZsaWdo dFJlc3VsdENhY2hlSXRlbSk6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmRp ZFJlY2VpdmVSZXNwb25zZSk6CisKIDIwMTQtMDItMDYgIEtvb3AgTWFzdCA8a3dtQEZyZWVCU0Qu b3JnPgogCiAgICAgICAgIFVzZSBzeXN0ZW0gZGVmYXVsdCBjb21waWxlciBpbnN0ZWFkIG9mIGdj YywgYXMgZmluYWwgZmFsbCB0aHJvdWdoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0Nyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0Nyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGUuY3BwCmluZGV4IGFmZjVkMGYy MWY2ZjI5NGJjYmJjZWQwMzEwNjJjNmEwMGFiOWFlZmYuLmM1YTk2ZjFmNTA4MWVmZDFhZGM2ZWU5 ZjQwNWEyZmZmN2ExZjcyMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9z c09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZS5jcHAKQEAgLTI5LDIxICsyOSwyNSBA QAogCiAjaW5jbHVkZSAiQ3Jvc3NPcmlnaW5BY2Nlc3NDb250cm9sLmgiCiAjaW5jbHVkZSAiUmVz b3VyY2VSZXNwb25zZS5oIgotI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgogI2luY2x1ZGUg PHd0Zi9NYWluVGhyZWFkLmg+CisjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5j bHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIC8vIFRo ZXNlIHZhbHVlcyBhcmUgYXQgdGhlIGRpc2NyZXRpb24gb2YgdGhlIHVzZXIgYWdlbnQuCi1zdGF0 aWMgY29uc3QgdW5zaWduZWQgZGVmYXVsdFByZWZsaWdodENhY2hlVGltZW91dFNlY29uZHMgPSA1 Owotc3RhdGljIGNvbnN0IHVuc2lnbmVkIG1heFByZWZsaWdodENhY2hlVGltZW91dFNlY29uZHMg PSA2MDA7IC8vIFNob3VsZCBiZSBzaG9ydCBlbm91Z2ggdG8gbWluaW1pemUgdGhlIHJpc2sgb2Yg dXNpbmcgYSBwb2lzb25lZCBjYWNoZSBhZnRlciBzd2l0Y2hpbmcgdG8gYSBzZWN1cmUgbmV0d29y ay4KK3N0YXRpYyBjb25zdCBhdXRvIGRlZmF1bHRQcmVmbGlnaHRDYWNoZVRpbWVvdXQgPSBzdGQ6 OmNocm9ubzo6c2Vjb25kcyg1KTsKK3N0YXRpYyBjb25zdCBhdXRvIG1heFByZWZsaWdodENhY2hl VGltZW91dCA9IHN0ZDo6Y2hyb25vOjpzZWNvbmRzKDYwMCk7IC8vIFNob3VsZCBiZSBzaG9ydCBl bm91Z2ggdG8gbWluaW1pemUgdGhlIHJpc2sgb2YgdXNpbmcgYSBwb2lzb25lZCBjYWNoZSBhZnRl ciBzd2l0Y2hpbmcgdG8gYSBzZWN1cmUgbmV0d29yay4KIAotc3RhdGljIGJvb2wgcGFyc2VBY2Nl c3NDb250cm9sTWF4QWdlKGNvbnN0IFN0cmluZyYgc3RyaW5nLCB1bnNpZ25lZCYgZXhwaXJ5RGVs dGEpCitDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlOjpDcm9zc09yaWdpblByZWZsaWdo dFJlc3VsdENhY2hlKCkKK3sKK30KKworc3RhdGljIGJvb2wgcGFyc2VBY2Nlc3NDb250cm9sTWF4 QWdlKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBzdGQ6OmNocm9ubzo6c2Vjb25kcyYgZXhwaXJ5RGVs dGEpCiB7CiAgICAgLy8gRklYTUU6IHRoaXMgd2lsbCBub3QgZG8gdGhlIGNvcnJlY3QgdGhpbmcg Zm9yIGEgbnVtYmVyIHN0YXJ0aW5nIHdpdGggYSAnKycKICAgICBib29sIG9rID0gZmFsc2U7Ci0g ICAgZXhwaXJ5RGVsdGEgPSBzdHJpbmcudG9VSW50U3RyaWN0KCZvayk7CisgICAgZXhwaXJ5RGVs dGEgPSBzdGQ6OmNocm9ubzo6c2Vjb25kcyhzdHJpbmcudG9VSW50U3RyaWN0KCZvaykpOwogICAg IHJldHVybiBvazsKIH0KIApAQCAtOTksMTQgKzEwMywxNCBAQCBib29sIENyb3NzT3JpZ2luUHJl ZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtOjpwYXJzZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgdW5zaWduZWQgZXhwaXJ5 RGVsdGE7CisgICAgc3RkOjpjaHJvbm86OnNlY29uZHMgZXhwaXJ5RGVsdGE7CiAgICAgaWYgKHBh cnNlQWNjZXNzQ29udHJvbE1heEFnZShyZXNwb25zZS5odHRwSGVhZGVyRmllbGQoIkFjY2Vzcy1D b250cm9sLU1heC1BZ2UiKSwgZXhwaXJ5RGVsdGEpKSB7Ci0gICAgICAgIGlmIChleHBpcnlEZWx0 YSA+IG1heFByZWZsaWdodENhY2hlVGltZW91dFNlY29uZHMpCi0gICAgICAgICAgICBleHBpcnlE ZWx0YSA9IG1heFByZWZsaWdodENhY2hlVGltZW91dFNlY29uZHM7CisgICAgICAgIGlmIChleHBp cnlEZWx0YSA+IG1heFByZWZsaWdodENhY2hlVGltZW91dCkKKyAgICAgICAgICAgIGV4cGlyeURl bHRhID0gbWF4UHJlZmxpZ2h0Q2FjaGVUaW1lb3V0OwogICAgIH0gZWxzZQotICAgICAgICBleHBp cnlEZWx0YSA9IGRlZmF1bHRQcmVmbGlnaHRDYWNoZVRpbWVvdXRTZWNvbmRzOworICAgICAgICBl eHBpcnlEZWx0YSA9IGRlZmF1bHRQcmVmbGlnaHRDYWNoZVRpbWVvdXQ7CiAKLSAgICBtX2Fic29s dXRlRXhwaXJ5VGltZSA9IG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpICsgZXhwaXJ5RGVs dGE7CisgICAgbV9hYnNvbHV0ZUV4cGlyeVRpbWUgPSBzdGQ6OmNocm9ubzo6c3RlYWR5X2Nsb2Nr Ojpub3coKSArIGV4cGlyeURlbHRhOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0xMzMsNyAr MTM3LDcgQEAgYm9vbCBDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlSXRlbTo6YWxsb3dz Q3Jvc3NPcmlnaW5IZWFkZXJzKGNvbnN0IEhUVFBIZWEKIGJvb2wgQ3Jvc3NPcmlnaW5QcmVmbGln aHRSZXN1bHRDYWNoZUl0ZW06OmFsbG93c1JlcXVlc3QoU3RvcmVkQ3JlZGVudGlhbHMgaW5jbHVk ZUNyZWRlbnRpYWxzLCBjb25zdCBTdHJpbmcmIG1ldGhvZCwgY29uc3QgSFRUUEhlYWRlck1hcCYg cmVxdWVzdEhlYWRlcnMpIGNvbnN0CiB7CiAgICAgU3RyaW5nIGlnbm9yZWRFeHBsYW5hdGlvbjsK LSAgICBpZiAobV9hYnNvbHV0ZUV4cGlyeVRpbWUgPCBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1Rp bWUoKSkKKyAgICBpZiAobV9hYnNvbHV0ZUV4cGlyeVRpbWUgPCBzdGQ6OmNocm9ubzo6c3RlYWR5 X2Nsb2NrOjpub3coKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmIChpbmNsdWRlQ3Jl ZGVudGlhbHMgPT0gQWxsb3dTdG9yZWRDcmVkZW50aWFscyAmJiBtX2NyZWRlbnRpYWxzID09IERv Tm90QWxsb3dTdG9yZWRDcmVkZW50aWFscykKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTQ2 LDI4ICsxNTAsMjkgQEAgYm9vbCBDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlSXRlbTo6 YWxsb3dzUmVxdWVzdChTdG9yZWRDcmVkZW50aWFscyBpbmNsdWQKIAogQ3Jvc3NPcmlnaW5QcmVm bGlnaHRSZXN1bHRDYWNoZSYgQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZTo6c2hhcmVk KCkKIHsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0 Q2FjaGUsIGNhY2hlLCAoKSk7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKworICAgIHN0 YXRpYyBOZXZlckRlc3Ryb3llZDxDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlPiBjYWNo ZTsKICAgICByZXR1cm4gY2FjaGU7CiB9CiAKLXZvaWQgQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1 bHRDYWNoZTo6YXBwZW5kRW50cnkoY29uc3QgU3RyaW5nJiBvcmlnaW4sIGNvbnN0IFVSTCYgdXJs LCBQYXNzT3duUHRyPENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtPiBwcmVmbGln aHRSZXN1bHQpCit2b2lkIENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGU6OmFwcGVuZEVu dHJ5KGNvbnN0IFN0cmluZyYgb3JpZ2luLCBjb25zdCBVUkwmIHVybCwgc3RkOjp1bmlxdWVfcHRy PENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtPiBwcmVmbGlnaHRSZXN1bHQpCiB7 CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBtX3ByZWZsaWdodEhhc2hNYXAuc2V0 KHN0ZDo6bWFrZV9wYWlyKG9yaWdpbiwgdXJsKSwgcHJlZmxpZ2h0UmVzdWx0KTsKKyAgICBtX3By ZWZsaWdodEhhc2hNYXAuc2V0KHN0ZDo6bWFrZV9wYWlyKG9yaWdpbiwgdXJsKSwgc3RkOjptb3Zl KHByZWZsaWdodFJlc3VsdCkpOwogfQogCiBib29sIENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0 Q2FjaGU6OmNhblNraXBQcmVmbGlnaHQoY29uc3QgU3RyaW5nJiBvcmlnaW4sIGNvbnN0IFVSTCYg dXJsLCBTdG9yZWRDcmVkZW50aWFscyBpbmNsdWRlQ3JlZGVudGlhbHMsIGNvbnN0IFN0cmluZyYg bWV0aG9kLCBjb25zdCBIVFRQSGVhZGVyTWFwJiByZXF1ZXN0SGVhZGVycykKIHsKICAgICBBU1NF UlQoaXNNYWluVGhyZWFkKCkpOwotICAgIENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0SGFzaE1h cDo6aXRlcmF0b3IgY2FjaGVJdCA9IG1fcHJlZmxpZ2h0SGFzaE1hcC5maW5kKHN0ZDo6bWFrZV9w YWlyKG9yaWdpbiwgdXJsKSk7Ci0gICAgaWYgKGNhY2hlSXQgPT0gbV9wcmVmbGlnaHRIYXNoTWFw LmVuZCgpKQorICAgIGF1dG8gaXQgPSBtX3ByZWZsaWdodEhhc2hNYXAuZmluZChzdGQ6Om1ha2Vf cGFpcihvcmlnaW4sIHVybCkpOworICAgIGlmIChpdCA9PSBtX3ByZWZsaWdodEhhc2hNYXAuZW5k KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChjYWNoZUl0LT52YWx1ZS0+YWxs b3dzUmVxdWVzdChpbmNsdWRlQ3JlZGVudGlhbHMsIG1ldGhvZCwgcmVxdWVzdEhlYWRlcnMpKQor ICAgIGlmIChpdC0+dmFsdWUtPmFsbG93c1JlcXVlc3QoaW5jbHVkZUNyZWRlbnRpYWxzLCBtZXRo b2QsIHJlcXVlc3RIZWFkZXJzKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBtX3ByZWZs aWdodEhhc2hNYXAucmVtb3ZlKGNhY2hlSXQpOworICAgIG1fcHJlZmxpZ2h0SGFzaE1hcC5yZW1v dmUoaXQpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0Nyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGUuaCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Dcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlLmgKaW5kZXggMWM5NWE0 MzlmZTk3MjRkNjcwYmU1MmRjZGM3MzMxMmRhN2FmNmViMy4uYmE2OWNlM2I3MmRmNTc0ZmU4YWNi YWNhMjdjMzA1ZWI5ZjcyYThkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Ny b3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZS5oCkBAIC0yOSw1OSArMjksNTYgQEAK IAogI2luY2x1ZGUgIlVSTEhhc2guaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZVR5cGVzLmgi CisjaW5jbHVkZSA8Y2hyb25vPgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8 d3RmL0hhc2hTZXQuaD4KLSNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1ZGUgPHd0 Zi90ZXh0L1N0cmluZ0hhc2guaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xhc3Mg SFRUUEhlYWRlck1hcDsKLSAgICBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwotCi0gICAgY2xhc3Mg Q3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZUl0ZW0gewotICAgICAgICBXVEZfTUFLRV9O T05DT1BZQUJMRShDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlSXRlbSk7IFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOwotICAgIHB1YmxpYzoKLSAgICAgICAgQ3Jvc3NPcmlnaW5QcmVmbGln aHRSZXN1bHRDYWNoZUl0ZW0oU3RvcmVkQ3JlZGVudGlhbHMgY3JlZGVudGlhbHMpCi0gICAgICAg ICAgICA6IG1fYWJzb2x1dGVFeHBpcnlUaW1lKDApCi0gICAgICAgICAgICAsIG1fY3JlZGVudGlh bHMoY3JlZGVudGlhbHMpCi0gICAgICAgIHsKLSAgICAgICAgfQotCi0gICAgICAgIGJvb2wgcGFy c2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFN0cmluZyYgZXJyb3JEZXNjcmlwdGlvbik7Ci0g ICAgICAgIGJvb2wgYWxsb3dzQ3Jvc3NPcmlnaW5NZXRob2QoY29uc3QgU3RyaW5nJiwgU3RyaW5n JiBlcnJvckRlc2NyaXB0aW9uKSBjb25zdDsKLSAgICAgICAgYm9vbCBhbGxvd3NDcm9zc09yaWdp bkhlYWRlcnMoY29uc3QgSFRUUEhlYWRlck1hcCYsIFN0cmluZyYgZXJyb3JEZXNjcmlwdGlvbikg Y29uc3Q7Ci0gICAgICAgIGJvb2wgYWxsb3dzUmVxdWVzdChTdG9yZWRDcmVkZW50aWFscywgY29u c3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IEhUVFBIZWFkZXJNYXAmIHJlcXVlc3RIZWFkZXJzKSBj b25zdDsKLQotICAgIHByaXZhdGU6Ci0gICAgICAgIHR5cGVkZWYgSGFzaFNldDxTdHJpbmcsIENh c2VGb2xkaW5nSGFzaD4gSGVhZGVyc1NldDsKLQotICAgICAgICAvLyBGSVhNRTogQSBiZXR0ZXIg c29sdXRpb24gdG8gaG9sZGluZyBvbnRvIHRoZSBhYnNvbHV0ZSBleHBpcmF0aW9uIHRpbWUgbWln aHQgYmUKLSAgICAgICAgLy8gdG8gc3RhcnQgYSB0aW1lciBmb3IgdGhlIGV4cGlyYXRpb24gZGVs dGEgdGhhdCByZW1vdmVzIHRoaXMgZnJvbSB0aGUgY2FjaGUgd2hlbgotICAgICAgICAvLyBpdCBm aXJlcy4KLSAgICAgICAgZG91YmxlIG1fYWJzb2x1dGVFeHBpcnlUaW1lOwotICAgICAgICBTdG9y ZWRDcmVkZW50aWFscyBtX2NyZWRlbnRpYWxzOwotICAgICAgICBIYXNoU2V0PFN0cmluZz4gbV9t ZXRob2RzOwotICAgICAgICBIZWFkZXJzU2V0IG1faGVhZGVyczsKLSAgICB9OwotCi0gICAgY2xh c3MgQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZSB7Ci0gICAgICAgIFdURl9NQUtFX05P TkNPUFlBQkxFKENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGUpOyBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKLSAgICBwdWJsaWM6Ci0gICAgICAgIHN0YXRpYyBDcm9zc09yaWdpblByZWZs aWdodFJlc3VsdENhY2hlJiBzaGFyZWQoKTsKLQotICAgICAgICB2b2lkIGFwcGVuZEVudHJ5KGNv bnN0IFN0cmluZyYgb3JpZ2luLCBjb25zdCBVUkwmLCBQYXNzT3duUHRyPENyb3NzT3JpZ2luUHJl ZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtPik7Ci0gICAgICAgIGJvb2wgY2FuU2tpcFByZWZsaWdodChj b25zdCBTdHJpbmcmIG9yaWdpbiwgY29uc3QgVVJMJiwgU3RvcmVkQ3JlZGVudGlhbHMsIGNvbnN0 IFN0cmluZyYgbWV0aG9kLCBjb25zdCBIVFRQSGVhZGVyTWFwJiByZXF1ZXN0SGVhZGVycyk7Ci0K LSAgICAgICAgdm9pZCBlbXB0eSgpOwotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgQ3Jvc3NPcmln aW5QcmVmbGlnaHRSZXN1bHRDYWNoZSgpIHsgfQotCi0gICAgICAgIHR5cGVkZWYgSGFzaE1hcDxz dGQ6OnBhaXI8U3RyaW5nLCBVUkw+LCBPd25QdHI8Q3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRD YWNoZUl0ZW0+PiBDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdEhhc2hNYXA7Ci0KLSAgICAgICAg Q3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRIYXNoTWFwIG1fcHJlZmxpZ2h0SGFzaE1hcDsKLSAg ICB9OworY2xhc3MgSFRUUEhlYWRlck1hcDsKK2NsYXNzIFJlc291cmNlUmVzcG9uc2U7CisKK2Ns YXNzIENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtIHsKKyAgICBXVEZfTUFLRV9O T05DT1BZQUJMRShDcm9zc09yaWdpblByZWZsaWdodFJlc3VsdENhY2hlSXRlbSk7IFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOworcHVibGljOgorICAgIGV4cGxpY2l0IENyb3NzT3JpZ2luUHJlZmxp Z2h0UmVzdWx0Q2FjaGVJdGVtKFN0b3JlZENyZWRlbnRpYWxzIGNyZWRlbnRpYWxzKQorICAgICAg ICA6IG1fY3JlZGVudGlhbHMoY3JlZGVudGlhbHMpCisgICAgeworICAgIH0KKworICAgIGJvb2wg cGFyc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFN0cmluZyYgZXJyb3JEZXNjcmlwdGlvbik7 CisgICAgYm9vbCBhbGxvd3NDcm9zc09yaWdpbk1ldGhvZChjb25zdCBTdHJpbmcmLCBTdHJpbmcm IGVycm9yRGVzY3JpcHRpb24pIGNvbnN0OworICAgIGJvb2wgYWxsb3dzQ3Jvc3NPcmlnaW5IZWFk ZXJzKGNvbnN0IEhUVFBIZWFkZXJNYXAmLCBTdHJpbmcmIGVycm9yRGVzY3JpcHRpb24pIGNvbnN0 OworICAgIGJvb2wgYWxsb3dzUmVxdWVzdChTdG9yZWRDcmVkZW50aWFscywgY29uc3QgU3RyaW5n JiBtZXRob2QsIGNvbnN0IEhUVFBIZWFkZXJNYXAmIHJlcXVlc3RIZWFkZXJzKSBjb25zdDsKKwor cHJpdmF0ZToKKyAgICAvLyBGSVhNRTogQSBiZXR0ZXIgc29sdXRpb24gdG8gaG9sZGluZyBvbnRv IHRoZSBhYnNvbHV0ZSBleHBpcmF0aW9uIHRpbWUgbWlnaHQgYmUKKyAgICAvLyB0byBzdGFydCBh IHRpbWVyIGZvciB0aGUgZXhwaXJhdGlvbiBkZWx0YSB0aGF0IHJlbW92ZXMgdGhpcyBmcm9tIHRo ZSBjYWNoZSB3aGVuCisgICAgLy8gaXQgZmlyZXMuCisgICAgc3RkOjpjaHJvbm86OnN0ZWFkeV9j bG9jazo6dGltZV9wb2ludCBtX2Fic29sdXRlRXhwaXJ5VGltZTsKKyAgICBTdG9yZWRDcmVkZW50 aWFscyBtX2NyZWRlbnRpYWxzOworICAgIEhhc2hTZXQ8U3RyaW5nPiBtX21ldGhvZHM7CisgICAg SGFzaFNldDxTdHJpbmcsIENhc2VGb2xkaW5nSGFzaD4gbV9oZWFkZXJzOworfTsKKworY2xhc3Mg Q3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZSB7CisgICAgV1RGX01BS0VfTk9OQ09QWUFC TEUoQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZSk7IFdURl9NQUtFX0ZBU1RfQUxMT0NB VEVEOworCitwdWJsaWM6CisgICAgc3RhdGljIENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2Fj aGUmIHNoYXJlZCgpOworCisgICAgdm9pZCBhcHBlbmRFbnRyeShjb25zdCBTdHJpbmcmIG9yaWdp biwgY29uc3QgVVJMJiwgc3RkOjp1bmlxdWVfcHRyPENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0 Q2FjaGVJdGVtPik7CisgICAgYm9vbCBjYW5Ta2lwUHJlZmxpZ2h0KGNvbnN0IFN0cmluZyYgb3Jp Z2luLCBjb25zdCBVUkwmLCBTdG9yZWRDcmVkZW50aWFscywgY29uc3QgU3RyaW5nJiBtZXRob2Qs IGNvbnN0IEhUVFBIZWFkZXJNYXAmIHJlcXVlc3RIZWFkZXJzKTsKKworICAgIHZvaWQgZW1wdHko KTsKKworcHJpdmF0ZToKKyAgICBmcmllbmQgTmV2ZXJEZXN0cm95ZWQ8Q3Jvc3NPcmlnaW5QcmVm bGlnaHRSZXN1bHRDYWNoZT47CisgICAgQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZSgp OworCisgICAgSGFzaE1hcDxzdGQ6OnBhaXI8U3RyaW5nLCBVUkw+LCBzdGQ6OnVuaXF1ZV9wdHI8 Q3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZUl0ZW0+PiBtX3ByZWZsaWdodEhhc2hNYXA7 Cit9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKaW5kZXggYTYwMTM3MDZiMDg5NzYx MDdmOTExNjY0NDdmNjdlMTBhZTNlYjRiNS4uNTNkNWMzOWU0MTk2ZWVhZDU0MmEzZDcxMjAzMDk3 ZmVkMmIxYWFjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhy ZWFkYWJsZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhy ZWFkYWJsZUxvYWRlci5jcHAKQEAgLTI1OCw3ICsyNTgsNyBAQCB2b2lkIERvY3VtZW50VGhyZWFk YWJsZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg Y29ucwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgT3duUHRyPENy b3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtPiBwcmVmbGlnaHRSZXN1bHQgPSBhZG9w dFB0cihuZXcgQ3Jvc3NPcmlnaW5QcmVmbGlnaHRSZXN1bHRDYWNoZUl0ZW0obV9vcHRpb25zLmFs bG93Q3JlZGVudGlhbHMpKTsKKyAgICAgICAgYXV0byBwcmVmbGlnaHRSZXN1bHQgPSBzdGQ6Om1h a2VfdW5pcXVlPENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGVJdGVtPihzdGF0aWNfY2Fz dDxTdG9yZWRDcmVkZW50aWFscz4obV9vcHRpb25zLmFsbG93Q3JlZGVudGlhbHMpKTsKICAgICAg ICAgaWYgKCFwcmVmbGlnaHRSZXN1bHQtPnBhcnNlKHJlc3BvbnNlLCBhY2Nlc3NDb250cm9sRXJy b3JEZXNjcmlwdGlvbikKICAgICAgICAgICAgIHx8ICFwcmVmbGlnaHRSZXN1bHQtPmFsbG93c0Ny b3NzT3JpZ2luTWV0aG9kKG1fYWN0dWFsUmVxdWVzdC0+aHR0cE1ldGhvZCgpLCBhY2Nlc3NDb250 cm9sRXJyb3JEZXNjcmlwdGlvbikKICAgICAgICAgICAgIHx8ICFwcmVmbGlnaHRSZXN1bHQtPmFs bG93c0Nyb3NzT3JpZ2luSGVhZGVycyhtX2FjdHVhbFJlcXVlc3QtPmh0dHBIZWFkZXJGaWVsZHMo KSwgYWNjZXNzQ29udHJvbEVycm9yRGVzY3JpcHRpb24pKSB7CkBAIC0yNjYsNyArMjY2LDcgQEAg dm9pZCBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZSh1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGNvbnMKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog Ci0gICAgICAgIENyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGU6OnNoYXJlZCgpLmFwcGVu ZEVudHJ5KHNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCksIG1fYWN0dWFsUmVxdWVzdC0+dXJs KCksIHByZWZsaWdodFJlc3VsdC5yZWxlYXNlKCkpOworICAgICAgICBDcm9zc09yaWdpblByZWZs aWdodFJlc3VsdENhY2hlOjpzaGFyZWQoKS5hcHBlbmRFbnRyeShzZWN1cml0eU9yaWdpbigpLT50 b1N0cmluZygpLCBtX2FjdHVhbFJlcXVlc3QtPnVybCgpLCBzdGQ6Om1vdmUocHJlZmxpZ2h0UmVz dWx0KSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKCFtX3NhbWVPcmlnaW5SZXF1ZXN0ICYm IG1fb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQb2xpY3kgPT0gVXNlQWNjZXNzQ29udHJvbCkg ewogICAgICAgICAgICAgaWYgKCFwYXNzZXNBY2Nlc3NDb250cm9sQ2hlY2socmVzcG9uc2UsIG1f b3B0aW9ucy5hbGxvd0NyZWRlbnRpYWxzLCBzZWN1cml0eU9yaWdpbigpLCBhY2Nlc3NDb250cm9s RXJyb3JEZXNjcmlwdGlvbikpIHsK