114995 2013-04-22 15:39:49 -0700 Web process should decide when to continue main resource loads 2013-04-22 15:55:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 879479 0 andersca 2013-04-22 15:39:49 -0700 Web process should decide when to continue main resource loads 879482 1 199119 andersca 2013-04-22 15:43:58 -0700 Created attachment 199119 Patch 879490 2 andersca 2013-04-22 15:55:08 -0700 Committed r148922: <http://trac.webkit.org/changeset/148922> 199119 2013-04-22 15:43:58 -0700 2013-04-22 15:48:40 -0700 Patch bug-114995-20130422154323.patch text/plain 14829 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4OTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTE3MmQ2MjFlYjk0MzRh ZmI1NTQ2YzBmZWNhMmZiYzRkZjVmMzc3Ni4uMjNkMjE3ZDNkZjNjNzEzZDBlOTIzNGJkM2E4Mjhi ZDMyODI0MThlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU4IEBACiAyMDEzLTA0LTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIHByb2Nlc3Mg c2hvdWxkIGRlY2lkZSB3aGVuIHRvIGNvbnRpbnVlIG1haW4gcmVzb3VyY2UgbG9hZHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDk5NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1haW4gcmVzb3VyY2Ug bG9hZHMgY2FuIGJlIGNvbnZlcnRlZCB0byBkb3dubG9hZHMsIHNvIHdlIG5lZWQgdGhlIGFiaWxp dHkgdG8gbGV0IHRoZSB3ZWIgcHJvY2VzcyBkZWNpZGUgd2hlbgorICAgICAgICB0byBjb250aW51 ZSBsb2FkaW5nIGFmdGVyIGEgcmVzcG9uc2UgaGFzIGJlZW4gcmVjZWl2ZWQuCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZUFzeW5jKToKKyAg ICAgICAgRm9yIG5vbi1tYWluIHJlc291cmNlcywganVzdCBjYWxsIGNvbnRpbnVlRGlkUmVjZWl2 ZVJlc3BvbnNlIGRpcmVjdGx5OyB0aGVyZSdzIG5vIG5lZWQgdG8gcGluZy1wb25nIHRvIHRoZSB3 ZWIgcHJvY2VzcyBpbiB0aGF0IGNhc2UuCisKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291 cmNlTG9hZGVyOjpjb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIEp1c3QgY2Fs bCBSZXNvdXJjZUhhbmRsZTo6Y29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UuCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIubWVzc2FnZXMuaW46CisgICAg ICAgIEFkZCBDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSBtZXNzYWdlLgorICAgICAgICAKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9TY2hlZHVsYWJsZUxvYWRlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlNjaGVkdWxhYmxlTG9hZGVyOjpTY2hlZHVsYWJsZUxvYWRlcik6CisgICAgICAgIElu aXRpYWxpemUgbV9pc0xvYWRpbmdNYWluUmVzb3VyY2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9TY2hlZHVsYWJsZUxvYWRlci5oOgorICAgICAgICAoV2ViS2l0OjpTY2hlZHVsYWJsZUxv YWRlcjo6aXNMb2FkaW5nTWFpblJlc291cmNlKToKKyAgICAgICAgQWRkIGdldHRlci4KKworICAg ICAgICAoU2NoZWR1bGFibGVMb2FkZXIpOgorICAgICAgICBNb3ZlIG1fc2hvdWxkQ2xlYXJSZWZl cnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCBuZXh0IHRvIHRoZSByZXN0IG9mIHRoZSBib29sZWFu cy4KKworICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0 ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6 Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9OZXR3 b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmg6CisgICAgICAgIChOZXR3b3JrUmVz b3VyY2VMb2FkUGFyYW1ldGVycyk6CisgICAgICAgIEFkZCBpc01haW5SZXNvdXJjZSBmbGFnLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVT dWJyZXNvdXJjZUxvYWQpOgorICAgICAgICBQYXNzIHRoZSBjYWNoZWQgcmVzb3VyY2UgdG8gc2No ZWR1bGVMb2FkLgorCisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6 c2NoZWR1bGVQbHVnaW5TdHJlYW1Mb2FkKToKKyAgICAgICAgUGFzcyBudWxsIHRvIHNjaGVkdWxl TG9hZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OnNjaGVk dWxlTG9hZCk6CisgICAgICAgIEluaXRpYWxpemUgaXNNYWluUmVzb3VyY2UuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlV2l0aENlcnRpZmljYXRl SW5mbyk6CisgICAgICAgIElmIHRoaXMgaXMgYSBtYWluIHJlc291cmNlIGxvYWQsIHNlbmQgYmFj ayBhIENvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlIG1lc3NhZ2UuCisKKzIwMTMtMDQtMjIgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBNYWtlIGl0IGVh c2llciB0byBleHRlbmQgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDk5MgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3Bw IGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw cAppbmRleCBmOTNiOGMyZGFmMjBmOThmMDM2NDYxMDcwODYzNzBmYmI4MGNmZDA5Li4zNWIwNjhi ODhlMTg2MjVmMjQyZmFiZWMzMTY4NzEyMDY5YTRlMDUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTIw NSw3ICsyMDUsMTEgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNw b25zZUFzeW5jKFJlc291cmNlSGFuZGxlKiwgY29uc3QgUmVzb3UKIAogICAgIHNlbmRBYm9ydGlu Z09uRmFpbHVyZShNZXNzYWdlczo6V2ViUmVzb3VyY2VMb2FkZXI6OkRpZFJlY2VpdmVSZXNwb25z ZVdpdGhDZXJ0aWZpY2F0ZUluZm8ocmVzcG9uc2UsIFBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvKHJl c3BvbnNlKSkpOwogCi0gICAgbV9oYW5kbGUtPmNvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlKCk7 CisgICAgaWYgKCFpc0xvYWRpbmdNYWluUmVzb3VyY2UoKSkgeworICAgICAgICAvLyBGb3IgbWFp biByZXNvdXJjZXMsIHRoZSB3ZWIgcHJvY2VzcyBpcyByZXNwb25zaWJsZSBmb3Igc2VuZGluZyBi YWNrIGEgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSBt ZXNzYWdlLgorICAgICAgICBtX2hhbmRsZS0+Y29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UoKTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KIH0KIAogdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6 OmRpZFJlY2VpdmVEYXRhKFJlc291cmNlSGFuZGxlKiwgY29uc3QgY2hhciogZGF0YSwgaW50IGxl bmd0aCwgaW50IGVuY29kZWREYXRhTGVuZ3RoKQpAQCAtMjc5LDYgKzI4MywxMSBAQCB2b2lkIE5l dHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29udGludWVXaWxsU2VuZFJlcXVlc3QoY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiBuZXdSZQogICAgIG1fc3VnZ2VzdGVkUmVxdWVzdEZvcldpbGxTZW5kUmVxdWVz dCA9IFJlc291cmNlUmVxdWVzdCgpOwogfQogCit2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6 Y29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UoKQoreworICAgIG1faGFuZGxlLT5jb250aW51ZURp ZFJlY2VpdmVSZXNwb25zZSgpOworfQorCiB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlk U2VuZERhdGEoUmVzb3VyY2VIYW5kbGUqLCB1bnNpZ25lZCBsb25nIGxvbmcgYnl0ZXNTZW50LCB1 bnNpZ25lZCBsb25nIGxvbmcgdG90YWxCeXRlc1RvQmVTZW50KQogewogICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlJlc291cmNlTG9hZGVyOjpEaWRTZW5kRGF0YShieXRlc1NlbnQsIHRvdGFsQnl0ZXNU b0JlU2VudCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Jlc291cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUmVzb3VyY2VMb2FkZXIuaAppbmRleCA2ZmIwYjNiMDY0MGY1MmY3MzA4MmRhYjAzMDQwYTM2 NzM1NzVjZjA4Li44YTcyYmEzZTU0OTdiZjg4YTM1ZDk5NWUzMjRlMjg2ZTlkNzQwMzE3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VM b2FkZXIuaApAQCAtMTA2LDYgKzEwNiw3IEBAIHByaXZhdGU6CiAgICAgTmV0d29ya1Jlc291cmNl TG9hZGVyKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiwgTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MqKTsKIAogICAgIHZvaWQgY29udGludWVXaWxsU2VuZFJlcXVlc3Qo Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0KTsKKyAgICB2b2lkIGNv bnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlKCk7CiAjaWYgVVNFKFBST1RFQ1RJT05fU1BBQ0VfQVVU SF9DQUxMQkFDSykKICAgICB2b2lkIGNvbnRpbnVlQ2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3Rl Y3Rpb25TcGFjZShib29sKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLm1lc3NhZ2VzLmluIGIvU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLm1lc3NhZ2VzLmluCmlu ZGV4IDQ3ZjhiYTMzZWVkNzQ5MzAxY2U3YTFmMGMwZWVkYzBkMzA2NGZlOGMuLjAwNzA2YWY0M2Nk NGRkNmU4MThiMDI2ZDk1NjI2MDFjNWY3ZmRhY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5tZXNzYWdlcy5pbgorKysgYi9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIubWVzc2Fn ZXMuaW4KQEAgLTIzLDUgKzIzLDYgQEAKIG1lc3NhZ2VzIC0+IE5ldHdvcmtSZXNvdXJjZUxvYWRl ciBMZWdhY3lSZWNlaXZlciB7CiAKICAgICBDb250aW51ZVdpbGxTZW5kUmVxdWVzdChXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCkKKyAgICBDb250aW51ZURpZFJlY2VpdmVSZXNwb25z ZSgpCiAgICAgQ29udGludWVDYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlKGJv b2wgY2FuQXV0aGVudGljYXRlKQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvU2NoZWR1bGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvU2NoZWR1bGFibGVMb2FkZXIuY3BwCmluZGV4IGJkNjgzM2JhMjFhNDBmOGRmZTEzZTIz ODhjYTE0MDZmOTJjNjdlNGQuLjU1YjBhOTFlNGRkYjk5MzhiYWRhYjZiYmQ1YzM0NjI5NDFkNDRh YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL1NjaGVkdWxhYmxl TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9TY2hlZHVsYWJs ZUxvYWRlci5jcHAKQEAgLTQ2LDggKzQ2LDkgQEAgU2NoZWR1bGFibGVMb2FkZXI6OlNjaGVkdWxh YmxlTG9hZGVyKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiBwYXJhbWUKICAg ICAsIG1fY29udGVudFNuaWZmaW5nUG9saWN5KHBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9s aWN5KQogICAgICwgbV9hbGxvd1N0b3JlZENyZWRlbnRpYWxzKHBhcmFtZXRlcnMuYWxsb3dTdG9y ZWRDcmVkZW50aWFscykKICAgICAsIG1faW5Qcml2YXRlQnJvd3NpbmdNb2RlKHBhcmFtZXRlcnMu aW5Qcml2YXRlQnJvd3NpbmdNb2RlKQotICAgICwgbV9jb25uZWN0aW9uKGNvbm5lY3Rpb24pCiAg ICAgLCBtX3Nob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QocGFyYW1ldGVy cy5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KQorICAgICwgbV9pc0xv YWRpbmdNYWluUmVzb3VyY2UocGFyYW1ldGVycy5pc01haW5SZXNvdXJjZSkKKyAgICAsIG1fY29u bmVjdGlvbihjb25uZWN0aW9uKQogewogICAgIGZvciAoc2l6ZV90IGkgPSAwLCBjb3VudCA9IHBh cmFtZXRlcnMucmVxdWVzdEJvZHlTYW5kYm94RXh0ZW5zaW9ucy5zaXplKCk7IGkgPCBjb3VudDsg KytpKSB7CiAgICAgICAgIGlmIChSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gZXh0ZW5zaW9uID0g U2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlKHBhcmFtZXRlcnMucmVxdWVzdEJvZHlTYW5kYm94RXh0 ZW5zaW9uc1tpXSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9T Y2hlZHVsYWJsZUxvYWRlci5oIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvU2NoZWR1 bGFibGVMb2FkZXIuaAppbmRleCBlZWZmNDUxOTlkODFlMWZhZDUzMjliYTg5YmYwYTUwNWJhOWQ2 ODZmLi43YjI0M2UwNGQ5OWE0YmNiYzU5MTYxNDU3MTkxODM0OGUxNDU3ZTM4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9TY2hlZHVsYWJsZUxvYWRlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL1NjaGVkdWxhYmxlTG9hZGVyLmgKQEAgLTUy LDYgKzUyLDcgQEAgcHVibGljOgogICAgIFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeSBj b250ZW50U25pZmZpbmdQb2xpY3koKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRTbmlmZmluZ1Bv bGljeTsgfQogICAgIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzIGFsbG93U3RvcmVkQ3JlZGVu dGlhbHMoKSBjb25zdCB7IHJldHVybiBtX2FsbG93U3RvcmVkQ3JlZGVudGlhbHM7IH0KICAgICBi b29sIGluUHJpdmF0ZUJyb3dzaW5nTW9kZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5Qcml2YXRlQnJv d3NpbmdNb2RlOyB9CisgICAgYm9vbCBpc0xvYWRpbmdNYWluUmVzb3VyY2UoKSBjb25zdCB7IHJl dHVybiBtX2lzTG9hZGluZ01haW5SZXNvdXJjZTsgfQogCiAgICAgTmV0d29ya0Nvbm5lY3Rpb25U b1dlYlByb2Nlc3MqIGNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MoKSBjb25zdCB7IHJldHVybiBtX2Nv bm5lY3Rpb24uZ2V0KCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgY29ubmVjdGlvblRvV2ViUHJvY2Vz c0RpZENsb3NlKCkgPSAwOwpAQCAtODAsNiArODEsOCBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6 OkNvbnRlbnRTbmlmZmluZ1BvbGljeSBtX2NvbnRlbnRTbmlmZmluZ1BvbGljeTsKICAgICBXZWJD b3JlOjpTdG9yZWRDcmVkZW50aWFscyBtX2FsbG93U3RvcmVkQ3JlZGVudGlhbHM7CiAgICAgYm9v bCBtX2luUHJpdmF0ZUJyb3dzaW5nTW9kZTsKKyAgICBib29sIG1fc2hvdWxkQ2xlYXJSZWZlcnJl ck9uSFRUUFNUb0hUVFBSZWRpcmVjdDsKKyAgICBib29sIG1faXNMb2FkaW5nTWFpblJlc291cmNl OwogCiAgICAgVmVjdG9yPFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiA+IG1fcmVxdWVzdEJvZHlT YW5kYm94RXh0ZW5zaW9uczsKICAgICBWZWN0b3I8UmVmUHRyPFNhbmRib3hFeHRlbnNpb24+ID4g bV9yZXNvdXJjZVNhbmRib3hFeHRlbnNpb25zOwpAQCAtODcsOCArOTAsNiBAQCBwcml2YXRlOgog ICAgIFJlZlB0cjxOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcz4gbV9jb25uZWN0aW9uOwog ICAgIAogICAgIFJlZlB0cjxIb3N0UmVjb3JkPiBtX2hvc3RSZWNvcmQ7Ci0KLSAgICBib29sIG1f c2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdDsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsv TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCmluZGV4IDE5MTMwY2Uz MDIzYWI1ZmUzMzI4NmYyMzA1YmMwYzk0Yzc0YTk0NWEuLmU0YWFkOTk1NWZhODA1YjhkMThlMjIz ZjA0MDU2YzcxZmJhMDU0ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3 b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAKQEAgLTQ2 LDYgKzQ2LDcgQEAgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6Ok5ldHdvcmtSZXNvdXJj ZUxvYWRQYXJhbWV0ZXJzKCkKICAgICAsIGFsbG93U3RvcmVkQ3JlZGVudGlhbHMoRG9Ob3RBbGxv d1N0b3JlZENyZWRlbnRpYWxzKQogICAgICwgaW5Qcml2YXRlQnJvd3NpbmdNb2RlKGZhbHNlKQog ICAgICwgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCh0cnVlKQorICAg ICwgaXNNYWluUmVzb3VyY2UoZmFsc2UpCiB7CiB9CiAKQEAgLTkzLDYgKzk0LDcgQEAgdm9pZCBO ZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVyczo6ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5j b2RlciYgZW5jb2RlcikgY28KICAgICBlbmNvZGVyLmVuY29kZUVudW0oYWxsb3dTdG9yZWRDcmVk ZW50aWFscyk7CiAgICAgZW5jb2RlciA8PCBpblByaXZhdGVCcm93c2luZ01vZGU7CiAgICAgZW5j b2RlciA8PCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0OworICAgIGVu Y29kZXIgPDwgaXNNYWluUmVzb3VyY2U7CiB9CiAKIGJvb2wgTmV0d29ya1Jlc291cmNlTG9hZFBh cmFtZXRlcnM6OmRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIsIE5ldHdv cmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiByZXN1bHQpCkBAIC0xMzksNiArMTQxLDggQEAgYm9v bCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVyczo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50 RGVjb2RlciYgZGVjb2RlciwgTmUKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVzdWx0LnNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJl Y3QpKQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1 bHQuaXNNYWluUmVzb3VyY2UpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4g dHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdv cmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29y ay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCmluZGV4IDAwMjY3ZjE2NjdmOWM4OTI4 NjI2ODBiYTNmMjBiOTNkMWJjYjYwODMuLmU4M2QyZWMxZDZhYjlkYTI4OTE1NDkyNGVkMzNjNjA5 MWNhOWY2MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdv cmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05l dHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaApAQCAtNjAsNiArNjAsNyBAQCBw dWJsaWM6CiAgICAgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHMgYWxsb3dTdG9yZWRDcmVkZW50 aWFsczsKICAgICBib29sIGluUHJpdmF0ZUJyb3dzaW5nTW9kZTsKICAgICBib29sIHNob3VsZENs ZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7CisgICAgYm9vbCBpc01haW5SZXNvdXJj ZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNw cAppbmRleCAzZTllNDBmODAwYThkYzg3NzQwNWQxNGQ5MWNhYWI0YjJjMTA4NDk0Li44ZTFlNGI3 Y2M2NGVmY2RkYmQ2MDc3NjgwZDI2NDIzNTFmZmQ1MjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1 bGVyLmNwcApAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgIldlYlBhZ2UuaCIKICNpbmNsdWRl ICJXZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSAiV2ViUmVzb3VyY2VMb2FkZXIuaCIKKyNpbmNsdWRl IDxXZWJDb3JlL0NhY2hlZFJlc291cmNlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Eb2N1bWVudC5o PgogI2luY2x1ZGUgPFdlYkNvcmUvRG9jdW1lbnRMb2FkZXIuaD4KICNpbmNsdWRlIDxXZWJDb3Jl L0ZyYW1lLmg+CkBAIC02OSw3ICs3MCw3IEBAIFBhc3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+ IFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVTdWJyZXNvdXJjZUxvYWQoCiB7CiAg ICAgUmVmUHRyPFN1YnJlc291cmNlTG9hZGVyPiBsb2FkZXIgPSBTdWJyZXNvdXJjZUxvYWRlcjo6 Y3JlYXRlKGZyYW1lLCByZXNvdXJjZSwgcmVxdWVzdCwgb3B0aW9ucyk7CiAgICAgaWYgKGxvYWRl cikKLSAgICAgICAgc2NoZWR1bGVMb2FkKGxvYWRlci5nZXQoKSwgcHJpb3JpdHksIGZyYW1lLT5k b2N1bWVudCgpLT5yZWZlcnJlclBvbGljeSgpID09IFJlZmVycmVyUG9saWN5RGVmYXVsdCk7Cisg ICAgICAgIHNjaGVkdWxlTG9hZChsb2FkZXIuZ2V0KCksIHJlc291cmNlLCBwcmlvcml0eSwgZnJh bWUtPmRvY3VtZW50KCktPnJlZmVycmVyUG9saWN5KCkgPT0gUmVmZXJyZXJQb2xpY3lEZWZhdWx0 KTsKICAgICByZXR1cm4gbG9hZGVyLnJlbGVhc2UoKTsKIH0KIApAQCAtNzcsMTEgKzc4LDExIEBA IFBhc3NSZWZQdHI8TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI+IFdlYlJlc291cmNlTG9hZFNj aGVkdWxlcjo6c2NoZWR1bGVQbHVnaW5TCiB7CiAgICAgUmVmUHRyPE5ldHNjYXBlUGx1Z0luU3Ry ZWFtTG9hZGVyPiBsb2FkZXIgPSBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6Y3JlYXRlKGZy YW1lLCBjbGllbnQsIHJlcXVlc3QpOwogICAgIGlmIChsb2FkZXIpCi0gICAgICAgIHNjaGVkdWxl TG9hZChsb2FkZXIuZ2V0KCksIFJlc291cmNlTG9hZFByaW9yaXR5TG93LCBmcmFtZS0+ZG9jdW1l bnQoKS0+cmVmZXJyZXJQb2xpY3koKSA9PSBSZWZlcnJlclBvbGljeURlZmF1bHQpOworICAgICAg ICBzY2hlZHVsZUxvYWQobG9hZGVyLmdldCgpLCAwLCBSZXNvdXJjZUxvYWRQcmlvcml0eUxvdywg ZnJhbWUtPmRvY3VtZW50KCktPnJlZmVycmVyUG9saWN5KCkgPT0gUmVmZXJyZXJQb2xpY3lEZWZh dWx0KTsKICAgICByZXR1cm4gbG9hZGVyLnJlbGVhc2UoKTsKIH0KIAotdm9pZCBXZWJSZXNvdXJj ZUxvYWRTY2hlZHVsZXI6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciogcmVzb3VyY2VMb2Fk ZXIsIFJlc291cmNlTG9hZFByaW9yaXR5IHByaW9yaXR5LCBib29sIHNob3VsZENsZWFyUmVmZXJy ZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QpCit2b2lkIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6 c2NoZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciwgQ2FjaGVkUmVzb3Vy Y2UqIHJlc291cmNlLCBSZXNvdXJjZUxvYWRQcmlvcml0eSBwcmlvcml0eSwgYm9vbCBzaG91bGRD bGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KQogewogICAgIEFTU0VSVChyZXNvdXJj ZUxvYWRlcik7CiAgICAgQVNTRVJUKHByaW9yaXR5ICE9IFJlc291cmNlTG9hZFByaW9yaXR5VW5y ZXNvbHZlZCk7CkBAIC0xMTcsNiArMTE4LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTY2hlZHVs ZXI6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciogcmVzb3VyY2VMb2FkZXIsIFJlc28KICAg ICBsb2FkUGFyYW1ldGVycy5hbGxvd1N0b3JlZENyZWRlbnRpYWxzID0gYWxsb3dTdG9yZWRDcmVk ZW50aWFsczsKICAgICBsb2FkUGFyYW1ldGVycy5pblByaXZhdGVCcm93c2luZ01vZGUgPSBwcml2 YXRlQnJvd3NpbmdFbmFibGVkOwogICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZENsZWFyUmVmZXJy ZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QgPSBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRU UFJlZGlyZWN0OworICAgIGxvYWRQYXJhbWV0ZXJzLmlzTWFpblJlc291cmNlID0gcmVzb3VyY2Ug JiYgcmVzb3VyY2UtPnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6TWFpblJlc291cmNlOwogCiAg ICAgaWYgKCFXZWJQcm9jZXNzOjpzaGFyZWQoKS5uZXR3b3JrQ29ubmVjdGlvbigpLT5jb25uZWN0 aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpTY2hl ZHVsZVJlc291cmNlTG9hZChsb2FkUGFyYW1ldGVycyksIDApKSB7CiAgICAgICAgIC8vIFdlIHBy b2JhYmx5IGZhaWxlZCB0byBzY2hlZHVsZSB0aGlzIGxvYWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nl c3MgYmVjYXVzZSBpdCBoYWQgY3Jhc2hlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuaCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuaAppbmRleCBj NTM0NTYyMjk2YmFmNjZjZDQ3MWFhMDg0ZWQ2OWQ5OGMxOTk2NDljLi42ODZjMTVmMmYzYzM5MDgx MGI3YmViZDBlM2Q0ZjJlMzVmODhhYzRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5oCkBAIC02 Myw3ICs2Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIG5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCgpOwog CiBwcml2YXRlOgotICAgIHZvaWQgc2NoZWR1bGVMb2FkKFdlYkNvcmU6OlJlc291cmNlTG9hZGVy KiwgV2ViQ29yZTo6UmVzb3VyY2VMb2FkUHJpb3JpdHksIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJl ck9uSFRUUFNUb0hUVFBSZWRpcmVjdCk7CisgICAgdm9pZCBzY2hlZHVsZUxvYWQoV2ViQ29yZTo6 UmVzb3VyY2VMb2FkZXIqLCBXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZSosIFdlYkNvcmU6OlJlc291 cmNlTG9hZFByaW9yaXR5LCBib29sIHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVk aXJlY3QpOwogICAgIHZvaWQgc2NoZWR1bGVJbnRlcm5hbGx5RmFpbGVkTG9hZChXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlciopOwogICAgIHZvaWQgaW50ZXJuYWxseUZhaWxlZExvYWRUaW1lckZpcmVk KCk7CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsv V2ViUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYlJlc291cmNlTG9hZGVyLmNwcAppbmRleCBmOWFjM2ExMDBiZmRhMjVlZmRkZTdlNDk2NWMz ZDYyNmQzMWZjOTllLi5mZDVkMmEzNjJkMjQ5MTlkZGY2YjBiZjBlODFjZGIyMDRlZmI3Njc2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VM b2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNv dXJjZUxvYWRlci5jcHAKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJXZWJDb3JlQXJndW1l bnRDb2RlcnMuaCIKICNpbmNsdWRlICJXZWJFcnJvcnMuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNz LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9Eb2N1bWVudExvYWRlci5oPgogI2luY2x1ZGUgPFdlYkNv cmUvUmVzb3VyY2VCdWZmZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlRXJyb3IuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlTG9hZGVyLmg+CkBAIC0xMDQsNiArMTA1LDkgQEAg dm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlV2l0aENlcnRpZmljYXRl SW5mbyhjb25zdCBSZXNvdXJjZVJlc3AKICAgICBSZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlQ29w eShyZXNwb25zZSk7CiAgICAgcmVzcG9uc2VDb3B5LnNldENlcnRpZmljYXRlQ2hhaW4oY2VydGlm aWNhdGVJbmZvLmNlcnRpZmljYXRlQ2hhaW4oKSk7CiAgICAgbV9jb3JlTG9hZGVyLT5kaWRSZWNl aXZlUmVzcG9uc2UocmVzcG9uc2VDb3B5KTsKKworICAgIGlmIChtX2NvcmVMb2FkZXIgPT0gbV9j b3JlTG9hZGVyLT5kb2N1bWVudExvYWRlcigpLT5tYWluUmVzb3VyY2VMb2FkZXIoKSkKKyAgICAg ICAgc2VuZChNZXNzYWdlczo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpDb250aW51ZURpZFJlY2Vp dmVSZXNwb25zZSgpKTsKIH0KIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURh dGEoY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgaW50NjRfdCBlbmNvZGVkRGF0 YUxlbmd0aCkK