211626 2020-05-08 08:42:13 -0700 REGRESSION(r259209) Webview's pending URL is null after restoring session state 2020-05-08 10:34:04 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 207908 1 cdumez cdumez achristensen beidson ggaren webkit-bug-importer oldest_to_newest 1650601 0 cdumez 2020-05-08 08:42:13 -0700 Webview's pending URL is null after restoring session state since r259209. 1650602 1 cdumez 2020-05-08 08:42:36 -0700 <rdar://problem/62992262> 1650603 2 398862 cdumez 2020-05-08 08:46:15 -0700 Created attachment 398862 Patch 1650640 3 398866 cdumez 2020-05-08 09:40:40 -0700 Created attachment 398866 Patch 1650674 4 ews-feeder 2020-05-08 10:34:03 -0700 Committed r261394: <https://trac.webkit.org/changeset/261394> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398866. 398862 2020-05-08 08:46:15 -0700 2020-05-08 09:40:38 -0700 Patch bug-211626-20200508084615.patch text/plain 6769 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI3ZWFlYjllZWIyN2RmYTIy YjY2Njg0ZTVlMjQ5Mjc0MjJmNDY0NjkuLmZkODNkNTYyNDY5ZjUyN2E1ZjlmZjE5OGYwY2QzZGNi ZDU5ZmRiNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjAtMDUtMDggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNTkyMDkpIFdl YnZpZXcncyBwZW5kaW5nIFVSTCBpcyBudWxsIGFmdGVyIHJlc3RvcmluZyBzZXNzaW9uIHN0YXRl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE2MjYK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyOTkyMjYyPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB3YXMgdGhhdCBXZWJQYWdlUHJv eHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oKSB3b3VsZCBiZWhhdmUgZGlmZmVyZW50bHkgd2hldGhl cgorICAgICAgICB0aGUgcGFnZSBoYXMgYSBydW5uaW5nIHByb2Nlc3Mgb3Igbm90LiBJbiBwYXJ0 aWN1bGFyLCB3aGVuIHRoZSBwYWdlIGRpZCBub3QgaGF2ZSBhCisgICAgICAgIHJ1bm5pbmcgcHJv Y2VzcywgZ29Ub0JhY2tGb3J3YXJkSXRlbSgpIHdvdWxkIHJldHVybiBlYXJseSBhbmQgY2FsbCBs YXVuY2hQcm9jZXNzV2l0aEl0ZW0oKQorICAgICAgICBpbnN0ZWFkLiBVbmxpa2UgZ29Ub0JhY2tG b3J3YXJkSXRlbSgpLCBsYXVuY2hQcm9jZXNzV2l0aEl0ZW0oKSB3b3VsZCBmYWlsIHRvIHNldCB0 aGUKKyAgICAgICAgcGVuZGluZyBBUEkgcmVxdWVzdC4KKworICAgICAgICBUbyBhZGRyZXNzIHRo ZSBpc3N1ZSwgSSBhbSBnZXR0aW5nIHJpZCBvZiBsYXVuY2hQcm9jZXNzV2l0aEl0ZW0oKSBhbmQg bWVyZ2luZyBpdHMgbG9naWMKKyAgICAgICAgaW50byBnb1RvQmFja0ZvcndhcmRJdGVtKCkgaW5z dGVhZC4gQm90aCBtZXRob2RzIHNoYXJlZCBhIGxvdCBvZiBjb2RlIGFueXdheSBhbmQgaGF2aW5n CisgICAgICAgIDIgc2VwYXJhdGUgY29kZSBwYXRocyB0aGF0IG1heSBkaXZlcmdlIGlzIGVycm9y IHByb25lLgorCisgICAgICAgIENoYW5nZSBpcyBjb3ZlcmVkIGJ5IG5ldyBBUEkgdGVzdC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmxhdW5jaFByb2Nlc3NXaXRoSXRlbSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCiAyMDIwLTA1LTA3ICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjEyNTIuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAzMzdhOGYwNzFiNzAy MDFiMzZjMzgxOTFhZGFkMzU0MTY3ODNiMWZlLi44OTQ4ZmFlZmQ0OTI5OWU0YmY2ZmVmOGI2MjMz NWI0Nzg3ZmI5YWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK QEAgLTEwMjQsMjkgKzEwMjQsNiBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJv eHk6OmxhdW5jaFByb2Nlc3NGb3JSZWxvYWQoKQogICAgIHJldHVybiBuYXZpZ2F0aW9uOwogfQog Ci1SZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmxhdW5jaFByb2Nlc3NXaXRo SXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtKQotewotICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoTG9hZGluZywgImxhdW5jaFByb2Nlc3NXaXRoSXRlbToiKTsKLQotICAgIGlmICht X2lzQ2xvc2VkKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImxh dW5jaFByb2Nlc3NXaXRoSXRlbTogcGFnZSBpcyBjbG9zZWQiKTsKLSAgICAgICAgcmV0dXJuIG51 bGxwdHI7Ci0gICAgfQotCi0gICAgQVNTRVJUKCFoYXNSdW5uaW5nUHJvY2VzcygpKTsKLSAgICBs YXVuY2hQcm9jZXNzKFJlZ2lzdHJhYmxlRG9tYWluIHsgVVJMKFVSTCgpLCBpdGVtLnVybCgpKSB9 LCBQcm9jZXNzTGF1bmNoUmVhc29uOjpJbml0aWFsUHJvY2Vzcyk7Ci0KLSAgICBpZiAoJml0ZW0g IT0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpCi0gICAgICAgIG1fYmFja0Zvcndh cmRMaXN0LT5nb1RvSXRlbShpdGVtKTsKLQotICAgIGF1dG8gbmF2aWdhdGlvbiA9IG1fbmF2aWdh dGlvblN0YXRlLT5jcmVhdGVCYWNrRm9yd2FyZE5hdmlnYXRpb24oaXRlbSwgbV9iYWNrRm9yd2Fy ZExpc3QtPmN1cnJlbnRJdGVtKCksIEZyYW1lTG9hZFR5cGU6OkluZGV4ZWRCYWNrRm9yd2FyZCk7 Ci0KLSAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmln YXRpb24tPm5hdmlnYXRpb25JRCgpLCBpdGVtLml0ZW1JRCgpLCBGcmFtZUxvYWRUeXBlOjpJbmRl eGVkQmFja0ZvcndhcmQsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6Tm8sIFdURjo6bnVs bG9wdCkpOwotICAgIG1fcHJvY2Vzcy0+c3RhcnRSZXNwb25zaXZlbmVzc1RpbWVyKCk7Ci0KLSAg ICByZXR1cm4gbmF2aWdhdGlvbjsKLX0KLQogdm9pZCBXZWJQYWdlUHJveHk6OnNldERyYXdpbmdB cmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdpbmdBcmVhKQogewog ICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRyYXdpbmdBcmVhKTsKQEAgLTE2NTQsOCArMTYz MSwxNiBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmdvVG9CYWNrRm9y d2FyZEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbQogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoTG9hZGluZywgImdvVG9CYWNrRm9yd2FyZEl0ZW06Iik7CiAgICAgTE9HKExvYWRpbmcsICJX ZWJQYWdlUHJveHkgJXAgZ29Ub0JhY2tGb3J3YXJkSXRlbSB0byBpdGVtIFVSTCAlcyIsIHRoaXMs IGl0ZW0udXJsKCkudXRmOCgpLmRhdGEoKSk7CiAKKyAgICBpZiAobV9pc0Nsb3NlZCkgeworICAg ICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJnb1RvQmFja0ZvcndhcmRJdGVt OiBwYWdlIGlzIGNsb3NlZCIpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKICAg ICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpCi0gICAgICAgIHJldHVybiBsYXVuY2hQcm9jZXNz V2l0aEl0ZW0oaXRlbSk7CisgICAgICAgIGxhdW5jaFByb2Nlc3MoUmVnaXN0cmFibGVEb21haW4g eyBVUkwoVVJMKCksIGl0ZW0udXJsKCkpIH0sIFByb2Nlc3NMYXVuY2hSZWFzb246OkluaXRpYWxQ cm9jZXNzKTsKKworICAgIGlmICgmaXRlbSAhPSBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0 ZW0oKSkKKyAgICAgICAgbV9iYWNrRm9yd2FyZExpc3QtPmdvVG9JdGVtKGl0ZW0pOwogCiAgICAg UmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAoIW1fYmFja0Zvcndh cmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtSXNJblNhbWVEb2N1bWVudChpdGVtKSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggM2I5ZWRjOTJlZTlkZGM3YjQ1MjAy MjkzMzgyYTkyMTA2NWNlN2E1ZS4uZmYwNzIyYzNlODQ5MTU0MDczNDc4NjY0N2Q3OGQ4NjZlODJj YjdhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTE5NDcsNyAr MTk0Nyw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3Mo UHJvY2Vzc0xhdW5jaFJlYXNvbik7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBsYXVu Y2hQcm9jZXNzRm9yUmVsb2FkKCk7Ci0gICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbGF1bmNo UHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAogICAgIHZvaWQgcmVx dWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0 IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKICAgICB2b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3Qg U3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkws IGNvbnN0IFN0cmluZyYgdGFnLCBjb25zdCBTdHJpbmcmIGxhbmcsIFdlYkNvcmU6Ok5vdGlmaWNh dGlvbkRpcmVjdGlvbiwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlm aWNhdGlvbklEKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCBjMjljODkyMDE1MzYxNmViZDk2MzE3NDEwZDIzYmFhNGRhYThjYzk0Li5jNzY3Njdk NWE4YzdjZGNmMjJiYTVhNWFkNmIyNGE3YjdkMmEyYTJjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDUtMDgg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIy NTkyMDkpIFdlYnZpZXcncyBwZW5kaW5nIFVSTCBpcyBudWxsIGFmdGVyIHJlc3RvcmluZyBzZXNz aW9uIHN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTE2MjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyOTkyMjYyPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFn ZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1Jlc3RvcmVTZXNzaW9u U3RhdGUuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAtMDUtMDcg IEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIHdlYmtpdHB5 OiBVc2UgYXBwbGVfYWRkaXRpb25zIGNlcnRpZmljYXRlIHBhdGggaWYgYXZhaWxhYmxlCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9SZXN0b3JlU2Vzc2lvblN0 YXRlLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1Jlc3RvcmVTZXNzaW9u U3RhdGUuY3BwCmluZGV4IDM2YjRiMjJiNmVlZGRmMGVlZjJlMWYyNWVkZjkzNGZhMTE5OWQ1MDku LjlhNDFmNDRhMTVmNzQ5MDc1MjM5Nzg0NmZlMDk2YjU4ZjdkYTdkNmMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1Jlc3RvcmVTZXNzaW9uU3RhdGUuY3BwCisr KyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1Jlc3RvcmVTZXNzaW9uU3RhdGUu Y3BwCkBAIC0xMzcsNiArMTM3LDI0IEBAIFRFU1QoV2ViS2l0LCBSZXN0b3JlU2Vzc2lvblN0YXRl QWZ0ZXJDbG9zZSkKICAgICBhdXRvIHNlc3Npb25TdGF0ZSA9IGFkb3B0V0soV0tTZXNzaW9uU3Rh dGVDcmVhdGVGcm9tRGF0YShkYXRhLmdldCgpKSk7CiAgICAgV0tQYWdlUmVzdG9yZUZyb21TZXNz aW9uU3RhdGUod2ViVmlldy5wYWdlKCksIHNlc3Npb25TdGF0ZS5nZXQoKSk7CiB9CisKK1RFU1Qo V2ViS2l0LCBQZW5kaW5nVVJMQWZ0ZXJSZXN0b3JlU2Vzc2lvblN0YXRlKQoreworICAgIGF1dG8g Y29udGV4dCA9IGFkb3B0V0soV0tDb250ZXh0Q3JlYXRlV2l0aENvbmZpZ3VyYXRpb24obnVsbHB0 cikpOworICAgIFBsYXRmb3JtV2ViVmlldyB3ZWJWaWV3KGNvbnRleHQuZ2V0KCkpOworICAgIHNl dFBhZ2VMb2FkZXJDbGllbnQod2ViVmlldy5wYWdlKCkpOworICAgIGF1dG8gZGF0YSA9IGNyZWF0 ZVNlc3Npb25TdGF0ZURhdGEoY29udGV4dC5nZXQoKSk7CisgICAgRVhQRUNUX05PVF9OVUxMKGRh dGEpOworICAgIGF1dG8gc2Vzc2lvblN0YXRlID0gYWRvcHRXSyhXS1Nlc3Npb25TdGF0ZUNyZWF0 ZUZyb21EYXRhKGRhdGEuZ2V0KCkpKTsKKyAgICBXS1BhZ2VSZXN0b3JlRnJvbVNlc3Npb25TdGF0 ZSh3ZWJWaWV3LnBhZ2UoKSwgc2Vzc2lvblN0YXRlLmdldCgpKTsKKyAgICBhdXRvIHBlbmRpbmdV UkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlQZW5kaW5nQVBJUmVxdWVzdFVSTCh3ZWJWaWV3LnBhZ2Uo KSkpOworICAgIEVYUEVDVF9OT1RfTlVMTChwZW5kaW5nVVJMKTsKKyAgICBpZiAoIXBlbmRpbmdV UkwpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8gZXhwZWN0ZWRVUkwgPSBhZG9wdFdLKFV0 aWw6OmNyZWF0ZVVSTEZvclJlc291cmNlKCJzaW1wbGUtZm9ybSIsICJodG1sIikpOworICAgIEVY UEVDVF9XS19TVFJFUShhZG9wdFdLKFdLVVJMQ29weVN0cmluZyhleHBlY3RlZFVSTC5nZXQoKSkp LmdldCgpLCBhZG9wdFdLKFdLVVJMQ29weVN0cmluZyhwZW5kaW5nVVJMLmdldCgpKSkuZ2V0KCkp OworfQogICAgIAogfSAvLyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSQogCg== 398866 2020-05-08 09:40:40 -0700 2020-05-08 10:34:03 -0700 Patch bug-211626-20200508094039.patch text/plain 6844 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIwMTUxNGU2NzA3NGQ0ZTEw YzgyYTE3YmI1YzFjZWUwZTM0NjUxMTcuLjUzMTUyMzA2MDIyMGFiMTBiNmY0ZmU0Yjk3MDViOTEy YmI3MzAwOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjAtMDUtMDggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNTkyMDkpIFdl YnZpZXcncyBwZW5kaW5nIFVSTCBpcyBudWxsIGFmdGVyIHJlc3RvcmluZyBzZXNzaW9uIHN0YXRl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE2MjYK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyOTkyMjYyPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB3YXMgdGhhdCBXZWJQYWdlUHJv eHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oKSB3b3VsZCBiZWhhdmUgZGlmZmVyZW50bHkgd2hldGhl cgorICAgICAgICB0aGUgcGFnZSBoYXMgYSBydW5uaW5nIHByb2Nlc3Mgb3Igbm90LiBJbiBwYXJ0 aWN1bGFyLCB3aGVuIHRoZSBwYWdlIGRpZCBub3QgaGF2ZSBhCisgICAgICAgIHJ1bm5pbmcgcHJv Y2VzcywgZ29Ub0JhY2tGb3J3YXJkSXRlbSgpIHdvdWxkIHJldHVybiBlYXJseSBhbmQgY2FsbCBs YXVuY2hQcm9jZXNzV2l0aEl0ZW0oKQorICAgICAgICBpbnN0ZWFkLiBVbmxpa2UgZ29Ub0JhY2tG b3J3YXJkSXRlbSgpLCBsYXVuY2hQcm9jZXNzV2l0aEl0ZW0oKSB3b3VsZCBmYWlsIHRvIHNldCB0 aGUKKyAgICAgICAgcGVuZGluZyBBUEkgcmVxdWVzdC4KKworICAgICAgICBUbyBhZGRyZXNzIHRo ZSBpc3N1ZSwgSSBhbSBnZXR0aW5nIHJpZCBvZiBsYXVuY2hQcm9jZXNzV2l0aEl0ZW0oKSBhbmQg bWVyZ2luZyBpdHMgbG9naWMKKyAgICAgICAgaW50byBnb1RvQmFja0ZvcndhcmRJdGVtKCkgaW5z dGVhZC4gQm90aCBtZXRob2RzIHNoYXJlZCBhIGxvdCBvZiBjb2RlIGFueXdheSBhbmQgaGF2aW5n CisgICAgICAgIDIgc2VwYXJhdGUgY29kZSBwYXRocyB0aGF0IG1heSBkaXZlcmdlIGlzIGVycm9y IHByb25lLgorCisgICAgICAgIENoYW5nZSBpcyBjb3ZlcmVkIGJ5IG5ldyBBUEkgdGVzdC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmxhdW5jaFByb2Nlc3NXaXRoSXRlbSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCiAyMDIwLTA1LTA4ICBQZXIgQXJuZSBWb2xsYW4gIDxw dm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIENsb3NlIGNvbm5lY3Rpb25zIHRv IExhdW5jaCBTZXJ2aWNlcyBhZnRlciByZXZva2luZyBleHRlbnNpb24KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDMzN2E4ZjA3MWI3MDIwMWIzNmMzODE5MWFk YWQzNTQxNjc4M2IxZmUuLjUyZjAwNDgxODUyNjgzOTFhZjljYTBiNTdhYWZjMWI0ZmVjYWRlZDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMTAyNCwyOSAr MTAyNCw2IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6bGF1bmNoUHJv Y2Vzc0ZvclJlbG9hZCgpCiAgICAgcmV0dXJuIG5hdmlnYXRpb247CiB9CiAKLVJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6bGF1bmNoUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW0mIGl0ZW0pCi17Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2Fk aW5nLCAibGF1bmNoUHJvY2Vzc1dpdGhJdGVtOiIpOwotCi0gICAgaWYgKG1faXNDbG9zZWQpIHsK LSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAibGF1bmNoUHJvY2Vzc1dp dGhJdGVtOiBwYWdlIGlzIGNsb3NlZCIpOwotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICB9 Ci0KLSAgICBBU1NFUlQoIWhhc1J1bm5pbmdQcm9jZXNzKCkpOwotICAgIGxhdW5jaFByb2Nlc3Mo UmVnaXN0cmFibGVEb21haW4geyBVUkwoVVJMKCksIGl0ZW0udXJsKCkpIH0sIFByb2Nlc3NMYXVu Y2hSZWFzb246OkluaXRpYWxQcm9jZXNzKTsKLQotICAgIGlmICgmaXRlbSAhPSBtX2JhY2tGb3J3 YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSkKLSAgICAgICAgbV9iYWNrRm9yd2FyZExpc3QtPmdvVG9J dGVtKGl0ZW0pOwotCi0gICAgYXV0byBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUtPmNy ZWF0ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbihpdGVtLCBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVu dEl0ZW0oKSwgRnJhbWVMb2FkVHlwZTo6SW5kZXhlZEJhY2tGb3J3YXJkKTsKLQotICAgIHNlbmQo TWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi0+bmF2aWdh dGlvbklEKCksIGl0ZW0uaXRlbUlEKCksIEZyYW1lTG9hZFR5cGU6OkluZGV4ZWRCYWNrRm9yd2Fy ZCwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpObywgV1RGOjpudWxsb3B0KSk7Ci0gICAg bV9wcm9jZXNzLT5zdGFydFJlc3BvbnNpdmVuZXNzVGltZXIoKTsKLQotICAgIHJldHVybiBuYXZp Z2F0aW9uOwotfQotCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0RHJhd2luZ0FyZWEoc3RkOjp1bmlx dWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYgZHJhd2luZ0FyZWEpCiB7CiAgICAgbV9kcmF3aW5n QXJlYSA9IFdURk1vdmUoZHJhd2luZ0FyZWEpOwpAQCAtMTY1NCw4ICsxNjMxLDE3IEBAIFJlZlB0 cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbShXZWJC YWNrRm9yd2FyZExpc3RJdGVtCiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAi Z29Ub0JhY2tGb3J3YXJkSXRlbToiKTsKICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAl cCBnb1RvQmFja0ZvcndhcmRJdGVtIHRvIGl0ZW0gVVJMICVzIiwgdGhpcywgaXRlbS51cmwoKS51 dGY4KCkuZGF0YSgpKTsKIAotICAgIGlmICghaGFzUnVubmluZ1Byb2Nlc3MoKSkKLSAgICAgICAg cmV0dXJuIGxhdW5jaFByb2Nlc3NXaXRoSXRlbShpdGVtKTsKKyAgICBpZiAobV9pc0Nsb3NlZCkg eworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJnb1RvQmFja0Zvcndh cmRJdGVtOiBwYWdlIGlzIGNsb3NlZCIpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9 CisKKyAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpIHsKKyAgICAgICAgbGF1bmNoUHJvY2Vz cyhSZWdpc3RyYWJsZURvbWFpbiB7IFVSTChVUkwoKSwgaXRlbS51cmwoKSkgfSwgUHJvY2Vzc0xh dW5jaFJlYXNvbjo6SW5pdGlhbFByb2Nlc3MpOworCisgICAgICAgIGlmICgmaXRlbSAhPSBtX2Jh Y2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSkKKyAgICAgICAgICAgIG1fYmFja0ZvcndhcmRM aXN0LT5nb1RvSXRlbShpdGVtKTsKKyAgICB9CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9u PiBuYXZpZ2F0aW9uOwogICAgIGlmICghbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkt Pml0ZW1Jc0luU2FtZURvY3VtZW50KGl0ZW0pKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaAppbmRleCAzYjllZGM5MmVlOWRkYzdiNDUyMDIyOTMzODJhOTIxMDY1Y2U3YTVlLi5m ZjA3MjJjM2U4NDkxNTQwNzM0Nzg2NjQ3ZDc4ZDg2NmU4MmNiN2FmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTk0Nyw3ICsxOTQ3LDYgQEAgcHJpdmF0ZToKICAg ICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhQcm9jZXNzTGF1bmNoUmVhc29uKTsK IAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IGxhdW5jaFByb2Nlc3NGb3JSZWxvYWQoKTsK LSAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBsYXVuY2hQcm9jZXNzV2l0aEl0ZW0oV2ViQmFj a0ZvcndhcmRMaXN0SXRlbSYpOwogCiAgICAgdm9pZCByZXF1ZXN0Tm90aWZpY2F0aW9uUGVybWlz c2lvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcp OwogICAgIHZvaWQgc2hvd05vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBT dHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgaWNvblVSTCwgY29uc3QgU3RyaW5nJiB0YWcsIGNv bnN0IFN0cmluZyYgbGFuZywgV2ViQ29yZTo6Tm90aWZpY2F0aW9uRGlyZWN0aW9uLCBjb25zdCBT dHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGIwYTExYzBiNzJmMjlk MjA5MTQ3ZGZiZWZmNmU5MjBiZjU5OTk5MGYuLjAxY2E5YTNjZDJkZjE1ODUwMGM1ZDQ0MjlhYjRm YWRiYzlkMDUyZjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wNS0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjI1OTIwOSkgV2VidmlldydzIHBlbmRp bmcgVVJMIGlzIG51bGwgYWZ0ZXIgcmVzdG9yaW5nIHNlc3Npb24gc3RhdGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTYyNgorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNjI5OTIyNjI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQvUmVzdG9yZVNlc3Npb25TdGF0ZS5jcHA6CisgICAgICAgIChU ZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMC0wNS0wOCAgTGF1cm8gTW91cmEgIDxsbW91cmFA aWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIENyZWF0ZSBjb21tb24gZ2xpYiBleHBl Y3RhdGlvbiBmaWxlCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dC9SZXN0b3JlU2Vzc2lvblN0YXRlLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0L1Jlc3RvcmVTZXNzaW9uU3RhdGUuY3BwCmluZGV4IDM2YjRiMjJiNmVlZGRmMGVlZjJlMWYy NWVkZjkzNGZhMTE5OWQ1MDkuLjlhNDFmNDRhMTVmNzQ5MDc1MjM5Nzg0NmZlMDk2YjU4ZjdkYTdk NmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1Jlc3RvcmVT ZXNzaW9uU3RhdGUuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1Jl c3RvcmVTZXNzaW9uU3RhdGUuY3BwCkBAIC0xMzcsNiArMTM3LDI0IEBAIFRFU1QoV2ViS2l0LCBS ZXN0b3JlU2Vzc2lvblN0YXRlQWZ0ZXJDbG9zZSkKICAgICBhdXRvIHNlc3Npb25TdGF0ZSA9IGFk b3B0V0soV0tTZXNzaW9uU3RhdGVDcmVhdGVGcm9tRGF0YShkYXRhLmdldCgpKSk7CiAgICAgV0tQ YWdlUmVzdG9yZUZyb21TZXNzaW9uU3RhdGUod2ViVmlldy5wYWdlKCksIHNlc3Npb25TdGF0ZS5n ZXQoKSk7CiB9CisKK1RFU1QoV2ViS2l0LCBQZW5kaW5nVVJMQWZ0ZXJSZXN0b3JlU2Vzc2lvblN0 YXRlKQoreworICAgIGF1dG8gY29udGV4dCA9IGFkb3B0V0soV0tDb250ZXh0Q3JlYXRlV2l0aENv bmZpZ3VyYXRpb24obnVsbHB0cikpOworICAgIFBsYXRmb3JtV2ViVmlldyB3ZWJWaWV3KGNvbnRl eHQuZ2V0KCkpOworICAgIHNldFBhZ2VMb2FkZXJDbGllbnQod2ViVmlldy5wYWdlKCkpOworICAg IGF1dG8gZGF0YSA9IGNyZWF0ZVNlc3Npb25TdGF0ZURhdGEoY29udGV4dC5nZXQoKSk7CisgICAg RVhQRUNUX05PVF9OVUxMKGRhdGEpOworICAgIGF1dG8gc2Vzc2lvblN0YXRlID0gYWRvcHRXSyhX S1Nlc3Npb25TdGF0ZUNyZWF0ZUZyb21EYXRhKGRhdGEuZ2V0KCkpKTsKKyAgICBXS1BhZ2VSZXN0 b3JlRnJvbVNlc3Npb25TdGF0ZSh3ZWJWaWV3LnBhZ2UoKSwgc2Vzc2lvblN0YXRlLmdldCgpKTsK KyAgICBhdXRvIHBlbmRpbmdVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlQZW5kaW5nQVBJUmVxdWVz dFVSTCh3ZWJWaWV3LnBhZ2UoKSkpOworICAgIEVYUEVDVF9OT1RfTlVMTChwZW5kaW5nVVJMKTsK KyAgICBpZiAoIXBlbmRpbmdVUkwpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8gZXhwZWN0 ZWRVUkwgPSBhZG9wdFdLKFV0aWw6OmNyZWF0ZVVSTEZvclJlc291cmNlKCJzaW1wbGUtZm9ybSIs ICJodG1sIikpOworICAgIEVYUEVDVF9XS19TVFJFUShhZG9wdFdLKFdLVVJMQ29weVN0cmluZyhl eHBlY3RlZFVSTC5nZXQoKSkpLmdldCgpLCBhZG9wdFdLKFdLVVJMQ29weVN0cmluZyhwZW5kaW5n VVJMLmdldCgpKSkuZ2V0KCkpOworfQogICAgIAogfSAvLyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQ SQogCg==