193578 2019-01-18 09:15:17 -0800 Regression(PSON) Scroll position is not always restored properly when navigating back 2019-01-18 11:47:38 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez ews-watchlist ggaren koivisto simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1495881 0 cdumez 2019-01-18 09:15:17 -0800 Scroll position is not always restored properly when navigating back, when PSON is enabled. 1495883 1 webkit-bug-importer 2019-01-18 09:15:44 -0800 <rdar://problem/47386331> 1495887 2 359499 cdumez 2019-01-18 09:40:54 -0800 Created attachment 359499 Patch 1495888 3 ews-watchlist 2019-01-18 09:44:07 -0800 Attachment 359499 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:3849: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:3853: Missing spaces around = [whitespace/operators] [4] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:3866: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1495944 4 359499 thorton 2019-01-18 11:24:44 -0800 Comment on attachment 359499 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359499&action=review > Source/WebKit/ChangeLog:42 > + not cause a flash in most cases. Howerver, with PSON enabled and the layer tree freezing we Howerver 1495960 5 cdumez 2019-01-18 11:47:38 -0800 Committed r240161: <https://trac.webkit.org/changeset/240161> 359499 2019-01-18 09:40:54 -0800 2019-01-18 11:24:44 -0800 Patch bug-193578-20190118094053.patch text/plain 14326 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0OTJmOGFmMjdmOGUxODQ5 ODI2NDk1YTMwZjY4MzkzYjg3ZmYyMDAuLjI4NDVhMWMxOTk4MWUzYjMwMzhlY2RlOThlNTQ3ZWFj YmE5M2ZkOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjMgQEAKKzIwMTktMDEtMTggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pIFNjcm9s bCBwb3NpdGlvbiBpcyBub3QgYWx3YXlzIHJlc3RvcmVkIHByb3Blcmx5IHdoZW4gbmF2aWdhdGlu ZyBiYWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTM1NzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3Mzg2MzMxPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBpc3N1ZXMgY2F1c2luZyB0aGUg c2Nyb2xsIHBvc2l0aW9uIHRvIG5vdCBiZSByZXN0b3JlZCBhdCBhbGwgKG9yIGluY29ycmVjdGx5 KSB3aGVuCisgICAgICAgIG5hdmlnYXRpbmcgYmFjayBjcm9zcy1zaXRlIHdpdGggUFNPTiBlbmFi bGVkLiBBbHNvIG1ha2Ugc3VyZSB0aGF0IHRoZSBzd2lwZSBnZXN0dXJlCisgICAgICAgIHNuYXBz aG90IHJlYWxseSBzdGF5cyB1cCB1bnRpbCB3ZSd2ZSByZXN0b3JlZCB0aGUgc2Nyb2xsIHBvc2l0 aW9uLgorCisgICAgICAgIE5vdGUgdGhhdCBldmVuIGFmdGVyIHRob3NlIGNoYW5nZXMsIEkgY2Fu IHN0aWxsIHNvbWV0aW1lcyByZXByb2R1Y2UgYSB3aGl0ZSBmbGFzaCB3aGVuCisgICAgICAgIHN3 aXBpbmcgYmFjayB0byBHb29nbGUgc2VhcmNoIHJlc3VsdHMgKHNjcm9sbCBwb3NpdGlvbiBiZWlu ZyBjb3JyZWN0IG5vdykuIFRoaXMgaXMKKyAgICAgICAgdHJhY2tlZCBieSA8cmRhcjovL3Byb2Js ZW0vNDcwNzE2ODQ+IGFuZCBoYXBwZW5zIGV2ZW4gaWYgSSBkaXNhYmxlIFBTT04gZW50aXJlbHku CisKKyAgICAgICAgKiBTaGFyZWQvU2Vzc2lvblN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 RnJhbWVTdGF0ZTo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVTdGF0ZTo6 ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvU2Vzc2lvblN0YXRlLmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9TZXNzaW9uU3RhdGVDb252ZXJzaW9uLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6dG9GcmFtZVN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6YXBwbHlGcmFtZVN0 YXRlKToKKyAgICAgICAgb2JzY3VyZWRJbnNldHMgaXMgcHJlc2VudCBvbiB0aGUgSGlzdG9yeUl0 ZW0gaW4gdGhlIFdlYlByb2Nlc3MgYnV0IHdhcyBuZXZlciBwYXNzZWQgdG8KKyAgICAgICAgb3Ig c3RvcmVkIGJ5IHRoZSBVSVByb2Nlc3Mgb24gdGhlIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uIG9i c2N1cmVkSW5zZXRzIGlzIG5lZWRlZCB0bworICAgICAgICBwcm9wZXJseSByZXN0b3JlIHRoZSBz Y3JvbGxQb3NpdGlvbiAocG9zaXRpb24gd2FzIDcwcHggb2ZmIG9uIG15IGlQYWQgd2l0aG91dCB0 aGlzKS4KKyAgICAgICAgV2l0aCBQU09OIGVuYWJsZWQsIGlmIHlvdSBzd2lwZSBiYWNrIGNyb3Nz LXByb2Nlc3MgYW5kIHRoZSBwcmV2aW91cyBwYWdlIHdhcyBub3QgcHV0CisgICAgICAgIGludG8g UGFnZUNhY2hlLCB0aGVuIHRoZSBIaXN0b3J5SXRlbSBpcyBnb25lIG9uIHRoZSBXZWJQcm9jZXNz IHNpZGUuIFdoYXQgaGFwcGVucyBpcworICAgICAgICB0aGF0IHRoZSBVSVByb2Nlc3Mgc2VuZHMg aXRzIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0gdG8gdGhlIFdlYlByb2Nlc3MsIHdoaWNoIHJlc3Rv cmVzCisgICAgICAgIHRoZSBIaXN0b3J5SXRlbSB0aGVyZSwgYW5kIHRoZW4gYXNrcyBpdCB0byBs b2FkIGl0LiBUaGUgb2JzY3VyZWRJbnNldHMgd2FzIGdldHRpbmcgbG9zdAorICAgICAgICBpbiB0 aGUgcHJvY2VzcyBzaW5jZSB0aGUgVUlQcm9jZXNzIG5ldmVyIGtuZXcgYWJvdXQgaXQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRSZWFjaE1haW5GcmFtZUxvYWRU ZXJtaW5hbFN0YXRlKToKKyAgICAgICAgRHJvcCBsb2dpYyB0aGF0IHdhcyBjYXVzaW5nIHRoZSBW aWV3R2VzdHVyZUNvbnRyb2xsZXIgdG8gbm90IHdhaXQgZm9yIHRoZSBzY3JvbGwgcG9zaXRpb24K KyAgICAgICAgdG8gYmUgcmVzdG9yZWQgYmVmb3JlIHRha2luZyBkb3duIHRoZSBzbmFwc2hvdCwg d2hlbiBVSS1zaWRlIGNvbXBvc2l0aW5nIGlzIGVuYWJsZWQuCisgICAgICAgIElmIHlvdSBsb29r IGF0IHRoZSBjb21tZW50IGFib3ZlIHRoZSBjb2RlLCB5b3UnbGwgc2VlIHRoYXQgdGhlIGNvZGUg aW4gcXVlc3Rpb24gd2FzIG1lYW50CisgICAgICAgIHRvIGltcGFjdCBvbmx5IHRoZSBub24tVUkg c2lkZSBjb21wb3NpdGluZyBjb2RlIHBhdGguIEFzIGEgbWF0dGVyIG9mIGZhY3QsIHdoZW4gdGhl IGNvZGUKKyAgICAgICAgd2FzIHJldmlld2VkIGF0IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTEyMjQsIGl0IHdhcyBwcm90ZWN0ZWQgYnkgYQorICAgICAgICAjaWYg UExBVEZPUk0oTUFDKSwgYmVmb3JlIGdldHRpbmcgbW9kaWZpZWQgdGhlIHdyb25nIHdheSBiZWZv cmUgbGFuZGluZy4gSW4gcHJhY3RpY2UsIHdlCisgICAgICAgIHdvdWxkIGhhdmUgb2Z0ZW4gcmVz dG9yZWQgdGhlIHNjcm9sbCBwb3NpdGlvbiBieSB0aGUgdGltZSB0aGUgbG9hZCBpcyBmaW5pc2hl ZCBzbyBpdCB3b3VsZAorICAgICAgICBub3QgY2F1c2UgYSBmbGFzaCBpbiBtb3N0IGNhc2VzLiBI b3dlcnZlciwgd2l0aCBQU09OIGVuYWJsZWQgYW5kIHRoZSBsYXllciB0cmVlIGZyZWV6aW5nIHdl CisgICAgICAgIGRvIG9uIHByb2Nlc3Mtc3dhcCwgdGhlIGZpcnN0IHBvc3Qtc2Nyb2xsIHJlc3Rv cmF0aW9uIGxheWVyIHRyZWUgY29tbWl0IG1heSBub3cgb2NjdXIgYQorICAgICAgICBsaXR0bGUg Yml0IGxhdGVyIGFuZCB3ZSB3b3VsZCBsb3NlIHRoZSByYWNlIG1vcmUgb2Z0ZW4uCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgV2hlbiBhZGRpbmcgUGFnZUNhY2hlIHN1cHBv cnQgdG8gUFNPTiwgd2UgdXNlZCB0byBuYXZpZ2F0ZSB0aGUgInN1c3BlbmRlZCIgcGFnZSB0bwor ICAgICAgICBhYm91dDpibGFuay4gVGhpcyB3b3VsZCBsZWFkIHRvIHVud2FudGVkIFdlYlByb2Nl c3NQcm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKCkKKyAgICAgICAgY2FsbHMgZnJvbSB0aGUg V2ViUHJvY2VzcyB3aGljaCB3ZSB3YW50ZWQgdG8gaWdub3JlLiBXZSB0aHVzIGFkZGVkIGxvZ2lj IHRvIGlnbm9yZQorICAgICAgICB1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oKSBJUEMgZnJvbSB0aGUg b2xkIFdlYlByb2Nlc3MgYWZ0ZXIgYSBzd2FwLiBUaGUgaXNzdWUgd2l0aCB0aGlzCisgICAgICAg IGlzIHRoYXQgd2Ugc29tZXRpbWVzIG1pc3MvaWdub3JlIGxlZ2l0IHVwZGF0ZXMgdG8gdGhlIEhp c3RvcnlJdGVtIGZyb20gdGhlIG9sZCBwcm9jZXNzLAorICAgICAgICBpbiBwYXJ0aWN1bGFyIHdp dGggcmVnYXJkcyB0byB0aGUgc2Nyb2xsIHBvc2l0aW9uIGFuZCB0aGUgcGFnZVNjYWxlRmFjdG9y LiBTbyBpZiB5b3UKKyAgICAgICAgc3dpcGVkIGFuZCB0aGVuIHF1aWNrbHkgZW5vdWdoIGRpZCBh IGNyb3NzLXNpdGUgbmF2aWdhdGlvbiwgdGhlIFVJUHJvY2VzcycKKyAgICAgICAgV2ViQmFja0Zv cndhcmRMaXN0IHdvdWxkIG5vdCBnZXQgdXBkYXRlZCB3aXRoIHRoZSBsYXRlc3Qgc2Nyb2xsIHBv c2l0aW9uIGFuZCB3ZSB3b3VsZAorICAgICAgICB0aHVzIGZhaWwgdG8gcmVzdG9yZSBpdCBsYXRl ciBvbi4gVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHdlIG5vdyBzdG9wIGlnbm9yaW5nIHVwZGF0ZXMK KyAgICAgICAgZnJvbSB0aGUgb2xkIFdlYlByb2Nlc3MgYWZ0ZXIgYSBzd2FwLiBUaGlzIGxvZ2lj IGlzIG5vIGxvbmdlciBuZWVkZWQgc2luY2Ugd2Ugbm8gbG9uZ2VyCisgICAgICAgIG5hdmlnYXRl IHRoZSBvbGQgcGFnZSB0byBhYm91dDpibGFuayBhZnRlciBhIHN3YXAsIHdlIG1lcmVseSBzdXNw ZW5kIGl0ICJpbiBwbGFjZSIuCisKIDIwMTktMDEtMTYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIG5ldyBTUEkgZm9yIGNvbnRyb2xsaW5nIGdldFVz ZXJNZWRpYQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lvblN0YXRlLmNw cCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1Nlc3Npb25TdGF0ZS5jcHAKaW5kZXggYjZjNDIwOTg5 NzhhOGFhZDA4OTk1ODUxMDEwZGU0ODJiNDJkZjc0Mi4uNTM4YzAyMjg0NTMxMzc0MzI0MTg2ZjIz NGM4M2I1YTNhN2NhYThiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lv blN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9TZXNzaW9uU3RhdGUuY3BwCkBA IC0xMjgsNiArMTI4LDcgQEAgdm9pZCBGcmFtZVN0YXRlOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBl bmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgbWluaW11bUxheW91dFNpemVJblNjcm9sbFZp ZXdDb29yZGluYXRlczsKICAgICBlbmNvZGVyIDw8IGNvbnRlbnRTaXplOwogICAgIGVuY29kZXIg PDwgc2NhbGVJc0luaXRpYWw7CisgICAgZW5jb2RlciA8PCBvYnNjdXJlZEluc2V0czsKICNlbmRp ZgogCiAgICAgZW5jb2RlciA8PCBjaGlsZHJlbjsKQEAgLTE3Niw2ICsxNzcsOCBAQCBPcHRpb25h bDxGcmFtZVN0YXRlPiBGcmFtZVN0YXRlOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQog ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVz dWx0LnNjYWxlSXNJbml0aWFsKSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKyAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5vYnNjdXJlZEluc2V0cykpCisgICAgICAgIHJldHVy biBXVEY6Om51bGxvcHQ7CiAjZW5kaWYKIAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0 LmNoaWxkcmVuKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1Nlc3Npb25TdGF0 ZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lvblN0YXRlLmgKaW5kZXggZTdiZmJiNDY0 M2Y5ZTM5OGU1MmMxMjg2MmQ2MzRjYTk1MDQ3MmUyYy4uZDI2NzkxZGE5OWMzNmQyODRmZjJlN2Q1 MGNlMDgyNjc4ZDBmMDhiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lv blN0YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvU2Vzc2lvblN0YXRlLmgKQEAgLTEx MCw2ICsxMTAsNyBAQCBzdHJ1Y3QgRnJhbWVTdGF0ZSB7CiAgICAgV2ViQ29yZTo6RmxvYXRTaXpl IG1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXM7CiAgICAgV2ViQ29yZTo6 SW50U2l6ZSBjb250ZW50U2l6ZTsKICAgICBib29sIHNjYWxlSXNJbml0aWFsIHsgZmFsc2UgfTsK KyAgICBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCBvYnNjdXJlZEluc2V0czsKICNlbmRpZgogCiAg ICAgVmVjdG9yPEZyYW1lU3RhdGU+IGNoaWxkcmVuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5jcHAKaW5kZXggZDRmYWE5 M2UzZDkxM2NhZWZjNDBjYTE3ZmU4YWI0YjkzM2JlNjZiNS4uMGZmZmQ5YTQ1NzQ0MjZmNGVkYTk2 MzgyYWM3OGEyZjY5MDg4MDVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuY3BwCkBAIC0xOTMsMTcgKzE5Myw2IEBA IHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRSZWFjaE1haW5GcmFtZUxvYWRUZXJtaW5h bFN0YXRlKCkKICAgICAvLyBlbm91Z2ggZm9yIHVzIHRvby4KICAgICBtX3NuYXBzaG90UmVtb3Zh bFRyYWNrZXIuY2FuY2VsT3V0c3RhbmRpbmdFdmVudChTbmFwc2hvdFJlbW92YWxUcmFja2VyOjpW aXN1YWxseU5vbkVtcHR5TGF5b3V0KTsKIAotICAgIC8vIFdpdGggV2ViLXByb2Nlc3Mgc2Nyb2xs aW5nLCB3ZSBjaGVjayBpZiB0aGUgc2Nyb2xsIHBvc2l0aW9uIHJlc3RvcmF0aW9uIHN1Y2NlZWRl ZCBieSBjb21wYXJpbmcgdGhlCi0gICAgLy8gcmVxdWVzdGVkIGFuZCBhY3R1YWwgc2Nyb2xsIHBv c2l0aW9uLiBJdCdzIHBvc3NpYmxlIHRoYXQgd2Ugd2lsbCBuZXZlciBzdWNjZWVkIGluIHJlc3Rv cmluZwotICAgIC8vIHRoZSBleGFjdCBzY3JvbGwgcG9zaXRpb24gd2Ugd2FudGVkLCBpbiB0aGUg Y2FzZSBvZiBhIGR5bmFtaWMgcGFnZSwgYnV0IHdlIGtub3cgdGhhdCBieQotICAgIC8vIG1haW4g ZnJhbWUgbG9hZCB0aW1lIHRoYXQgd2UndmUgZ290dGVuIGFzIGNsb3NlIGFzIHdlJ3JlIGdvaW5n IHRvIGdldCwgc28gc3RvcCB3YWl0aW5nLgotICAgIC8vIFdlIGRvbid0IHdhbnQgdG8gZG8gdGhp cyB3aXRoIFVJLXNpZGUgc2Nyb2xsaW5nIGJlY2F1c2Ugc2Nyb2xsIHBvc2l0aW9uIHJlc3RvcmF0 aW9uIGlzIGJha2VkIGludG8gdGhlIHRyYW5zYWN0aW9uLgotICAgIC8vIEZJWE1FOiBJdCBzZWVt cyBmYWlybHkgZGlydHkgdG8gdHlwZS1jaGVjayB0aGUgRHJhd2luZ0FyZWEgbGlrZSB0aGlzLgot ICAgIGlmIChhdXRvIGRyYXdpbmdBcmVhID0gbV93ZWJQYWdlUHJveHkuZHJhd2luZ0FyZWEoKSkg ewotICAgICAgICBpZiAoaXM8UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eT4oZHJhd2lu Z0FyZWEpKQotICAgICAgICAgICAgbV9zbmFwc2hvdFJlbW92YWxUcmFja2VyLmNhbmNlbE91dHN0 YW5kaW5nRXZlbnQoU25hcHNob3RSZW1vdmFsVHJhY2tlcjo6U2Nyb2xsUG9zaXRpb25SZXN0b3Jh dGlvbik7Ci0gICAgfQotCiAgICAgY2hlY2tGb3JBY3RpdmVMb2FkcygpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCA2YmU5ZGMzOTllMDE0 ODhkYTY3OGZiNDU2OGVmMzZiMjFmM2M0ODc2Li4xYjNmODBjMTc4M2Q0NzQwNzJjMjczMmRjMjM5 YWIxN2YzMmRlMjAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAKQEAgLTU4NSwyNSArNTg1LDEwIEBAIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpmdWxsS2V5 Ym9hcmRBY2Nlc3NFbmFibGVkKCkKIH0KICNlbmRpZgogCi1ib29sIFdlYlByb2Nlc3NQcm94eTo6 aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKHVpbnQ2NF90IHBhZ2VJRCkgY29uc3QKLXsKLSAgICBm b3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1fcHJvdmlzaW9uYWxQYWdlcykgewotICAgICAg ICBpZiAocHJvdmlzaW9uYWxQYWdlLT5wYWdlKCkucGFnZUlEKCkgPT0gcGFnZUlEKQotICAgICAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogdm9pZCBX ZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbShjb25zdCBCYWNrRm9yd2FyZExp c3RJdGVtU3RhdGUmIGl0ZW1TdGF0ZSkKIHsKLSAgICBpZiAoYXV0byogaXRlbSA9IFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW06Oml0ZW1Gb3JJRChpdGVtU3RhdGUuaWRlbnRpZmllcikpIHsKLSAgICAg ICAgLy8gVGhpcyB1cGRhdGUgY291bGQgYmUgY29taW5nIGZyb20gYSB3ZWIgcHJvY2VzcyB0aGF0 IGlzIG5vdCB0aGUgYWN0aXZlIHByb2Nlc3MgZm9yCi0gICAgICAgIC8vIHRoZSBiYWNrL2Zvcndh cmQgaXRlbXMgcGFnZS4KLSAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5h dmlnYXRpbmcgdG8gYWJvdXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCi0gICAgICAgIC8vIFdlIGln bm9yZSB0aGVzZSB1cGRhdGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0t PnBhZ2VJRCgpKSB8fCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQoaXRlbS0+cGFnZUlEKCkpKQot ICAgICAgICAgICAgaXRlbS0+c2V0UGFnZVN0YXRlKGl0ZW1TdGF0ZS5wYWdlU3RhdGUpOwotICAg IH0KKyAgICBpZiAoYXV0byogaXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06Oml0ZW1Gb3JJ RChpdGVtU3RhdGUuaWRlbnRpZmllcikpCisgICAgICAgIGl0ZW0tPnNldFBhZ2VTdGF0ZShpdGVt U3RhdGUucGFnZVN0YXRlKTsKIH0KIAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAppbmRleCA1MDQyNjMwZGUz NzFkODVhODI4Mzc0MzQ4YWE5NjkxNzM5YzljZDcwLi5mZjllNTJjYzMxZjBmODA4YTNmMDNkNmMx Y2M5YjBjNzgzZjIxNzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuaApAQCAtMzM0LDggKzMzNCw2IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvZ0RpYWdub3N0 aWNNZXNzYWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9uKGNvbnN0IFN0cmluZyYgbGltaXRL ZXkpOwogCi0gICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlE KSBjb25zdDsKLQogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsgTm8sIFllcyB9OwogICAgIHRlbXBs YXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0ciB7CiAgICAgcHVibGljOgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nlc3Npb25T dGF0ZUNvbnZlcnNpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1Nlc3Npb25TdGF0ZUNvbnZlcnNpb24uY3BwCmluZGV4IDQwMGQ4MzI1ZWRlZTU3YzhmNDVj NjY4ZjU5MWYzZWVmMGRkMWYxN2MuLjYzYzM2YTNkYjY5YTgyYWQzYmVhNjYwZjZiMDZkZmU3NjNj NTU2MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9TZXNzaW9uU3RhdGVDb252ZXJzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvU2Vzc2lvblN0YXRlQ29udmVyc2lvbi5jcHAKQEAgLTk2LDYgKzk2 LDcgQEAgc3RhdGljIEZyYW1lU3RhdGUgdG9GcmFtZVN0YXRlKGNvbnN0IEhpc3RvcnlJdGVtJiBo aXN0b3J5SXRlbSkKICAgICBmcmFtZVN0YXRlLm1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3 Q29vcmRpbmF0ZXMgPSBoaXN0b3J5SXRlbS5taW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nv b3JkaW5hdGVzKCk7CiAgICAgZnJhbWVTdGF0ZS5jb250ZW50U2l6ZSA9IGhpc3RvcnlJdGVtLmNv bnRlbnRTaXplKCk7CiAgICAgZnJhbWVTdGF0ZS5zY2FsZUlzSW5pdGlhbCA9IGhpc3RvcnlJdGVt LnNjYWxlSXNJbml0aWFsKCk7CisgICAgZnJhbWVTdGF0ZS5vYnNjdXJlZEluc2V0cyA9IGhpc3Rv cnlJdGVtLm9ic2N1cmVkSW5zZXRzKCk7CiAjZW5kaWYKIAogICAgIGZvciAoYXV0byYgY2hpbGRI aXN0b3J5SXRlbSA6IGhpc3RvcnlJdGVtLmNoaWxkcmVuKCkpIHsKQEAgLTE3Myw2ICsxNzQsNyBA QCBzdGF0aWMgdm9pZCBhcHBseUZyYW1lU3RhdGUoSGlzdG9yeUl0ZW0mIGhpc3RvcnlJdGVtLCBj b25zdCBGcmFtZVN0YXRlJiBmcmFtZVN0YQogICAgIGhpc3RvcnlJdGVtLnNldE1pbmltdW1MYXlv dXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMoZnJhbWVTdGF0ZS5taW5pbXVtTGF5b3V0U2l6 ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKTsKICAgICBoaXN0b3J5SXRlbS5zZXRDb250ZW50U2l6 ZShmcmFtZVN0YXRlLmNvbnRlbnRTaXplKTsKICAgICBoaXN0b3J5SXRlbS5zZXRTY2FsZUlzSW5p dGlhbChmcmFtZVN0YXRlLnNjYWxlSXNJbml0aWFsKTsKKyAgICBoaXN0b3J5SXRlbS5zZXRPYnNj dXJlZEluc2V0cyhmcmFtZVN0YXRlLm9ic2N1cmVkSW5zZXRzKTsKICNlbmRpZgogCiAgICAgZm9y IChjb25zdCBhdXRvJiBjaGlsZEZyYW1lU3RhdGUgOiBmcmFtZVN0YXRlLmNoaWxkcmVuKSB7CmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJiZTRj MWRjMTQ4YzYwYjk2N2QxODJmODRkMzZhNzkxYTg4YmQ5MS4uZDNmN2VkYzc0NWFmOTg4ZTBmZTg3 NmU4MzYzY2VmOGM0Yjg1YTg0NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTAxLTE4ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBTY3JvbGwgcG9z aXRpb24gaXMgbm90IGFsd2F5cyByZXN0b3JlZCBwcm9wZXJseSB3aGVuIG5hdmlnYXRpbmcgYmFj aworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNTc4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzM4NjMzMT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIHRlc3QgY292ZXJhZ2UuCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZp Z2F0aW9uLm1tOgorCiAyMDE5LTAxLTE3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0xGQ11bQkZDXSBBbiBlbGVtZW50IHdpdGggdHJhbnNmb3JtIGlzIGEgY29u dGFpbmluZyBibG9jayBmb3IgcG9zaXRpb25lZCBkZXNjZW5kYW50cy4KZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRp b24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2Fw T25OYXZpZ2F0aW9uLm1tCmluZGV4IDE3YzNlMjJlYzdiM2MxNGIyZWYwN2EzY2E1NDVhZDU3MDkw YmUyMDUuLmFmYTI5YzZhNzEyZjA3YzgzYjkxNGI4MGEwOGM0Y2U2ZjA5Mzc1ZWMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5h dmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Q cm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtMzg0Niw2ICszODQ2LDc4IEBAIFRFU1QoUHJv Y2Vzc1N3YXAsIEdvQmFja1RvU3VzcGVuZGVkUGFnZVdpdGhNYWluRnJhbWVJRFRoYXRJc05vdE9u ZSkKICAgICBFWFBFQ1RfRVEocGlkMSwgcGlkNSk7CiB9CiAKK3N0YXRpYyBjb25zdCBjaGFyKiB0 YWxsUGFnZUJ5dGVzID0gUiJQU09OUkVTT1VSQ0UoCis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGhlYWQ+Cis8bWV0YSBuYW1lPSd2aWV3cG9ydCcgY29udGVudD0nd2lkdGg9ZGV2aWNlLXdpZHRo LCBpbml0aWFsLXNjYWxlPTEnPgorPHN0eWxlPgorYm9keSB7CisgICAgbWFyZ2luOiAwOworICAg IHdpZHRoOiAxMDAlOworICAgIGhlaWdodDogMTAwMDBweDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+ Cis8Ym9keT4KKzxhIGlkPSJ0ZXN0TGluayIgaHJlZj0icHNvbjovL3d3dy5hcHBsZS5jb20vbWFp bi5odG1sIj5UZXN0PC9hPgorPC9ib2R5PgorPC9odG1sPgorKVBTT05SRVNPVVJDRSI7CisKK1RF U1QoUHJvY2Vzc1N3YXAsIFNjcm9sbFBvc2l0aW9uUmVzdG9yYXRpb24pCit7CisgICAgYXV0byBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBzZXRQ cm9jZXNzU3dhcHNPbk5hdmlnYXRpb246WUVTXTsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRv cHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0 aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAg ICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCld OworICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7 CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtp dC5vcmcvbWFpbi5odG1sIiB0b0RhdGE6dGFsbFBhZ2VCeXRlc107CisgICAgW3dlYlZpZXdDb25m aWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6 QCJQU09OIl07CisKKyAgICBbW3dlYlZpZXdDb25maWd1cmF0aW9uIHByZWZlcmVuY2VzXSBfc2V0 VXNlc1BhZ2VDYWNoZTpOT107CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZp Z3VyYXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIGRlbGVnYXRl ID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBb d2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNV UkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwg VVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXV07CisgICAg W3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6 cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBbd2ViVmlldyBldmFsdWF0ZUph dmFTY3JpcHQ6QCJzY3JvbGwoMCwgNTAwMCkiIGNvbXBsZXRpb25IYW5kbGVyOiBbJl0gKGlkIHJl c3VsdCwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07Cisg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisK KyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5jbGljaygpIiBjb21w bGV0aW9uSGFuZGxlcjogbmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9u ZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0 OkAid2luZG93LnNjcm9sbFkiIGNvbXBsZXRpb25IYW5kbGVyOiBbJl0gKGlkIHJlc3VsdCwgTlNF cnJvciAqZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX0VRKDAsIFtyZXN1bHQgaW50ZWdlclZhbHVl XSk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgW3dlYlZpZXcgZ29CYWNr XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxz ZTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAIndpbmRvdy5zY3JvbGxZIiBj b21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCByZXN1bHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAg ICAgIEVYUEVDVF9FUSg1MDAwLCBbcmVzdWx0IGludGVnZXJWYWx1ZV0pOworICAgICAgICBkb25l ID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwor ICAgIGRvbmUgPSBmYWxzZTsKK30KKwogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAogI2VuZGlm IC8vIFdLX0FQSV9FTkFCTEVECg==