87178 2012-05-22 16:07:08 -0700 Add a quirk for applications that depend on the relative ordering of progressCompleted/didFinishLoad 2012-05-22 17:21:12 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton abarth adele ap beidson japhet webkit.review.bot oldest_to_newest 630875 0 thorton 2012-05-22 16:07:08 -0700 This order was changed in http://trac.webkit.org/changeset/94105. <rdar://problem/11468434> 630919 1 143398 thorton 2012-05-22 16:50:38 -0700 Created attachment 143398 patch 630928 2 143398 mjs 2012-05-22 16:57:30 -0700 Comment on attachment 143398 patch r=me 630940 3 143398 aestes 2012-05-22 17:03:58 -0700 Comment on attachment 143398 patch View in context: https://bugs.webkit.org/attachment.cgi?id=143398&action=review > Source/WebCore/page/Settings.h:568 > + bool needsDidFinishLoadOrderQuirk() { return m_needsDidFinishLoadOrderQuirk; } You should const-qualify this to be consistent with other getters. > Source/WebKit/mac/WebView/WebView.mm:1361 > +- (BOOL)_needsDidFinishLoadOrderQuirk > +{ > + static BOOL needsQuirk = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_CORRECT_DID_FINISH_LOAD_ORDER) && applicationIsAppleMail(); > + return needsQuirk; > +} No reason for this to be a method. I would make it a static free function. 630964 4 thorton 2012-05-22 17:21:12 -0700 Landed with Andy's changes in http://trac.webkit.org/changeset/118086 143398 2012-05-22 16:50:38 -0700 2012-05-22 17:03:58 -0700 patch quirk.diff text/plain 8042 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2NjZiNDlkLi4wZGE4ZmVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTItMDUtMjIgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkIGEgcXVpcmsgZm9yIGFwcGxpY2F0aW9ucyB0aGF0IGRlcGVuZCBvbiB0aGUg cmVsYXRpdmUgb3JkZXJpbmcgb2YgcHJvZ3Jlc3NDb21wbGV0ZWQvZGlkRmluaXNoTG9hZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcxNzgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzExNDY4NDM0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNvbWUgYXBwbGljYXRpb25zIGRlcGVuZCBvbiB0aGUgcmVs YXRpdmUgb3JkZXJpbmcgb2YgcHJvZ3Jlc3NDb21wbGV0ZWQvZGlkRmluaXNoTG9hZCwgd2hpY2gg d2FzIGNoYW5nZWQKKyAgICAgICAgdG8gYmUgbW9yZSBjb3JyZWN0IGluIGh0dHA6Ly90cmFjLndl YmtpdC5vcmcvY2hhbmdlc2V0Lzk0MTA1LiBGb3IgYXBwbGljYXRpb25zIGJ1aWx0IGJlZm9yZSA5 NDEwNSwgd2UgY2FuCisgICAgICAgIHByb3ZpZGUgdGhlIG9sZCBiZWhhdmlvci4gRm9yIHRoZSB0 aW1lIGJlaW5nLCB0aGlzIHdpbGwgb25seSBhcHBseSB0byBNYWlsLmFwcC4KKworICAgICAgICBO byBuZXcgdGVzdHMsIHdpbGwgbm90IGFmZmVjdCBiZWhhdmlvciBmb3IgYW55IGFwcGxpY2F0aW9u IGV4Y2VwdCBNYWlsLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjaGVja0xvYWRDb21wbGV0ZUZvclRoaXNGcmFtZSk6 CisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5n czo6U2V0dGluZ3MpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNv cmU6OlNldHRpbmdzOjpzZXROZWVkc0RpZEZpbmlzaExvYWRPcmRlclF1aXJrKToKKyAgICAgICAg KFdlYkNvcmU6OlNldHRpbmdzOjpuZWVkc0RpZEZpbmlzaExvYWRPcmRlclF1aXJrKToKKyAgICAg ICAgKFNldHRpbmdzKToKKwogMjAxMi0wNS0yMiAgUm9iIEJ1aXMgIDxyYnVpc0ByaW0uY29tPgog CiAgICAgICAgIEFTU0VSVHMgaW4gUmVuZGVySW5saW5lOjpsYXlvdXQoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggNTQ4YWEyYy4uZDM2ZDExMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0yMDE3LDYgKzIwMTcsOCBAQCB2b2lkIEZyYW1l TG9hZGVyOjpjaGVja0xvYWRDb21wbGV0ZUZvclRoaXNGcmFtZSgpCiB7CiAgICAgQVNTRVJUKG1f Y2xpZW50LT5oYXNXZWJWaWV3KCkpOwogCisgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gbV9mcmFt ZS0+c2V0dGluZ3MoKTsKKwogICAgIHN3aXRjaCAobV9zdGF0ZSkgewogICAgICAgICBjYXNlIEZy YW1lU3RhdGVQcm92aXNpb25hbDogewogICAgICAgICAgICAgaWYgKG1fZGVsZWdhdGVJc0hhbmRs aW5nUHJvdmlzaW9uYWxMb2FkRXJyb3IpCkBAIC0yMDkxLDExICsyMDkzLDEzIEBAIHZvaWQgRnJh bWVMb2FkZXI6OmNoZWNrTG9hZENvbXBsZXRlRm9yVGhpc0ZyYW1lKCkKICAgICAgICAgICAgIGlm IChtX3N0YXRlTWFjaGluZS5jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgfHwgIW1fc3Rh dGVNYWNoaW5lLmNvbW1pdHRlZEZpcnN0UmVhbERvY3VtZW50TG9hZCgpKQogICAgICAgICAgICAg ICAgIHJldHVybjsKIAotICAgICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdl KCkpIHsKLSAgICAgICAgICAgICAgICBwYWdlLT5wcm9ncmVzcygpLT5wcm9ncmVzc0NvbXBsZXRl ZChtX2ZyYW1lKTsKKyAgICAgICAgICAgIGlmICghc2V0dGluZ3MtPm5lZWRzRGlkRmluaXNoTG9h ZE9yZGVyUXVpcmsoKSkgeworICAgICAgICAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFt ZS0+cGFnZSgpKSB7CisgICAgICAgICAgICAgICAgICAgIHBhZ2UtPnByb2dyZXNzKCktPnByb2dy ZXNzQ29tcGxldGVkKG1fZnJhbWUpOwogCi0gICAgICAgICAgICAgICAgaWYgKG1fZnJhbWUgPT0g cGFnZS0+bWFpbkZyYW1lKCkpCi0gICAgICAgICAgICAgICAgICAgIHBhZ2UtPnJlc2V0UmVsZXZh bnRQYWludGVkT2JqZWN0Q291bnRlcigpOworICAgICAgICAgICAgICAgICAgICBpZiAobV9mcmFt ZSA9PSBwYWdlLT5tYWluRnJhbWUoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHBhZ2UtPnJl c2V0UmVsZXZhbnRQYWludGVkT2JqZWN0Q291bnRlcigpOworICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IgPSBk bC0+bWFpbkRvY3VtZW50RXJyb3IoKTsKQEAgLTIxMDksNiArMjExMywxNSBAQCB2b2lkIEZyYW1l TG9hZGVyOjpjaGVja0xvYWRDb21wbGV0ZUZvclRoaXNGcmFtZSgpCiAgICAgICAgICAgICAgICAg bG9hZGluZ0V2ZW50ID0gQVhPYmplY3RDYWNoZTo6QVhMb2FkaW5nRmluaXNoZWQ7CiAgICAgICAg ICAgICB9CiAKKyAgICAgICAgICAgIGlmIChzZXR0aW5ncy0+bmVlZHNEaWRGaW5pc2hMb2FkT3Jk ZXJRdWlyaygpKSB7CisgICAgICAgICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5w YWdlKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgcGFnZS0+cHJvZ3Jlc3MoKS0+cHJvZ3Jlc3ND b21wbGV0ZWQobV9mcmFtZSk7CisKKyAgICAgICAgICAgICAgICAgICAgaWYgKG1fZnJhbWUgPT0g cGFnZS0+bWFpbkZyYW1lKCkpCisgICAgICAgICAgICAgICAgICAgICAgICBwYWdlLT5yZXNldFJl bGV2YW50UGFpbnRlZE9iamVjdENvdW50ZXIoKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICB9CisKICAgICAgICAgICAgIC8vIE5vdGlmeSBhY2Nlc3NpYmlsaXR5LgogICAgICAgICAg ICAgaWYgKEFYT2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxpdHlFbmFibGVkKCkpCiAgICAgICAgICAg ICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5mcmFtZUxvYWRpbmdF dmVudE5vdGlmaWNhdGlvbihtX2ZyYW1lLCBsb2FkaW5nRXZlbnQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRp bmdzLmNwcAppbmRleCAyY2VmNzlmLi5jZDhmODkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNw cApAQCAtMjY2LDYgKzI2Niw3IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogICAg ICwgbV9zaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbihmYWxzZSkKICAgICAsIG1fd2FudHNC YWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvcihmYWxzZSkKICAgICAsIG1fcmVxdWVzdEFu aW1hdGlvbkZyYW1lRW5hYmxlZCh0cnVlKQorICAgICwgbV9uZWVkc0RpZEZpbmlzaExvYWRPcmRl clF1aXJrKGZhbHNlKQogICAgICwgbV9sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHlUaW1lcih0aGlz LCAmU2V0dGluZ3M6OmxvYWRzSW1hZ2VzQXV0b21hdGljYWxseVRpbWVyRmlyZWQpCiAgICAgLCBt X2luY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzKGRlZmF1bHRJ bmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcykKIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuaAppbmRleCAwNTVjMzNiLi4yZWY5YmE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5oCkBAIC01NjQsNiArNTY0LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lk IHNldFJlcXVlc3RBbmltYXRpb25GcmFtZUVuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1fcmVxdWVz dEFuaW1hdGlvbkZyYW1lRW5hYmxlZCA9IGVuYWJsZWQ7IH0KICAgICAgICAgYm9vbCByZXF1ZXN0 QW5pbWF0aW9uRnJhbWVFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9yZXF1ZXN0QW5pbWF0aW9u RnJhbWVFbmFibGVkOyB9CiAKKyAgICAgICAgdm9pZCBzZXROZWVkc0RpZEZpbmlzaExvYWRPcmRl clF1aXJrKGJvb2wgbmVlZHNRdWlyaykgeyBtX25lZWRzRGlkRmluaXNoTG9hZE9yZGVyUXVpcmsg PSBuZWVkc1F1aXJrOyB9CisgICAgICAgIGJvb2wgbmVlZHNEaWRGaW5pc2hMb2FkT3JkZXJRdWly aygpIHsgcmV0dXJuIG1fbmVlZHNEaWRGaW5pc2hMb2FkT3JkZXJRdWlyazsgfQorCiAjaWYgVVNF KEpTQykKICAgICAgICAgc3RhdGljIHZvaWQgc2V0U2hvdWxkUmVzcGVjdFByaW9yaXR5SW5DU1NB dHRyaWJ1dGVTZXR0ZXJzKGJvb2wpOwogICAgICAgICBzdGF0aWMgYm9vbCBzaG91bGRSZXNwZWN0 UHJpb3JpdHlJbkNTU0F0dHJpYnV0ZVNldHRlcnMoKTsKQEAgLTcyOSw2ICs3MzIsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgbV9zaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRh dGlvbiA6IDE7CiAgICAgICAgIGJvb2wgbV93YW50c0JhbGFuY2VkU2V0RGVmZXJzTG9hZGluZ0Jl aGF2aW9yIDogMTsKICAgICAgICAgYm9vbCBtX3JlcXVlc3RBbmltYXRpb25GcmFtZUVuYWJsZWQg OiAxOworICAgICAgICBib29sIG1fbmVlZHNEaWRGaW5pc2hMb2FkT3JkZXJRdWlyayA6IDE7CiAK ICAgICAgICAgVGltZXI8U2V0dGluZ3M+IG1fbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGltZXI7 CiAgICAgICAgIHZvaWQgbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGltZXJGaXJlZChUaW1lcjxT ZXR0aW5ncz4qKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAyYzVjMWYxLi4xYTEyZDMwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDUtMjIgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgcXVpcmsgZm9yIGFwcGxpY2F0 aW9ucyB0aGF0IGRlcGVuZCBvbiB0aGUgcmVsYXRpdmUgb3JkZXJpbmcgb2YgcHJvZ3Jlc3NDb21w bGV0ZWQvZGlkRmluaXNoTG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODcxNzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExNDY4NDM0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBwbHVtYmlu ZyBmb3IgdGhlIHF1aXJrIHRvIGZsaXAgdGhlIHJlbGF0aXZlIG9yZGVyaW5nIG9mIHByb2dyZXNz Q29tcGxldGVkL2RpZEZpbmlzaExvYWQgYmFjaworICAgICAgICB0byB0aGUgYmVoYXZpb3IgYmVm b3JlIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0Lzk0MTA1LiBNYWtlIGl0IGFwcGx5 IHRvIGFueSBNYWlsLmFwcCBsaW5rZWQKKyAgICAgICAgYWdhaW5zdCBXZWJLaXQgYmVmb3JlIHRo YXQgcmV2aXNpb24uCisKKyAgICAgICAgKiBNaXNjL1dlYktpdFZlcnNpb25DaGVja3MuaDoKKyAg ICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX25lZWRzRGlk RmluaXNoTG9hZE9yZGVyUXVpcmtdKToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXND aGFuZ2VkOl0pOgorCiAyMDEyLTA1LTE1ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdo QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgcHJpdmF0ZSBuYW1lcwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJLaXRWZXJzaW9uQ2hlY2tzLmggYi9T b3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYktpdFZlcnNpb25DaGVja3MuaAppbmRleCBhNzcyNDI0 Li42NGQ1ODdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYktpdFZlcnNp b25DaGVja3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYktpdFZlcnNpb25DaGVj a3MuaApAQCAtNTYsNiArNTYsNyBAQAogI2RlZmluZSBXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRI T1VUX0xJTktfRUxFTUVOVF9URVhUX0NTU19RVUlSSyAweDAyMTMwMjAwIC8vIDUzMS4yLjAKICNk ZWZpbmUgV0VCS0lUX0ZJUlNUX1ZFUlNJT05fV0lUSF9IVE1MNV9QQVJTRVIgMHgwMjE2MDkwMCAv LyA1MzQuOS4wCiAjZGVmaW5lIFdFQktJVF9GSVJTVF9WRVJTSU9OX1dJVEhfR0VUX01BVENIRURf Q1NTX1JVTEVTX1JFU1RSSUNUSU9OUyAweDAyMTYwQjAwIC8vIDUzNC4xMS4wCisjZGVmaW5lIFdF QktJVF9GSVJTVF9WRVJTSU9OX1dJVEhfQ09SUkVDVF9ESURfRklOSVNIX0xPQURfT1JERVIgMHgw MjE3MDMwNCAvLyA1MzUuMy40CiAjZGVmaW5lIFdFQktJVF9GSVJTVF9WRVJTSU9OX1dJVEhfQ1NT X0FUVFJJQlVURV9TRVRURVJTX0lHTk9SSU5HX1BSSU9SSVRZIDB4MDIxNzBEMDAgLy8gNTM1LjEz LjAKIAogI2lmZGVmIF9fY3BsdXNwbHVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0K aW5kZXggYjlkYzc2OC4uMzJiYTM5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5t bQpAQCAtMTM1NCw2ICsxMzU0LDEyIEBAIC0gKEJPT0wpX25lZWRzRnJhbWVMb2FkRGVsZWdhdGVS ZXRhaW5RdWlyawogICAgIHJldHVybiBuZWVkc1F1aXJrOwogfQogCistIChCT09MKV9uZWVkc0Rp ZEZpbmlzaExvYWRPcmRlclF1aXJrCit7CisgICAgc3RhdGljIEJPT0wgbmVlZHNRdWlyayA9ICFX ZWJLaXRMaW5rZWRPbk9yQWZ0ZXIoV0VCS0lUX0ZJUlNUX1ZFUlNJT05fV0lUSF9DT1JSRUNUX0RJ RF9GSU5JU0hfTE9BRF9PUkRFUikgJiYgYXBwbGljYXRpb25Jc0FwcGxlTWFpbCgpOworICAgIHJl dHVybiBuZWVkc1F1aXJrOworfQorCiBzdGF0aWMgYm9vbCBuZWVkc1NlbGZSZXRhaW5XaGlsZUxv YWRpbmdRdWlyaygpCiB7CiAgICAgc3RhdGljIGJvb2wgbmVlZHNRdWlyayA9IGFwcGxpY2F0aW9u SXNBcGVydHVyZSgpOwpAQCAtMTUzNSw2ICsxNTQxLDcgQEAgLSAodm9pZClfcHJlZmVyZW5jZXND aGFuZ2VkOihXZWJQcmVmZXJlbmNlcyAqKXByZWZlcmVuY2VzCiAgICAgc2V0dGluZ3MtPnNldFNo b3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uKFtwcmVmZXJlbmNlcyBzaG91bGRSZXNwZWN0SW1h Z2VPcmllbnRhdGlvbl0pOwogICAgIHNldHRpbmdzLT5zZXROZWVkc0lzTG9hZGluZ0luQVBJU2Vu c2VRdWlyayhbc2VsZiBfbmVlZHNJc0xvYWRpbmdJbkFQSVNlbnNlUXVpcmtdKTsKICAgICBzZXR0 aW5ncy0+c2V0UmVxdWVzdEFuaW1hdGlvbkZyYW1lRW5hYmxlZChbcHJlZmVyZW5jZXMgcmVxdWVz dEFuaW1hdGlvbkZyYW1lRW5hYmxlZF0pOworICAgIHNldHRpbmdzLT5zZXROZWVkc0RpZEZpbmlz aExvYWRPcmRlclF1aXJrKFtzZWxmIF9uZWVkc0RpZEZpbmlzaExvYWRPcmRlclF1aXJrXSk7CiAg ICAgCiAgICAgTlNUaW1lSW50ZXJ2YWwgdGltZW91dCA9IFtwcmVmZXJlbmNlcyBpbmNyZW1lbnRh bFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kc107CiAgICAgaWYgKHRpbWVvdXQg PiAwKQo=