105644 2012-12-21 10:55:00 -0800 Remove ResourceLoadScheduler::addMainResourceLoad and all related code 2012-12-21 11:15:41 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson webkit-unassigned ap sam oldest_to_newest 796378 0 beidson 2012-12-21 10:55:00 -0800 Remove ResourceLoadScheduler::addMainResourceLoad and all related code Once main resources became scheduled, cached loads, the "addMainResourceLoad" code path became irrelevant. Let's nuke it. In radar as <rdar://problem/12925275> 796380 1 beidson 2012-12-21 10:57:03 -0800 Fixing https://bugs.webkit.org/show_bug.cgi?id=49246 is what made this possible, for future reference. 796383 2 180536 beidson 2012-12-21 10:59:56 -0800 Created attachment 180536 Patch v1 796391 3 beidson 2012-12-21 11:15:41 -0800 http://trac.webkit.org/changeset/138391 180536 2012-12-21 10:59:56 -0800 2012-12-21 11:00:56 -0800 Patch v1 patch text/plain 8035 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MDU4MTBkLi5lN2VkMmU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTItMTItMjEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFJlbW92ZSBSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OmFkZE1haW5SZXNvdXJjZUxvYWQgYW5k IGFsbCByZWxhdGVkIGNvZGUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyOTI1Mjc1PiBhbmQg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTY0NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vdyB0aGF0IG1haW4gcmVz b3VyY2VzIGxvYWRzIGFyZSBzY2hlZHVsZWQgKGJ1ZyA0OTI0Nikgd2UgZG9uJ3QgbmVlZCB0aGlz IHN0dWZmIGFueW1vcmUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChObyBjaGFuZ2UgaW4gYmVo YXZpb3IpLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogbG9hZGVyL1Jl c291cmNlTG9hZFNjaGVkdWxlci5jcHA6CisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZFNj aGVkdWxlci5oOgorCiAyMDEyLTEyLTIxICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEzODM3Ni4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KaW5kZXggMGM3MzA2ZS4uNjdhMmNhMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KQEAgLTU5Niw3ICs1OTYsNiBAQCBfX1pON1dlYkNvcmUyMFNwYWNlU3BsaXRTdHJpbmdEYXRh RDFFdgogX19aTjdXZWJDb3JlMjFCYWNrRm9yd2FyZENvbnRyb2xsZXIxMWl0ZW1BdEluZGV4RWkK IF9fWk43V2ViQ29yZTIxTWVtb3J5UHJlc3N1cmVIYW5kbGVyN2luc3RhbGxFdgogX19aTjdXZWJD b3JlMjFQbGF0Zm9ybUtleWJvYXJkRXZlbnQyNGRpc2FtYmlndWF0ZUtleURvd25FdmVudEVOU18x M1BsYXRmb3JtRXZlbnQ0VHlwZUViCi1fX1pON1dlYkNvcmUyMVJlc291cmNlTG9hZFNjaGVkdWxl cjE5YWRkTWFpblJlc291cmNlTG9hZEVQTlNfMTRSZXNvdXJjZUxvYWRlckUKIF9fWk43V2ViQ29y ZTIxUmVzb3VyY2VMb2FkU2NoZWR1bGVyMTlzdGFydFJlc291cmNlTG9hZGVyRVBOU18xNFJlc291 cmNlTG9hZGVyRQogX19aTjdXZWJDb3JlMjFSZXNvdXJjZUxvYWRTY2hlZHVsZXIyMHNlcnZlUGVu ZGluZ1JlcXVlc3RzRU5TXzIwUmVzb3VyY2VMb2FkUHJpb3JpdHlFCiBfX1pON1dlYkNvcmUyMVJl c291cmNlTG9hZFNjaGVkdWxlcjIwc2VydmVQZW5kaW5nUmVxdWVzdHNFUE5TMF8xNUhvc3RJbmZv cm1hdGlvbkVOU18yMFJlc291cmNlTG9hZFByaW9yaXR5RQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFNjaGVkdWxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAppbmRleCBmMThkOTEzLi5mYTNjMDk2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcApA QCAtMTMyLDExICsxMzIsNiBAQCBQYXNzUmVmUHRyPE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVy PiBSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OnNjaGVkdWxlUGx1Z2luU3RyZQogICAgIHJldHVybiBs b2FkZXI7CiB9CiAKLXZvaWQgUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjphZGRNYWluUmVzb3VyY2VM b2FkKFJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlcikKLXsKLSAgICBob3N0Rm9yVVJMKHJl c291cmNlTG9hZGVyLT51cmwoKSwgQ3JlYXRlSWZOb3RGb3VuZCktPmFkZExvYWRJblByb2dyZXNz KHJlc291cmNlTG9hZGVyKTsKLX0KLQogdm9pZCBSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OnNjaGVk dWxlTG9hZChSZXNvdXJjZUxvYWRlciogcmVzb3VyY2VMb2FkZXIsIFJlc291cmNlTG9hZFByaW9y aXR5IHByaW9yaXR5KQogewogICAgIEFTU0VSVChyZXNvdXJjZUxvYWRlcik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgKaW5kZXggMjBlNWFhNy4uY2M0 OGZjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFNjaGVk dWxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTY2hlZHVsZXIu aApAQCAtNTIsNyArNTIsNiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8U3Vi cmVzb3VyY2VMb2FkZXI+IHNjaGVkdWxlU3VicmVzb3VyY2VMb2FkKEZyYW1lKiwgQ2FjaGVkUmVz b3VyY2UqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBSZXNvdXJjZUxvYWRQcmlvcml0eSwgY29u c3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJik7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPE5ldHNj YXBlUGx1Z0luU3RyZWFtTG9hZGVyPiBzY2hlZHVsZVBsdWdpblN0cmVhbUxvYWQoRnJhbWUqLCBO ZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlckNsaWVudCosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYp OwotICAgIHZpcnR1YWwgdm9pZCBhZGRNYWluUmVzb3VyY2VMb2FkKFJlc291cmNlTG9hZGVyKik7 CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZShSZXNvdXJjZUxvYWRlciopOwogICAgIHZpcnR1YWwg dm9pZCBjcm9zc09yaWdpblJlZGlyZWN0UmVjZWl2ZWQoUmVzb3VyY2VMb2FkZXIqLCBjb25zdCBL VVJMJiByZWRpcmVjdFVSTCk7CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTJlZjlkMC4uMGE4MWExOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEyLTEyLTIxICBCcmFkeSBFaWRzb24gIDxi ZWlkc29uQGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1vdmUgUmVzb3VyY2VMb2FkU2NoZWR1bGVy OjphZGRNYWluUmVzb3VyY2VMb2FkIGFuZCBhbGwgcmVsYXRlZCBjb2RlCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xMjkyNTI3NT4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDU2NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBOb3cgdGhhdCBtYWluIHJlc291cmNlcyBsb2FkcyBhcmUgc2NoZWR1bGVkIChidWcg NDkyNDYpIHdlIGRvbid0IG5lZWQgdGhpcyBzdHVmZiBhbnltb3JlLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6cmVtb3ZlKToKKyAgICAgICAgKFdlYktp dDo6V2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuaDoKKwor MjAxMi0xMi0yMSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAg UGVyZm9ybSBjbGVhbnVwIGluIFdlYlByb2Nlc3MgaWYgdGhlIE5ldHdvcmtQcm9jZXNzIGNyYXNo ZXMuCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjkwMzExNz4gYW5kIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU1OTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVy LmNwcAppbmRleCA1MGVlYjM0Li4zMjRiYTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNw cApAQCAtMTEyLDIyICsxMTIsNiBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2No ZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciwgUmVzbwogICAgIG5vdGlm eURpZFNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0KHJlc291cmNlTG9hZGVyKTsKIH0KIAotdm9pZCBX ZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OmFkZE1haW5SZXNvdXJjZUxvYWQoUmVzb3VyY2VMb2Fk ZXIqIHJlc291cmNlTG9hZGVyKQotewotICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywgIihXZWJQ cm9jZXNzKSBXZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OmFkZE1haW5SZXNvdXJjZUxvYWQsIHVy bCAnJXMnIiwgcmVzb3VyY2VMb2FkZXItPnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwot Ci0gICAgUmVzb3VyY2VMb2FkSWRlbnRpZmllciBpZGVudGlmaWVyOwotCi0gICAgaWYgKCFXZWJQ cm9jZXNzOjpzaGFyZWQoKS5uZXR3b3JrQ29ubmVjdGlvbigpLT5jb25uZWN0aW9uKCktPnNlbmRT eW5jKE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6QWRkTG9hZEluUHJv Z3Jlc3MocmVzb3VyY2VMb2FkZXItPnVybCgpKSwgTWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9u VG9XZWJQcm9jZXNzOjpBZGRMb2FkSW5Qcm9ncmVzczo6UmVwbHkoaWRlbnRpZmllciksIDApKSB7 Ci0gICAgICAgIC8vIEZJWE1FIChOZXR3b3JrUHJvY2Vzcyk6IFdoYXQgc2hvdWxkIHdlIGRvIGlm IHRoaXMgZmFpbHM/Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIH0KLQotICAg IHJlc291cmNlTG9hZGVyLT5zZXRJZGVudGlmaWVyKGlkZW50aWZpZXIpOwotICAgIAotICAgIG1f Y29yZVJlc291cmNlTG9hZGVycy5zZXQoaWRlbnRpZmllciwgcmVzb3VyY2VMb2FkZXIpOwotfQot CiB2b2lkIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6cmVtb3ZlKFJlc291cmNlTG9hZGVyKiBy ZXNvdXJjZUxvYWRlcikKIHsKICAgICBBU1NFUlQocmVzb3VyY2VMb2FkZXIpOwpAQCAtMTQ4LDkg KzEzMiw4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpyZW1vdmUoUmVzb3VyY2VM b2FkZXIqIHJlc291cmNlTG9hZGVyKQogICAgIC8vIElmIGEgcmVzb3VyY2UgbG9hZCB3YXMgYWN0 dWFsbHkgc3RhcnRlZCB3aXRoaW4gdGhlIE5ldHdvcmtQcm9jZXNzIHRoZW4gdGhlIE5ldHdvcmtQ cm9jZXNzIGhhbmRsZXMgY2xlYXJpbmcgb3V0IHRoZSBpZGVudGlmaWVyLgogICAgIFdlYlByb2Nl c3M6OnNoYXJlZCgpLm5ldHdvcmtDb25uZWN0aW9uKCktPmNvbm5lY3Rpb24oKS0+c2VuZChNZXNz YWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlJlbW92ZUxvYWRJZGVudGlmaWVy KGlkZW50aWZpZXIpLCAwKTsKICAgICAKLSAgICBBU1NFUlQobV93ZWJSZXNvdXJjZUxvYWRlcnMu Y29udGFpbnMoaWRlbnRpZmllcikgfHwgbV9jb3JlUmVzb3VyY2VMb2FkZXJzLmNvbnRhaW5zKGlk ZW50aWZpZXIpKTsKKyAgICBBU1NFUlQobV93ZWJSZXNvdXJjZUxvYWRlcnMuY29udGFpbnMoaWRl bnRpZmllcikpOwogICAgIG1fd2ViUmVzb3VyY2VMb2FkZXJzLnJlbW92ZShpZGVudGlmaWVyKTsK LSAgICBtX2NvcmVSZXNvdXJjZUxvYWRlcnMucmVtb3ZlKGlkZW50aWZpZXIpOwogfQogCiB2b2lk IFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6Y3Jvc3NPcmlnaW5SZWRpcmVjdFJlY2VpdmVkKFJl c291cmNlTG9hZGVyKiwgY29uc3QgS1VSTCYpCkBAIC0xODksMTQgKzE3Miw2IEBAIHZvaWQgV2Vi UmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzZXRTZXJpYWxMb2FkaW5nRW5hYmxlZChib29sIGVuYWJs ZWQpCiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpuZXR3b3JrUHJvY2Vzc0NyYXNo ZWQoKQogewotICAgIFZlY3RvcjxSZWZQdHI8UmVzb3VyY2VMb2FkZXI+ID4gY29yZVJlc291cmNl TG9hZGVyczsKLSAgICBjb3B5VmFsdWVzVG9WZWN0b3IobV9jb3JlUmVzb3VyY2VMb2FkZXJzLCBj b3JlUmVzb3VyY2VMb2FkZXJzKTsKLSAgICAKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNv cmVSZXNvdXJjZUxvYWRlcnMuc2l6ZSgpOyArK2kpCi0gICAgICAgIGNvcmVSZXNvdXJjZUxvYWRl cnNbaV0tPmRpZEZhaWwoaW50ZXJuYWxFcnJvcihjb3JlUmVzb3VyY2VMb2FkZXJzW2ldLT51cmwo KSkpOwotCi0gICAgQVNTRVJUKG1fY29yZVJlc291cmNlTG9hZGVycy5pc0VtcHR5KCkpOwotCiAg ICAgVmVjdG9yPFJlZlB0cjxXZWJSZXNvdXJjZUxvYWRlcj4gPiB3ZWJSZXNvdXJjZUxvYWRlcnM7 CiAgICAgY29weVZhbHVlc1RvVmVjdG9yKG1fd2ViUmVzb3VyY2VMb2FkZXJzLCB3ZWJSZXNvdXJj ZUxvYWRlcnMpOwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5oCmluZGV4IDA5Y2JkMTQuLjRh M2VjZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJS ZXNvdXJjZUxvYWRTY2hlZHVsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05l dHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgKQEAgLTQ3LDcgKzQ3LDYgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcj4gc2No ZWR1bGVTdWJyZXNvdXJjZUxvYWQoV2ViQ29yZTo6RnJhbWUqLCBXZWJDb3JlOjpDYWNoZWRSZXNv dXJjZSosIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFdlYkNvcmU6OlJlc291cmNl TG9hZFByaW9yaXR5LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlvbnMmKSBPVkVS UklERTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6TmV0c2NhcGVQbHVnSW5TdHJl YW1Mb2FkZXI+IHNjaGVkdWxlUGx1Z2luU3RyZWFtTG9hZChXZWJDb3JlOjpGcmFtZSosIFdlYkNv cmU6Ok5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyQ2xpZW50KiwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JikgT1ZFUlJJREU7CiAgICAgCi0gICAgdmlydHVhbCB2b2lkIGFkZE1haW5S ZXNvdXJjZUxvYWQoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXIqKSBPVkVSUklERTsKICAgICB2aXJ0 dWFsIHZvaWQgcmVtb3ZlKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyKikgT1ZFUlJJREU7CiAgICAg dmlydHVhbCB2b2lkIGNyb3NzT3JpZ2luUmVkaXJlY3RSZWNlaXZlZChXZWJDb3JlOjpSZXNvdXJj ZUxvYWRlciosIGNvbnN0IFdlYkNvcmU6OktVUkwmIHJlZGlyZWN0VVJMKSBPVkVSUklERTsKICAg ICAKQEAgLTY1LDcgKzY0LDYgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lkIHNjaGVkdWxl TG9hZChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlciosIFdlYkNvcmU6OlJlc291cmNlTG9hZFByaW9y aXR5KTsKICAgICAKLSAgICBIYXNoTWFwPHVuc2lnbmVkIGxvbmcsIFJlZlB0cjxXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlcj4gPiBtX2NvcmVSZXNvdXJjZUxvYWRlcnM7CiAgICAgSGFzaE1hcDx1bnNp Z25lZCBsb25nLCBSZWZQdHI8V2ViUmVzb3VyY2VMb2FkZXI+ID4gbV93ZWJSZXNvdXJjZUxvYWRl cnM7CiAgICAgCiAgICAgdW5zaWduZWQgbV9zdXNwZW5kUGVuZGluZ1JlcXVlc3RzQ291bnQ7Cg==