127847 2014-01-29 11:20:51 -0800 Consolidate page loading functions 2014-01-30 12:29:43 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 127934 1 andersca andersca aestes oldest_to_newest 973422 0 andersca 2014-01-29 11:20:51 -0800 Consolidate page loading functions 973423 1 222585 andersca 2014-01-29 11:22:09 -0800 Created attachment 222585 Patch 973448 2 andersca 2014-01-29 12:49:28 -0800 Committed r163037: <http://trac.webkit.org/changeset/163037> 973909 3 aestes 2014-01-30 12:29:43 -0800 This change broke the WebKit2.PageLoadBasic test on Mountain Lion. I filed <https://bugs.webkit.org/show_bug.cgi?id=127934> and disabled the test in <http://trac.webkit.org/changeset/163100>. 222585 2014-01-29 11:22:09 -0800 2014-01-29 11:25:56 -0800 Patch bug-127847-20140129112208.patch text/plain 14092 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTYxMDgzMjUwZDllMzg4 NDlkMTJiMTAwNGI3NTVjNjEyM2M0NzFjYy4uOGZkOTQ4YmZlODU3ZTg2MTljZGMzN2QzMDUwMzY0 NGM0ZGU4OWM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE0LTAxLTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ29uc29saWRhdGUg cGFnZSBsb2FkaW5nIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI3ODQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgR2V0IHJpZCBvZiB0aGUgbG9hZFVSTCBmdW5jdGlvbnMgKGFuZCB0aGUg TG9hZFVSTCBtZXNzYWdlKSwgcmVuYW1lCisgICAgICAgIGxvYWRVUkxSZXF1ZXN0IHRvIGxvYWRS ZXF1ZXN0IGFuZCBjaGFuZ2UgaXQgdG8gdGFrZSBhIFJlc291cmNlUmVxdWVzdCBpbnN0ZWFkCisg ICAgICAgIG9mIGFuIEFQSTo6VVJMUmVxdWVzdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlTG9hZFVSTCk6CisgICAgICAgIChXS1BhZ2VM b2FkVVJMV2l0aFVzZXJEYXRhKToKKyAgICAgICAgKFdLUGFnZUxvYWRVUkxSZXF1ZXN0KToKKyAg ICAgICAgKFdLUGFnZUxvYWRVUkxSZXF1ZXN0V2l0aFVzZXJEYXRhKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5tbToKKyAgICAgICAg KC1bV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIGxvYWRSZXF1ZXN0OnVzZXJEYXRhOl0pOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtX S1dlYlZpZXcgbG9hZFJlcXVlc3Q6XSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkluc3BlY3Rv clByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpjcmVhdGVJbnNwZWN0 b3JQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6bG9hZEZpbGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvY2YvV2ViUGFnZVByb3h5Q0YuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlRGF0YSk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpsb2FkUmVxdWVzdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoK KwogMjAxNC0wMS0yOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJlbW92ZSBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikgZ3VhcmRzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCmluZGV4IGFmNjVhNGE5MDE2MmUwMjFi OTIwNjBhNjA3MWIwZjVjZjM4N2FlODQuLmMzOThiNzA2MGZjODZjNjk1N2YzNDNhYTE4ZWU3OTFj MTZhYzVmY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1Bh Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCkBA IC04MiwyMiArODIsMjIgQEAgV0tQYWdlR3JvdXBSZWYgV0tQYWdlR2V0UGFnZUdyb3VwKFdLUGFn ZVJlZiBwYWdlUmVmKQogCiB2b2lkIFdLUGFnZUxvYWRVUkwoV0tQYWdlUmVmIHBhZ2VSZWYsIFdL VVJMUmVmIFVSTFJlZikKIHsKLSAgICB0b0ltcGwocGFnZVJlZiktPmxvYWRVUkwodG9XVEZTdHJp bmcoVVJMUmVmKSk7CisgICAgdG9JbXBsKHBhZ2VSZWYpLT5sb2FkUmVxdWVzdCh0b1dURlN0cmlu ZyhVUkxSZWYpKTsKIH0KIAogdm9pZCBXS1BhZ2VMb2FkVVJMV2l0aFVzZXJEYXRhKFdLUGFnZVJl ZiBwYWdlUmVmLCBXS1VSTFJlZiBVUkxSZWYsIFdLVHlwZVJlZiB1c2VyRGF0YVJlZikKIHsKLSAg ICB0b0ltcGwocGFnZVJlZiktPmxvYWRVUkwodG9XVEZTdHJpbmcoVVJMUmVmKSwgdG9JbXBsKHVz ZXJEYXRhUmVmKSk7CisgICAgdG9JbXBsKHBhZ2VSZWYpLT5sb2FkUmVxdWVzdChVUkwoVVJMKCks IHRvV1RGU3RyaW5nKFVSTFJlZikpLCB0b0ltcGwodXNlckRhdGFSZWYpKTsKIH0KIAogdm9pZCBX S1BhZ2VMb2FkVVJMUmVxdWVzdChXS1BhZ2VSZWYgcGFnZVJlZiwgV0tVUkxSZXF1ZXN0UmVmIHVy bFJlcXVlc3RSZWYpCiB7Ci0gICAgdG9JbXBsKHBhZ2VSZWYpLT5sb2FkVVJMUmVxdWVzdCh0b0lt cGwodXJsUmVxdWVzdFJlZikpOyAgICAKKyAgICB0b0ltcGwocGFnZVJlZiktPmxvYWRSZXF1ZXN0 KHRvSW1wbCh1cmxSZXF1ZXN0UmVmKS0+cmVzb3VyY2VSZXF1ZXN0KCkpOwogfQogCiB2b2lkIFdL UGFnZUxvYWRVUkxSZXF1ZXN0V2l0aFVzZXJEYXRhKFdLUGFnZVJlZiBwYWdlUmVmLCBXS1VSTFJl cXVlc3RSZWYgdXJsUmVxdWVzdFJlZiwgV0tUeXBlUmVmIHVzZXJEYXRhUmVmKQogewotICAgIHRv SW1wbChwYWdlUmVmKS0+bG9hZFVSTFJlcXVlc3QodG9JbXBsKHVybFJlcXVlc3RSZWYpLCB0b0lt cGwodXNlckRhdGFSZWYpKTsgICAgCisgICAgdG9JbXBsKHBhZ2VSZWYpLT5sb2FkUmVxdWVzdCh0 b0ltcGwodXJsUmVxdWVzdFJlZiktPnJlc291cmNlUmVxdWVzdCgpLCB0b0ltcGwodXNlckRhdGFS ZWYpKTsKIH0KIAogdm9pZCBXS1BhZ2VMb2FkRmlsZShXS1BhZ2VSZWYgcGFnZVJlZiwgV0tVUkxS ZWYgZmlsZVVSTCwgV0tVUkxSZWYgcmVzb3VyY2VEaXJlY3RvcnlVUkwpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJv bGxlci5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0Nv bnRleHRDb250cm9sbGVyLm1tCmluZGV4IDhkMDM3ZWZmZWIwMjdjYTMwZGZkMmYwZGEzMGE4ZjFi YzY1ZmNjYzEuLjY0MzNhZDA2ZmNhYzRjYzUwNDVjNDcwOGJkMDEzOWVkYTY0OGZkZjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRl eHRDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCkBAIC0xODcsMTMgKzE4NywxMSBAQCBzdGF0 aWMgSGFzaE1hcDxXZWJQYWdlUHJveHkqLCBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKj4m IGJyb3dzaW5nQ29udGV4dENvbgogCiAtICh2b2lkKWxvYWRSZXF1ZXN0OihOU1VSTFJlcXVlc3Qg KilyZXF1ZXN0IHVzZXJEYXRhOihpZCl1c2VyRGF0YQogewotICAgIFJlZlB0cjxBUEk6OlVSTFJl cXVlc3Q+IHdrVVJMUmVxdWVzdCA9IEFQSTo6VVJMUmVxdWVzdDo6Y3JlYXRlKHJlcXVlc3QpOwot CiAgICAgUmVmUHRyPE9iakNPYmplY3RHcmFwaD4gd2tVc2VyRGF0YTsKICAgICBpZiAodXNlckRh dGEpCiAgICAgICAgIHdrVXNlckRhdGEgPSBPYmpDT2JqZWN0R3JhcGg6OmNyZWF0ZSh1c2VyRGF0 YSk7CiAKLSAgICBfcGFnZS0+bG9hZFVSTFJlcXVlc3Qod2tVUkxSZXF1ZXN0LmdldCgpLCB3a1Vz ZXJEYXRhLmdldCgpKTsKKyAgICBfcGFnZS0+bG9hZFJlcXVlc3QocmVxdWVzdCwgd2tVc2VyRGF0 YS5nZXQoKSk7CiB9CiAKIC0gKHZvaWQpbG9hZEZpbGVVUkw6KE5TVVJMICopVVJMIHJlc3RyaWN0 VG9GaWxlc1dpdGhpbjooTlNVUkwgKilhbGxvd2VkRGlyZWN0b3J5CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IDQ2OTcwNGE2ZWY1ZTY4 OGZhOGU2YTg1MmExZmM2MTliZTdjOTU4NzMuLjMyNTRkYzhiZGYwMzFhMTU0NGY4MGFhM2Y2NDc5 YWQ5ODI2ODhmNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCkBAIC0xMDksNyArMTA5LDcgQEAgc3RhdGljIF9VSVdlYlZpZXdwb3J0Q29u ZmlndXJhdGlvbiBzdGFuZGFyZFZpZXdwb3J0Q29uZmlndXJhdGlvbiA9IHsgeyBVSVdlYlZpZXcK IAogLSAodm9pZClsb2FkUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdAogewotICAgIF9w YWdlLT5sb2FkVVJMUmVxdWVzdChBUEk6OlVSTFJlcXVlc3Q6OmNyZWF0ZShyZXF1ZXN0KS5nZXQo KSk7CisgICAgX3BhZ2UtPmxvYWRSZXF1ZXN0KHJlcXVlc3QpOwogfQogCiAjcHJhZ21hIG1hcmsg aU9TLXNwZWNpZmljIG1ldGhvZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJJbnNwZWN0b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5z cGVjdG9yUHJveHkuY3BwCmluZGV4IGE2MGQ5YjEzY2JlNGU0MWJjMTNjZjI4NjNkMzkzMTdjNzhk Zjc4MGIuLjJkMjI5N2Y4Y2VkYmJmM2VkNzJlNTc0ODc5YTAzM2JkZjFmNjBlNGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcApAQCAtMzk0LDcg KzM5NCw3IEBAIHN0YXRpYyB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV0tQ YWdlUmVmLCBXS0ZyYW1lUmVmIGZyYW1lUmVmLCBXS0ZyCiAgICAgdG9JbXBsKGxpc3RlbmVyUmVm KS0+aWdub3JlKCk7CiAKICAgICAvLyBBbmQgaW5zdGVhZCBsb2FkIGl0IGluIHRoZSBpbnNwZWN0 ZWQgcGFnZS4KLSAgICB3ZWJJbnNwZWN0b3JQcm94eS0+cGFnZSgpLT5sb2FkVVJMUmVxdWVzdCh0 b0ltcGwocmVxdWVzdFJlZikpOworICAgIHdlYkluc3BlY3RvclByb3h5LT5wYWdlKCktPmxvYWRS ZXF1ZXN0KHRvSW1wbChyZXF1ZXN0UmVmKS0+cmVzb3VyY2VSZXF1ZXN0KCkpOwogfQogCiAjaWYg RU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCkBAIC00NzEsNyArNDcxLDcgQEAgdm9pZCBXZWJJbnNw ZWN0b3JQcm94eTo6Y3JlYXRlSW5zcGVjdG9yUGFnZSh1aW50NjRfdCYgaW5zcGVjdG9yUGFnZUlE LCBXZWJQYWdlQ3IKIAogICAgIG1fcGFnZS0+cHJvY2VzcygpLmFzc3VtZVJlYWRBY2Nlc3NUb0Jh c2VVUkwoaW5zcGVjdG9yQmFzZVVSTCgpKTsKIAotICAgIGluc3BlY3RvclBhZ2UtPmxvYWRVUkwo dXJsKTsKKyAgICBpbnNwZWN0b3JQYWdlLT5sb2FkUmVxdWVzdChVUkwoVVJMKCksIHVybCkpOwog CiAgICAgbV9jcmVhdGVkSW5zcGVjdG9yUGFnZSA9IHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGEzZGU5OTljYjcxZDZiYTMxNDY5NWE5YzJl ZWMxZDQ3YTNjOThmNDAuLmE4MDRhMTUzNWIzY2NhNjIyYjM5OWViMjQ2NmE3MzQ2YmFlNGU0M2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC02MDcsMzcg KzYwNywyMCBAQCBib29sIFdlYlBhZ2VQcm94eTo6bWF5YmVJbml0aWFsaXplU2FuZGJveEV4dGVu c2lvbkhhbmRsZShjb25zdCBVUkwmIHVybCwgU2FuZGJveAogICAgIHJldHVybiB0cnVlOwogfQog Ci12b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFVSTChjb25zdCBTdHJpbmcmIHVybCwgQVBJOjpPYmpl Y3QqIHVzZXJEYXRhKQordm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0KGNvbnN0IFJlc291 cmNlUmVxdWVzdCYgcmVxdWVzdCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGF1dG8g dHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIAotICAgIG1fcGFn ZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgdXJsKTsKKyAg ICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHJl cXVlc3QudXJsKCkpOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJlYXR0YWNoVG9X ZWJQcm9jZXNzKCk7CiAKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVu c2lvbkhhbmRsZTsKLSAgICBib29sIGNyZWF0ZWRFeHRlbnNpb24gPSBtYXliZUluaXRpYWxpemVT YW5kYm94RXh0ZW5zaW9uSGFuZGxlKFVSTChVUkwoKSwgdXJsKSwgc2FuZGJveEV4dGVuc2lvbkhh bmRsZSk7CisgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gbWF5YmVJbml0aWFsaXplU2FuZGJv eEV4dGVuc2lvbkhhbmRsZShyZXF1ZXN0LnVybCgpLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsK ICAgICBpZiAoY3JlYXRlZEV4dGVuc2lvbikKICAgICAgICAgbV9wcm9jZXNzLT53aWxsQWNxdWly ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbigpOwotICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZFVSTCh1cmwsIHNhbmRib3hFeHRlbnNpb25IYW5kbGUs IFdlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEsIHByb2Nlc3MoKSkpLCBtX3Bh Z2VJRCk7Ci0gICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7Ci19 Ci0KLXZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkVVJMUmVxdWVzdChBUEk6OlVSTFJlcXVlc3QqIHVy bFJlcXVlc3QsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKLXsKLSAgICBhdXRvIHRyYW5zYWN0aW9u ID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7Ci0KLSAgICBtX3BhZ2VMb2FkU3RhdGUu c2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybFJlcXVlc3QtPnJlc291cmNl UmVxdWVzdCgpLnVybCgpKTsKLQotICAgIGlmICghaXNWYWxpZCgpKQotICAgICAgICByZWF0dGFj aFRvV2ViUHJvY2VzcygpOwotCi0gICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIHNhbmRib3hF eHRlbnNpb25IYW5kbGU7Ci0gICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gbWF5YmVJbml0aWFs aXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZSh1cmxSZXF1ZXN0LT5yZXNvdXJjZVJlcXVlc3QoKS51 cmwoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7Ci0gICAgaWYgKGNyZWF0ZWRFeHRlbnNpb24p Ci0gICAgICAgIG1fcHJvY2Vzcy0+d2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hF eHRlbnNpb24oKTsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRV UkxSZXF1ZXN0KHVybFJlcXVlc3QtPnJlc291cmNlUmVxdWVzdCgpLCBzYW5kYm94RXh0ZW5zaW9u SGFuZGxlLCBXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkp KSwgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TG9h ZFJlcXVlc3QocmVxdWVzdCwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgV2ViQ29udGV4dFVzZXJN ZXNzYWdlRW5jb2Rlcih1c2VyRGF0YSwgcHJvY2VzcygpKSksIG1fcGFnZUlEKTsKICAgICBtX3By b2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIH0KIApAQCAtNjY0LDcgKzY0 Nyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVVUkxT dHJpbmcsIGNvbnN0IFN0cmluZyYgcmVzb3VyY2VECiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFu ZGxlIHNhbmRib3hFeHRlbnNpb25IYW5kbGU7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRl SGFuZGxlKHJlc291cmNlRGlyZWN0b3J5UGF0aCwgU2FuZGJveEV4dGVuc2lvbjo6UmVhZE9ubHks IHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogICAgIG1fcHJvY2Vzcy0+YXNzdW1lUmVhZEFjY2Vz c1RvQmFzZVVSTChyZXNvdXJjZURpcmVjdG9yeVVSTCk7Ci0gICAgbV9wcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlOjpMb2FkVVJMKGZpbGVVUkwsIHNhbmRib3hFeHRlbnNpb25IYW5kbGUs IFdlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEsIHByb2Nlc3MoKSkpLCBtX3Bh Z2VJRCk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkUmVxdWVz dChmaWxlVVJMLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBXZWJDb250ZXh0VXNlck1lc3NhZ2VF bmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpKSwgbV9wYWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+ cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMzk5ZWZhMjRmNzVjZGUzYWJjMTliNmFjYzlkMjYyMDdi NjM5MWI5ZC4uMDJjYzNiZDdiYjllZjMwYjkwYjZkZWUxY2VkNmNiM2E5N2Y5ZGU3YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMzgwLDggKzM4MCw3IEBAIHB1 YmxpYzoKICAgICBib29sIHRyeUNsb3NlKCk7CiAgICAgYm9vbCBpc0Nsb3NlZCgpIGNvbnN0IHsg cmV0dXJuIG1faXNDbG9zZWQ7IH0KIAotICAgIHZvaWQgbG9hZFVSTChjb25zdCBTdHJpbmcmLCBB UEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsKLSAgICB2b2lkIGxvYWRVUkxSZXF1ZXN0 KEFQSTo6VVJMUmVxdWVzdCosIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOworICAg IHZvaWQgbG9hZFJlcXVlc3QoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgQVBJOjpP YmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7CiAgICAgdm9pZCBsb2FkRmlsZShjb25zdCBTdHJp bmcmIGZpbGVVUkwsIGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEaXJlY3RvcnlVUkwsIEFQSTo6T2Jq ZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOwogICAgIHZvaWQgbG9hZERhdGEoQVBJOjpEYXRhKiwg Y29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3Ry aW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsKICAgICB2b2lk IGxvYWRIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5nJiBi YXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvY2YvV2ViUGFnZVByb3h5Q0YuY3BwCmluZGV4IGZjODFjM2YyZWQxZWVj ZDY1MWFlMmNkM2QyNzE3ZWZhYTZlYmNhNTguLmMxOTEzNWFkNmI2NDU3NTRlZWU2NmMzMzk5YTc1 NDk4OTg3Y2YzMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQ YWdlUHJveHlDRi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQ cm94eUNGLmNwcApAQCAtMTc2LDcgKzE3Niw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZXN0b3Jl RnJvbVNlc3Npb25TdGF0ZURhdGEoQVBJOjpEYXRhKiBhcGlEYXRhKQogICAgIH0KIAogICAgIGlm IChwcm92aXNpb25hbFVSTCkKLSAgICAgICAgbG9hZFVSTChwcm92aXNpb25hbFVSTCk7CisgICAg ICAgIGxvYWRSZXF1ZXN0KFVSTChVUkwoKSwgcHJvdmlzaW9uYWxVUkwpKTsKIH0KIAogc3RhdGlj IFJldGFpblB0cjxDRlN0cmluZ1JlZj4gYXV0b3NhdmVLZXkoY29uc3QgU3RyaW5nJiBuYW1lKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGQ5 YjZmNjk1MDFhNzQxMjFmZDZjMzg4OWUxNWJkMTIzN2RjNzgwNDMuLjhkN2VjYTRkYmFhMTI5OWQ1 NzQzZWU4ZDY4OTcyN2I3ZGI0ODEzMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTg5MSwxMSArODkxLDYgQEAgdm9pZCBXZWJQYWdlOjpz ZW5kQ2xvc2UoKQogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Q2xvc2VQYWdlKGZh bHNlKSk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6bG9hZFVSTChjb25zdCBTdHJpbmcmIHVybCwgY29u c3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBJUEM6 Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQotewotICAgIGxvYWRVUkxSZXF1ZXN0KFJlc291cmNl UmVxdWVzdChVUkwoVVJMKCksIHVybCkpLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBkZWNvZGVy KTsKLX0KLQogdm9pZCBXZWJQYWdlOjpsb2FkVVJMSW5GcmFtZShjb25zdCBTdHJpbmcmIHVybCwg dWludDY0X3QgZnJhbWVJRCkKIHsKICAgICBXZWJGcmFtZSogZnJhbWUgPSBXZWJQcm9jZXNzOjpz aGFyZWQoKS53ZWJGcmFtZShmcmFtZUlEKTsKQEAgLTkwNSw3ICs5MDAsNyBAQCB2b2lkIFdlYlBh Z2U6OmxvYWRVUkxJbkZyYW1lKGNvbnN0IFN0cmluZyYgdXJsLCB1aW50NjRfdCBmcmFtZUlEKQog ICAgIGZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkubG9hZChGcmFtZUxvYWRSZXF1ZXN0KGZy YW1lLT5jb3JlRnJhbWUoKSwgUmVzb3VyY2VSZXF1ZXN0KFVSTChVUkwoKSwgdXJsKSkpKTsKIH0K IAotdm9pZCBXZWJQYWdlOjpsb2FkVVJMUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhh bmRsZSwgSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKK3ZvaWQgV2ViUGFnZTo6bG9hZFJl cXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGUmIHNhbmRib3hFeHRlbnNpb25IYW5kbGUsIElQQzo6TWVzc2FnZURlY29kZXIm IGRlY29kZXIpCiB7CiAgICAgU2VuZFN0b3BSZXNwb25zaXZlbmVzc1RpbWVyIHN0b3BwZXIodGhp cyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4 IDYxMWU4OGFlZjJjNmYyYmFkZTBkYzZiNGRmY2RkOTc0MWFmNWRkYjYuLmE5ODMzNTlmNWRhMzM4 NDdmOGMzMDZjYWE5MzU1M2I0YzcxMTE4MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtNzIzLDggKzcyMyw3IEBAIHByaXZhdGU6CiAKICAgICAv LyBBY3Rpb25zCiAgICAgdm9pZCB0cnlDbG9zZSgpOwotICAgIHZvaWQgbG9hZFVSTChjb25zdCBT dHJpbmcmLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmLCBJUEM6Ok1lc3NhZ2VEZWNv ZGVyJik7Ci0gICAgdm9pZCBsb2FkVVJMUmVxdWVzdChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmLCBJUEM6Ok1lc3NhZ2VEZWNv ZGVyJik7CisgICAgdm9pZCBsb2FkUmVxdWVzdChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmLCBJUEM6Ok1lc3NhZ2VEZWNvZGVy Jik7CiAgICAgdm9pZCBsb2FkRGF0YShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBT dHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nTmFtZSwgY29uc3QgU3RyaW5n JiBiYXNlVVJMLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAgICAgdm9pZCBsb2FkSFRNTFN0cmlu Zyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgSVBDOjpN ZXNzYWdlRGVjb2RlciYpOwogICAgIHZvaWQgbG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcoY29uc3Qg U3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIGNvbnN0IFN0cmluZyYg dW5yZWFjaGFibGVVUkwsIElQQzo6TWVzc2FnZURlY29kZXImKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggN2Jl OGZkY2E1YmY0ZDZmNGFlMzhmNTA4ZmY0MzM5MWRkY2ZlOTQzMS4uZmRlYjljNmM0MjBhZGIwNmY2 YTUxM2E2Y2RlNGU3YTc2MGEzYjYxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTgxLDkgKzgxLDggQEAgbWVz c2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgR29Ub0JhY2tGb3J3YXJkSXRl bSh1aW50NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCkKICAgICBUcnlSZXN0b3JlU2Nyb2xsUG9zaXRp b24oKQogCi0gICAgTG9hZFVSTChTdHJpbmcgdXJsLCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246 OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBXZWJLaXQ6OldlYkNvbnRleHRVc2VyTWVz c2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgTG9hZFVSTEluRnJhbWUoU3RyaW5n IHVybCwgdWludDY0X3QgZnJhbWVJRCkKLSAgICBMb2FkVVJMUmVxdWVzdChXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QgcmVxdWVzdCwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2Fu ZGJveEV4dGVuc2lvbkhhbmRsZSwgV2ViS2l0OjpXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVy IHVzZXJEYXRhKSBWYXJpYWRpYworICAgIExvYWRSZXF1ZXN0KFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCByZXF1ZXN0LCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0 ZW5zaW9uSGFuZGxlLCBXZWJLaXQ6OldlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRh dGEpIFZhcmlhZGljCiAgICAgTG9hZERhdGEoSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGEsIFN0cmlu ZyBNSU1FVHlwZSwgU3RyaW5nIGVuY29kaW5nLCBTdHJpbmcgYmFzZVVSTCwgV2ViS2l0OjpXZWJD b250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIExvYWRIVE1M U3RyaW5nKFN0cmluZyBodG1sU3RyaW5nLCBTdHJpbmcgYmFzZVVSTCwgV2ViS2l0OjpXZWJDb250 ZXh0VXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIExvYWRBbHRlcm5h dGVIVE1MU3RyaW5nKFN0cmluZyBodG1sU3RyaW5nLCBTdHJpbmcgYmFzZVVSTCwgU3RyaW5nIHVu cmVhY2hhYmxlVVJMLCBXZWJLaXQ6OldlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRh dGEpIFZhcmlhZGljCg==