196714 2019-04-08 15:59:18 -0700 Loads using loadHTMLString() cause flashing when process-swapping 2019-04-10 14:36:40 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=196784 InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue ggaren koivisto webkit-bug-importer oldest_to_newest 1525439 0 cdumez 2019-04-08 15:59:18 -0700 Loads using loadHTMLString() cause flashing when process-swapping. We should fix this. 1525440 1 cdumez 2019-04-08 15:59:34 -0700 <rdar://problem/49637354> 1525454 2 366997 cdumez 2019-04-08 16:30:19 -0700 Created attachment 366997 Patch 1525613 3 366997 commit-queue 2019-04-09 07:20:18 -0700 Comment on attachment 366997 Patch Clearing flags on attachment: 366997 Committed r244075: <https://trac.webkit.org/changeset/244075> 1525614 4 commit-queue 2019-04-09 07:20:19 -0700 All reviewed patches have been landed. Closing bug. 1525995 5 cdumez 2019-04-10 10:13:34 -0700 Follow-up to drop unused data member: <https://trac.webkit.org/changeset/244132> 366997 2019-04-08 16:30:19 -0700 2019-04-09 07:20:18 -0700 Patch bug-196714-20190408163018.patch text/plain 12732 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk1ZGY2MzdiYjZjZmVlZjhi MjE2NTU0YTYxMDY1MTYzYjVmOTJjMjUuLjcxMWE3MTdkZmYyZWJiMWVhOWY3Y2EwOGZhMWIxNjgy MDM0OWNiZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTktMDQtMDggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBMb2FkcyB1c2luZyBsb2FkSFRNTFN0 cmluZygpIGNhdXNlIGZsYXNoaW5nIHdoZW4gcHJvY2Vzcy1zd2FwcGluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NzE0CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS80OTYzNzM1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBPdXIgbG9naWMgdG8gZGVjaWRlIGlmIHdlIHNob3VsZCBjb25zdHJ1Y3Qg YSBTdXNwZW5kZWRQYWdlUHJveHkgb24gcHJvY2Vzcy1zd2FwIHdhcyBhc3N1bWluZworICAgICAg ICBhIFN1c3BlbmRlZFBhZ2VQcm94eSBpcyBvbmx5IHVzZWZ1bCBmb3IgUGFnZUNhY2hlIGFuZCB3 b3VsZCB0aGVyZWZvcmUgbm90IGNyZWF0ZSBvbmUgaWYgUGFnZUNhY2hlCisgICAgICAgIGlzIGRp c2FibGVkIG9yIGlmIHRoZXJlIGlzIG5vIGFzc29jaWF0ZWQgV2ViQmFja0ZvcndhcmRMaXN0SXRl bS4gSG93ZXZlciwgY29uc3RydWN0aW5nIGEKKyAgICAgICAgU3VzcGVuZGVkUGFnZVByb3h5IGlz IGFsc28gdXNlZnVsIHRvIHByZXZlbnQgZmxhc2hpbmcgd2hlbiBwcm9jZXNzLXN3YXBwaW5nIGFz IHdlIG5lZWQgdG8ga2VlcAorICAgICAgICBkaXNwbGF5aW5nIHRoZSBsYXllciBvZiB0aGUgcHJl dmlvdXMgcHJvY2VzcyB1bnRpbCB0aGVyZSBpcyBzb21ldGhpbmcgbWVhbmluZ2Z1bCB0byBzaG93 IGluIHRoZQorICAgICAgICBuZXcgcHJvY2Vzcy4KKworICAgICAgICBUaGlzIHBhdGNoIG1ha2Vz IGl0IHNvIHRoYXQgd2Ugbm93IGNvbnN0cnVjdCBhIFN1c3BlbmRlZFBhZ2VQcm94eSBvbiBwcm9j ZXNzLXN3YXAsIGV2ZW4gaWYKKyAgICAgICAgUGFnZUNhY2hlIGlzIGRpc2FibGVkIG9yIGlmIHRo ZXJlIGlzIG5vIGFzc29jaWF0ZWQgV2ViQmFja0ZvcndhcmRMaXN0SXRlbS4gVGhlIHByb2Nlc3Mg aW4KKyAgICAgICAgcXVlc3Rpb24gd2lsbCBub3QgYmUgdXNlZnVsIGZvciBQYWdlQ2FjaGUgYnV0 IGl0IHdpbGwgYXZvaWQgZmxhc2hpbmcuIFRoZSBTdXNwZW5kZWRQYWdlUHJveHkncworICAgICAg ICBwcm9jZXNzIG1heSBhbHNvIGdldCB1c2VkIGZvciBmdXR1cmUgbmF2aWdhdGlvbnMgdG8gdGhl IHNhbWUgc2l0ZSAoYXMgZGVtb25zdHJhdGVkIGJ5IHRoZQorICAgICAgICBBUEkgdGVzdCkgd2hp Y2ggaXMgYmVuZWZpY2lhbCBmb3IgcGVyZm9ybWFuY2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv U3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVBy b3h5OjpTdXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQ YWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzUG9vbDo6ZmluZFJldXNhYmxlU3VzcGVuZGVkUGFnZVByb2Nlc3MpOgorCiAy MDE5LTA0LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgRml4IHNlbGVjdG9yIG5hbWUgYWZ0ZXIgcjI0MzgzNApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKaW5kZXggODJkZGYxOWIwNmFiYWI5 ZjdlNmJhNTUzZWFiN2M1NmRkODdlMDMzMy4uYzExODkyMzkwYjliNGFmYjgxNDQ1ODAzNzcyZjg5 YTJhZTNiOTMzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVk UGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdl UHJveHkuY3BwCkBAIC03OCwxNyArNzgsMTUgQEAgc3RhdGljIGNvbnN0IEhhc2hTZXQ8SVBDOjpT dHJpbmdSZWZlcmVuY2U+JiBtZXNzYWdlTmFtZXNUb0lnbm9yZVdoaWxlU3VzcGVuZGVkKCkKIH0K ICNlbmRpZgogCi1TdXNwZW5kZWRQYWdlUHJveHk6OlN1c3BlbmRlZFBhZ2VQcm94eShXZWJQYWdl UHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgV2ViQmFja0Zvcndh cmRMaXN0SXRlbSYgaXRlbSwgdWludDY0X3QgbWFpbkZyYW1lSUQpCitTdXNwZW5kZWRQYWdlUHJv eHk6OlN1c3BlbmRlZFBhZ2VQcm94eShXZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNz UHJveHk+JiYgcHJvY2VzcywgdWludDY0X3QgbWFpbkZyYW1lSUQpCiAgICAgOiBtX3BhZ2UocGFn ZSkKICAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3MpKQogICAgICwgbV9tYWluRnJhbWVJ RChtYWluRnJhbWVJRCkKLSAgICAsIG1fcmVnaXN0cmFibGVEb21haW4oVVJMKFVSTCgpLCBpdGVt LnVybCgpKSkKICAgICAsIG1fc3VzcGVuc2lvblRpbWVvdXRUaW1lcihSdW5Mb29wOjptYWluKCks IHRoaXMsICZTdXNwZW5kZWRQYWdlUHJveHk6OnN1c3BlbnNpb25UaW1lZE91dCkKICNpZiBQTEFU Rk9STShJT1NfRkFNSUxZKQogICAgICwgbV9zdXNwZW5zaW9uVG9rZW4obV9wcm9jZXNzLT50aHJv dHRsZXIoKS5iYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbigpKQogI2VuZGlmCiB7Ci0gICAgaXRlbS5z ZXRTdXNwZW5kZWRQYWdlKHRoaXMpOwogICAgIG1fcHJvY2Vzcy0+aW5jcmVtZW50U3VzcGVuZGVk UGFnZUNvdW50KCk7CiAgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCksICp0 aGlzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFn ZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuaApp bmRleCA1YzI0YzM0MDFjNzYwNTUxMzFjNDQ4ZDk0N2JmMzU0Yzc0NDQyYTZiLi4yNGNjNjhkMmJi NWZmYmJmNzEwYmFmZTNiNjE0ZmQzNzg2MmUyMGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuaApAQCAtNDEsMTMgKzQxLDEyIEBAIGNsYXNzIFdlYlBy b2Nlc3NQcm94eTsKIGNsYXNzIFN1c3BlbmRlZFBhZ2VQcm94eSBmaW5hbDogcHVibGljIElQQzo6 TWVzc2FnZVJlY2VpdmVyLCBwdWJsaWMgQ2FuTWFrZVdlYWtQdHI8U3VzcGVuZGVkUGFnZVByb3h5 PiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgU3VzcGVuZGVk UGFnZVByb3h5KFdlYlBhZ2VQcm94eSYsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW0mLCB1aW50NjRfdCBtYWluRnJhbWVJRCk7CisgICAgU3VzcGVuZGVkUGFn ZVByb3h5KFdlYlBhZ2VQcm94eSYsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHVpbnQ2NF90IG1h aW5GcmFtZUlEKTsKICAgICB+U3VzcGVuZGVkUGFnZVByb3h5KCk7CiAKICAgICBXZWJQYWdlUHJv eHkmIHBhZ2UoKSBjb25zdCB7IHJldHVybiBtX3BhZ2U7IH0KICAgICBXZWJQcm9jZXNzUHJveHkm IHByb2Nlc3MoKSB7IHJldHVybiBtX3Byb2Nlc3MuZ2V0KCk7IH0KICAgICB1aW50NjRfdCBtYWlu RnJhbWVJRCgpIGNvbnN0IHsgcmV0dXJuIG1fbWFpbkZyYW1lSUQ7IH0KLSAgICBjb25zdCBXZWJD b3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21haW4oKSBjb25zdCB7IHJldHVy biBtX3JlZ2lzdHJhYmxlRG9tYWluOyB9CiAKICAgICBib29sIGZhaWxlZFRvU3VzcGVuZCgpIGNv bnN0IHsgcmV0dXJuIG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6RmFpbGVk VG9TdXNwZW5kOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmlu ZGV4IGJlMTYxMWZlYzBkYzg2MDMyNjc2MzEyZDIzOGZmMDBmZjUyZTBjN2YuLjUzMGZkODJiYmJi ZGE4MjYxMDEzMzAxZjJiZTlmNDZmZjMxYmEyODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcApAQCAtNzQxLDExICs3NDEsNiBAQCBib29sIFdlYlBhZ2VQcm94eTo6 c3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24s IE9wdAogICAgIGlmICghbWFpbkZyYW1lSUQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg IGlmICghbV9wcmVmZXJlbmNlcy0+dXNlc1BhZ2VDYWNoZSgpKSB7Ci0gICAgICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAic3VzcGVuZEN1cnJlbnRQYWdlSWZQb3Nz aWJsZTogTm90IHN1c3BlbmRpbmcgY3VycmVudCBwYWdlIGZvciBwcm9jZXNzIHBpZCAlaSBiZWNh dXNlIHBhZ2UgY2FjaGUgaXMgZGlzYWJsZWQiLCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVy KCkpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCiAgICAgLy8gSWYgdGhlIGNsaWVu dCBmb3JjZWQgYSBzd2FwIHRoZW4gaXQgbWF5IG5vdCBiZSBXZWItY29tcGF0aWJsZSB0byBzdXNw ZW5kIHRoZSBwcmV2aW91cyBwYWdlIGJlY2F1c2Ugb3RoZXIgd2luZG93cyBtYXkgaGF2ZSBhbiBv cGVuZXIgbGluayB0byB0aGUgcGFnZS4KICAgICBpZiAocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudCA9PSBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpZZXMpIHsKICAgICAgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJzdXNwZW5kQ3VycmVudFBhZ2VJ ZlBvc3NpYmxlOiBOb3Qgc3VzcGVuZGluZyBjdXJyZW50IHBhZ2UgZm9yIHByb2Nlc3MgcGlkICVp IGJlY2F1c2UgdGhlIHN3YXAgd2FzIHJlcXVlc3RlZCBieSB0aGUgY2xpZW50IiwgbV9wcm9jZXNz LT5wcm9jZXNzSWRlbnRpZmllcigpKTsKQEAgLTc2MywyOCArNzU4LDI3IEBAIGJvb2wgV2ViUGFn ZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKEFQSTo6TmF2aWdhdGlvbiYgbmF2 aWdhdGlvbiwgT3B0CiAgICAgfQogCiAgICAgYXV0byogZnJvbUl0ZW0gPSBuYXZpZ2F0aW9uLmZy b21JdGVtKCk7Ci0gICAgaWYgKCFmcm9tSXRlbSkgewotICAgICAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKFByb2Nlc3NTd2FwcGluZywgInN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGU6IE5v dCBzdXNwZW5kaW5nIGN1cnJlbnQgcGFnZSBmb3IgcHJvY2VzcyBwaWQgJWkgYmVjYXVzZSB0aGUg bmF2aWdhdGlvbiBkb2VzIG5vdCBoYXZlIGEgZnJvbUl0ZW0iLCBtX3Byb2Nlc3MtPnByb2Nlc3NJ ZGVudGlmaWVyKCkpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQogCiAgICAgLy8gSWYg dGhlIHNvdXJjZSBhbmQgdGhlIGRlc3RpbmF0aW9uIGJhY2sgLyBmb3J3YXJkIGxpc3QgaXRlbXMg YXJlIHRoZSBzYW1lLCB0aGVuIHRoaXMgaXMgYSBjbGllbnQtc2lkZSByZWRpcmVjdC4gSW4gdGhp cyBjYXNlLAogICAgIC8vIHRoZXJlIGlzIG5vIG5lZWQgdG8gc3VzcGVuZCB0aGUgcHJldmlvdXMg cGFnZSBhcyB0aGVyZSB3aWxsIGJlIG5vIHdheSB0byBnZXQgYmFjayB0byBpdC4KLSAgICBpZiAo ZnJvbUl0ZW0gPT0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpIHsKKyAgICBpZiAo ZnJvbUl0ZW0gJiYgZnJvbUl0ZW0gPT0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkp IHsKICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJzdXNw ZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlOiBOb3Qgc3VzcGVuZGluZyBjdXJyZW50IHBhZ2UgZm9y IHByb2Nlc3MgcGlkICVpIGJlY2F1c2UgdGhpcyBpcyBhIGNsaWVudC1zaWRlIHJlZGlyZWN0Iiwg bV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KIAotICAgIGlmIChmcm9tSXRlbS0+dXJsKCkgIT0gcGFnZUxvYWRTdGF0ZSgpLnVybCgp KSB7CisgICAgaWYgKGZyb21JdGVtICYmIGZyb21JdGVtLT51cmwoKSAhPSBwYWdlTG9hZFN0YXRl KCkudXJsKCkpIHsKICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChQcm9jZXNz U3dhcHBpbmcsICJzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlOiBOb3Qgc3VzcGVuZGluZyBj dXJyZW50IHBhZ2UgZm9yIHByb2Nlc3MgcGlkICVpIGJlY2F1c2UgZnJvbUl0ZW0ncyBVUkwgZG9l cyBub3QgbWF0Y2ggdGhlIHBhZ2UgVVJMLiIsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIo KSk7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogCiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJz dXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlOiBTdXNwZW5kaW5nIGN1cnJlbnQgcGFnZSBmb3Ig cHJvY2VzcyBwaWQgJWkiLCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkpOwotICAgIGF1 dG8gc3VzcGVuZGVkUGFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8U3VzcGVuZGVkUGFnZVByb3h5Pigq dGhpcywgbV9wcm9jZXNzLmNvcHlSZWYoKSwgKmZyb21JdGVtLCAqbWFpbkZyYW1lSUQpOworICAg IGF1dG8gc3VzcGVuZGVkUGFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8U3VzcGVuZGVkUGFnZVByb3h5 PigqdGhpcywgbV9wcm9jZXNzLmNvcHlSZWYoKSwgKm1haW5GcmFtZUlEKTsKKworICAgIExPRyhQ cm9jZXNzU3dhcHBpbmcsICJXZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgY3JlYXRlZCBzdXNwZW5k ZWQgcGFnZSAlcyBmb3IgcHJvY2VzcyBwaWQgJWksIGJhY2svZm9yd2FyZCBpdGVtICVzIiBQUkl1 NjQsIHBhZ2VJRCgpLCBzdXNwZW5kZWRQYWdlLT5sb2dnaW5nU3RyaW5nKCksIG1fcHJvY2Vzcy0+ cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJvbUl0ZW0gPyBmcm9tSXRlbS0+aXRlbUlEKCkubG9nU3Ry aW5nKCkgOiAwKTsKIAotICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJXZWJQYWdlUHJveHkgJSIg UFJJdTY0ICIgY3JlYXRlZCBzdXNwZW5kZWQgcGFnZSAlcyBmb3IgcHJvY2VzcyBwaWQgJWksIGJh Y2svZm9yd2FyZCBpdGVtICVzIiBQUkl1NjQsIHBhZ2VJRCgpLCBzdXNwZW5kZWRQYWdlLT5sb2dn aW5nU3RyaW5nKCksIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJvbUl0ZW0tPml0 ZW1JRCgpLmxvZ1N0cmluZygpKTsKKyAgICBpZiAoZnJvbUl0ZW0gJiYgbV9wcmVmZXJlbmNlcy0+ dXNlc1BhZ2VDYWNoZSgpKQorICAgICAgICBmcm9tSXRlbS0+c2V0U3VzcGVuZGVkUGFnZShzdXNw ZW5kZWRQYWdlLmdldCgpKTsKIAogICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5hZGRTdXNw ZW5kZWRQYWdlKFdURk1vdmUoc3VzcGVuZGVkUGFnZSkpOwogICAgIHJldHVybiB0cnVlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDY0MjQyZWRhYjdj NzkwZjVmOTExNGFkNDEzNDFhMjQ3Nzg4MDg0NGUuLmYxOWQyMmQ3OTIxNTBmMDA2OWI3MTIzMjE0 NTIyZjlhOWI3MjliZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5jcHAKQEAgLTIzNTYsNyArMjM1Niw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NG b3JOYXZpZ2F0aW9uSW50ZXJuYWwoV2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBBUEk6CiBSZWZQ dHI8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6ZmluZFJldXNhYmxlU3VzcGVuZGVk UGFnZVByb2Nlc3MoY29uc3QgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mIHJlZ2lzdHJhYmxl RG9tYWluLCBXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYnNpdGVEYXRhU3RvcmUmIGRhdGFTdG9yZSkK IHsKICAgICBhdXRvIGl0ID0gbV9zdXNwZW5kZWRQYWdlcy5maW5kSWYoWyZdKGF1dG8mIHN1c3Bl bmRlZFBhZ2UpIHsKLSAgICAgICAgcmV0dXJuIHN1c3BlbmRlZFBhZ2UtPnJlZ2lzdHJhYmxlRG9t YWluKCkgPT0gcmVnaXN0cmFibGVEb21haW4gJiYgJnN1c3BlbmRlZFBhZ2UtPnByb2Nlc3MoKS53 ZWJzaXRlRGF0YVN0b3JlKCkgPT0gJmRhdGFTdG9yZTsKKyAgICAgICAgcmV0dXJuIHN1c3BlbmRl ZFBhZ2UtPnByb2Nlc3MoKS5yZWdpc3RyYWJsZURvbWFpbigpID09IHJlZ2lzdHJhYmxlRG9tYWlu ICYmICZzdXNwZW5kZWRQYWdlLT5wcm9jZXNzKCkud2Vic2l0ZURhdGFTdG9yZSgpID09ICZkYXRh U3RvcmU7CiAgICAgfSk7CiAgICAgaWYgKGl0ID09IG1fc3VzcGVuZGVkUGFnZXMuZW5kKCkpCiAg ICAgICAgIHJldHVybiBudWxscHRyOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IGUyYWIxMzg5ZTcyNWMzZWQzNmNmODk0YWUxMTFjNmI2MTUzYTYw MjAuLjA3YWQ3Y2Q4N2I4OWE0NzkwZTA3ZTY4YzU1OTBhYjZiZTU5MTc0NDggMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxOS0wNC0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIExv YWRzIHVzaW5nIGxvYWRIVE1MU3RyaW5nKCkgY2F1c2UgZmxhc2hpbmcgd2hlbiBwcm9jZXNzLXN3 YXBwaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTY3MTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5NjM3MzU0PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFnZS4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW06CisKIDIwMTktMDQtMDggIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtld3MtYnVpbGRdIERvIG5vdCB1cGxvYWQgYXJjaGl2ZSB3 aGVuIENvbXBpbGUgRmFpbHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IDg2 NjRkZjNjZGU3YTJjMDY3NTY2MjE2NDY0MDM1OGE3OTE4NjcwNTYuLmZjNGZhNmExZGM1NDczZDk0 OTQ1NWJkOTUxNmZlYjFlMzI5MTFiNWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bQpAQCAtMjM0Niw2ICsyMzQ2LDcgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2Vzc2lvblN0b3JhZ2Up CiBURVNUKFByb2Nlc3NTd2FwLCBSZXVzZVN1c3BlbmRlZFByb2Nlc3MpCiB7CiAgICAgYXV0byBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBwc29uUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCk7 CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnVzZXNXZWJQcm9jZXNzQ2FjaGUg PSBOTzsKICAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxs b2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgp XSk7CiAKICAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmll d0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKQEAgLTIzOTQsNiArMjM5NSw1NSBAQCBURVNU KFByb2Nlc3NTd2FwLCBSZXVzZVN1c3BlbmRlZFByb2Nlc3MpCiAgICAgRVhQRUNUX0VRKGFwcGxl UElELCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKIH0KIAorVEVTVChQcm9jZXNz U3dhcCwgUmV1c2VTdXNwZW5kZWRQcm9jZXNzTG9hZEhUTUxTdHJpbmcpCit7CisgICAgYXV0byBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBwc29uUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCk7 CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnVzZXNXZWJQcm9jZXNzQ2FjaGUg PSBOTzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxs b2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgp XSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmll d0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24g c2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8gaGFuZGxlciA9IGFk b3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0 aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJQU09O Il07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0 V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmll d0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW1BT T05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZp Z2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNTdHJpbmcgKmh0bWxTdHJp bmcgPSBAIjxodG1sPjxib2R5PlRFU1Q8L2JvZHk+PC9odG1sPiI7CisgICAgW3dlYlZpZXcgbG9h ZEhUTUxTdHJpbmc6aHRtbFN0cmluZyBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiXV07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8gd2Via2l0UElE ID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIFt3ZWJWaWV3IGxvYWRI VE1MU3RyaW5nOmh0bWxTdHJpbmcgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246 Ly93d3cuYXBwbGUuY29tL21haW4xLmh0bWwiXV07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGls OjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8gYXBwbGVQSUQgPSBb d2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgRVhQRUNUX05FKHdlYmtpdFBJ RCwgYXBwbGVQSUQpOworCisgICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6aHRtbFN0cmluZyBi YXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4y Lmh0bWwiXV07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRv bmUgPSBmYWxzZTsKKworICAgIC8vIFdlIHNob3VsZCBoYXZlIGdvbmUgYmFjayB0byB0aGUgd2Vi a2l0Lm9yZyBwcm9jZXNzIGZvciB0aGlzIGxvYWQgc2luY2Ugd2UgcmV1c2UgU3VzcGVuZGVkUGFn ZXMnIHByb2Nlc3Mgd2hlbiBwb3NzaWJsZS4KKyAgICBFWFBFQ1RfRVEod2Via2l0UElELCBbd2Vi VmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKworICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3Ry aW5nOmh0bWxTdHJpbmcgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cu YXBwbGUuY29tL21haW4yLmh0bWwiXV07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIC8vIFdlIHNob3VsZCBoYXZlIGdvbmUg YmFjayB0byB0aGUgYXBwbGUuY29tIHByb2Nlc3MgZm9yIHRoaXMgbG9hZCBzaW5jZSB3ZSByZXVz ZSBTdXNwZW5kZWRQYWdlcycgcHJvY2VzcyB3aGVuIHBvc3NpYmxlLgorICAgIEVYUEVDVF9FUShh cHBsZVBJRCwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7Cit9CisKIHN0YXRpYyBj b25zdCBjaGFyKiBmYWlsc1RvRW50ZXJQYWdlQ2FjaGVUZXN0Qnl0ZXMgPSBSIlBTT05SRVNPVVJD RSgKIDxib2R5PgogPHNjcmlwdD4K