205087 2019-12-10 14:59:58 -0800 [macOS] Issue load sooner on swipe back/forward navigation 2019-12-11 10:51:33 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 205127 1 cdumez cdumez achristensen commit-queue ggaren simon.fraser thorton webkit-bug-importer oldest_to_newest 1597361 0 cdumez 2019-12-10 14:59:58 -0800 Issue load sooner on swipe back/forward navigation on macOS. We currently wait until the end of the swipe animation to issue the load but we should be able to start loading as soon as the user lifts the finger and thus commits to navigating. This will improve perceived performance on swipe back/forward navigation. 1597376 1 385310 cdumez 2019-12-10 15:12:45 -0800 Created attachment 385310 Patch 1597377 2 cdumez 2019-12-10 15:14:43 -0800 <rdar://problem/57809587> 1597381 3 385310 thorton 2019-12-10 15:16:46 -0800 Comment on attachment 385310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385310&action=review > Source/WebKit/UIProcess/ProvisionalPageProxy.cpp:148 > + if (m_page.isLayerTreeFrozenDueToSwipeAnimation()) > + send(Messages::WebPage::FreezeLayerTreeDueToSwipeAnimation()); Should we just stuff this in the creation parameters? Then there's no race. 1597393 4 385310 cdumez 2019-12-10 15:44:47 -0800 Comment on attachment 385310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385310&action=review >> Source/WebKit/UIProcess/ProvisionalPageProxy.cpp:148 >> + send(Messages::WebPage::FreezeLayerTreeDueToSwipeAnimation()); > > Should we just stuff this in the creation parameters? Then there's no race. We need a separate IPC for the non-PSON case anyway. I do not think this is racy here because we're process-swapping here and the tree will already be be frozen with ProcessSwap reason until WebPage::didCompletePageTransition() is called. As long as I sent the FreezeLayerTreeDueToSwipeAnimation IPC before the IPC triggering the load, I do not think there is a race. 1597471 5 385310 commit-queue 2019-12-10 18:16:26 -0800 Comment on attachment 385310 Patch Clearing flags on attachment: 385310 Committed r253360: <https://trac.webkit.org/changeset/253360> 1597472 6 commit-queue 2019-12-10 18:16:28 -0800 All reviewed patches have been landed. Closing bug. 385310 2019-12-10 15:12:45 -0800 2019-12-10 18:16:26 -0800 Patch bug-205087-20191210151219.patch text/plain 14338 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZiM2NlMTAwOWIzMmM2MzQz M2VlZWQ2M2JhNjJkMjljNDA5ZGMzZWMuLmQ1YzUxMzczYjIyZDJhY2NjMjMzMmFkYWY2NDAyYTg4 Y2ZkOTZlYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTEgQEAKKzIwMTktMTItMTAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIGxvYWQgc29v bmVyIG9uIHN3aXBlIGJhY2svZm9yd2FyZCBuYXZpZ2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUwODcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJc3N1ZSBsb2FkIHNvb25lciBvbiBzd2lwZSBi YWNrL2ZvcndhcmQgbmF2aWdhdGlvbiBvbiBtYWNPUy4gV2Ugd2VyZSB3YWl0aW5nIHVudGlsIHRo ZSBlbmQgb2YKKyAgICAgICAgdGhlIHN3aXBlIGFuaW1hdGlvbiB0byBpc3N1ZSB0aGUgbG9hZC4g V2Ugbm93IGlzc3VlIHRoZSBsb2FkIGFzIHNvb24gYXMgdGhlIHVzZXIgbGlmdHMgdGhlIGZpbmdl cgorICAgICAgICBvZmYgdGhlIHNjcmVlbiBhbmQgdGh1cyBjb21taXRzIHRvIG5hdmlnYXRpbmcu IFRoaXMgcmVzdWx0cyBpbiBpbXByb3ZlZCBwZXJjZWl2ZWQgcGVyZm9ybWFuY2UKKyAgICAgICAg d2hlbiBzd2lwaW5nIGJhY2svZm9yd2FyZCB0byBuYXZpZ2F0ZS4KKworICAgICAgICBUaGlzIHBh dGNoIGRvZXMgbm90IHRha2UgY2FyZSBvZiBpT1MgYmVjYXVzZSB0aGUgVmlld0dlc3R1cmVDb250 cm9sbGVyIGxvZ2ljIGlzIGRpZmZlcmVudCBvbiB0aGF0CisgICAgICAgIHBsYXRmb3JtLiBUaGVy ZSBpcyBubyByZWFzb24gd2Ugc2hvdWxkbid0IGJlIGFibGUgdG8gZG8gdGhlIHNhbWUgb3B0aW1p emF0aW9uIG9uIGlPUyB0b28gdGhvdWdoLgorCisgICAgICAgIFRvIGFjaGlldmUgdGhlIGJlaGF2 aW9yIGNoYW5nZSBvbiBtYWNPUywgdGhlIGZvbGxvd2luZyB3YXMgZG9uZToKKyAgICAgICAgLSBJ c3N1ZSB0aGUgbG9hZCBpbiBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OndpbGxFbmRTd2lwZUdlc3R1 cmUoKSBpbnN0ZWFkIG9mCisgICAgICAgICAgVmlld0dlc3R1cmVDb250cm9sbGVyOjplbmRTd2lw ZUdlc3R1cmUoKS4KKyAgICAgICAgLSBBZGQgYSBuZXcgU25hcHNob3RSZW1vdmFsVHJhY2tlcjo6 RXZlbnQ6OlN3aXBlQW5pbWF0aW9uRW5kIGV2ZW50IGFuZCB3YWl0IGZvciB0aGlzIGV2ZW50IGJl Zm9yZQorICAgICAgICAgIHRha2luZyBhd2F5IHRoZSBzbmFwc2hvdC4gVGhpcyBtYWtlcyBzdXJl IHdlIGRvIG5vdCB0YWtlIGF3YXkgdGhlIHN3aXBlIHNuYXBzaG90IHVudGlsIHRoZSBzd2lwZQor ICAgICAgICAgIGFuaW1hdGlvbiBpcyBhY3R1YWxseSBvdmVyIChub3cgdGhhdCB3ZSBzdGFydCB0 aGUgbmF2aWdhdGlvbiBkdXJpbmcgdGhlIGFuaW1hdGlvbiwgaW5zdGVhZCBvZgorICAgICAgICAg IGFmdGVyKS4KKyAgICAgICAgLSBUbyBtYWtlIHN1cmUgdGhhdCBsYXllciBiZWluZyBzd2lwZWQg YXdheSBzdGF5cyB0aGUgc2FtZSB1bnRpbCB0aGUgZW5kIG9mIHRoZSBhbmltYXRpb24sIEkgYWRk ZWQKKyAgICAgICAgICBhIG5ldyBTd2lwZUFuaW1hdGlvbiByZWFzb24gZm9yIGZyZWV6aW5nIHRo ZSBsYXllciB0cmVlLiBBdCB0aGUgYmVnaW5uaW5nIG9mIHRoZSBhbmltYXRpb24sIHRoZQorICAg ICAgICAgIFVJUHJvY2VzcyBzZW5kcyBhIEZyZWV6ZUxheWVyVHJlZUR1ZVRvU3dpcGVBbmltYXRp b24gSVBDIHRvIHRoZSBXZWJQcm9jZXNzIHRvIGFkZCB0aGlzIGxheWVyIHRyZWUKKyAgICAgICAg ICBmcmVlemUgcmVhc29uLiBBdCB0aGUgZW5kIG9mIHRoZSBhbmltYXRpb24sIHRoZSBVSVByb2Nl c3Mgc2VuZHMgdGhlIFVuZnJlZXplTGF5ZXJUcmVlRHVlVG9Td2lwZUFuaW1hdGlvbgorICAgICAg ICAgIElQQyB0byByZW1vdmUgdGhpcyBmcmVlemUgcmVhc29uLiBXaXRob3V0IHRoaXMgY2hhbmdl LCB0aGUgbGF5ZXIgYmVpbmcgc3dpcGVkIGF3YXkgd291bGQgc29tZXRpbWVzCisgICAgICAgICAg c3RhcnQgc2hvd2luZyB0aGUgZGVzdGluYXRpb24gc2l0ZSBiZWluZyBsb2FkZWQgYmVmb3JlIHRo ZSBlbmQgb2YgdGhlIGFuaW1hdGlvbi4gT24gY3Jvc3MtcHJvY2VzcworICAgICAgICAgIG5hdmln YXRpb24sIG5vdCBmcmVlemluZyB0aGUgbGF5ZXIgdHJlZSB3b3VsZCBjYXVzZSB0aGUgc3dpcGUg YW5pbWF0aW9uIHRvIGdldCBpbnRlcnJ1cHRlZCB3aGVuCisgICAgICAgICAgd2UgaGF2ZSBzb21l dGhpbmcgdG8gcGFpbnQgaW4gdGhlIG5ldyBwcm9jZXNzIGJlZm9yZSB0aGUgZW5kIG9mIHRoZSBz d2lwZSBhbmltYXRpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6aW5pdGlhbGl6 ZVdlYlBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlNuYXBzaG90UmVtb3Zh bFRyYWNrZXI6OmV2ZW50c0Rlc2NyaXB0aW9uKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1 cmVDb250cm9sbGVyOjp3aWxsRW5kU3dpcGVHZXN0dXJlKToKKyAgICAgICAgKFdlYktpdDo6Vmll d0dlc3R1cmVDb250cm9sbGVyOjplbmRTd2lwZUdlc3R1cmUpOgorICAgICAgICAqIFVJUHJvY2Vz cy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpjb21taXRQcm92aXNpb25h bFBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5Ojppc0xheWVyVHJlZUZyb3plbkR1ZVRvU3dpcGVBbmltYXRpb24g Y29uc3QpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6ZnJlZXplTGF5ZXJUcmVlRHVlVG9Td2lwZUFuaW1hdGlvbik6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVuZnJlZXplTGF5ZXJUcmVlRHVlVG9Td2lwZUFu aW1hdGlvbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwogMjAxOS0xMi0x MCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIExldmVyYWdlIHRo ZSBmYWN0IHRoYXQgV2ViUGFnZVByb3h5IHN1YmNsYXNzZXMgSVBDOjpNZXNzYWdlU2VuZGVyIHRv IHNpbXBsaWZ5IElQQyBzZW5kaW5nIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcAppbmRleCA4YzFhZjI2ZmVjOTNlNjQ3MjIyNTZjZDU3 NWQzZGIyMDc2YWJjYjEzLi43N2NmZTg3NzU5MjQ5NzE1Y2MwYjYxMDAyNWMxODQ5OTI1MmY4YjNm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHku Y3BwCkBAIC0xNDMsNiArMTQzLDkgQEAgdm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6aW5pdGlh bGl6ZVdlYlBhZ2UoKQogICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCA9IHRydWU7CiAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fd2Vi UGFnZUlELCBwYXJhbWV0ZXJzKSwgMCk7CiAgICAgbV9wcm9jZXNzLT5hZGRWaXNpdGVkTGlua1N0 b3JlVXNlcihtX3BhZ2UudmlzaXRlZExpbmtTdG9yZSgpLCBtX3BhZ2UuaWRlbnRpZmllcigpKTsK KworICAgIGlmIChtX3BhZ2UuaXNMYXllclRyZWVGcm96ZW5EdWVUb1N3aXBlQW5pbWF0aW9uKCkp CisgICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkZyZWV6ZUxheWVyVHJlZUR1ZVRvU3dp cGVBbmltYXRpb24oKSk7CiB9CiAKIHZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmxvYWREYXRh KEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBk YXRhLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25z dCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0 ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcAppbmRleCAxOWY1OGYwYTk2YTYyZmJh NjczNTIwNDA2ODIyZGE2YzI3YmIwNjQ1Li41NzRhYmE5ZTUxY2I0NzA4NmQ5YzNhNjAxN2E1NWQx MTcyZWE5YzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3R2VzdHVy ZUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdHZXN0dXJl Q29udHJvbGxlci5jcHAKQEAgLTI3OCw2ICsyNzgsOSBAQCBTdHJpbmcgVmlld0dlc3R1cmVDb250 cm9sbGVyOjpTbmFwc2hvdFJlbW92YWxUcmFja2VyOjpldmVudHNEZXNjcmlwdGlvbihFdmVudHMg ZQogICAgIGlmIChldmVudCAmIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6U25hcHNob3RSZW1vdmFs VHJhY2tlcjo6U2Nyb2xsUG9zaXRpb25SZXN0b3JhdGlvbikKICAgICAgICAgZGVzY3JpcHRpb24u YXBwZW5kKCJTY3JvbGxQb3NpdGlvblJlc3RvcmF0aW9uICIpOwogCisgICAgaWYgKGV2ZW50ICYg Vmlld0dlc3R1cmVDb250cm9sbGVyOjpTbmFwc2hvdFJlbW92YWxUcmFja2VyOjpTd2lwZUFuaW1h dGlvbkVuZCkKKyAgICAgICAgZGVzY3JpcHRpb24uYXBwZW5kKCJTd2lwZUFuaW1hdGlvbkVuZCAi KTsKKwogICAgIHJldHVybiBkZXNjcmlwdGlvbi50b1N0cmluZygpOwogfQogCkBAIC01NTMsMzQg KzU1NiwyMCBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6Zm9yY2VSZXBhaW50SWZOZWVk ZWQoKQogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OndpbGxFbmRTd2lwZUdlc3R1cmUoV2Vi QmFja0ZvcndhcmRMaXN0SXRlbSYgdGFyZ2V0SXRlbSwgYm9vbCBjYW5jZWxsZWQpCiB7CiAgICAg bV93ZWJQYWdlUHJveHkubmF2aWdhdGlvbkdlc3R1cmVXaWxsRW5kKCFjYW5jZWxsZWQsIHRhcmdl dEl0ZW0pOwotfQotCi12b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJl KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0sIGJvb2wgY2FuY2VsbGVkKQotewot ICAgIEFTU0VSVChtX2FjdGl2ZUdlc3R1cmVUeXBlID09IFZpZXdHZXN0dXJlVHlwZTo6U3dpcGUp OwotICAgIEFTU0VSVCh0YXJnZXRJdGVtKTsKLQotI2lmIFBMQVRGT1JNKE1BQykKLSAgICBtX3N3 aXBlQ2FuY2VsbGF0aW9uVHJhY2tlciA9IG51bGxwdHI7Ci0jZW5kaWYKIAotICAgIGlmIChjYW5j ZWxsZWQpIHsKLSAgICAgICAgcmVtb3ZlU3dpcGVTbmFwc2hvdCgpOwotICAgICAgICBtX3dlYlBh Z2VQcm94eS5uYXZpZ2F0aW9uR2VzdHVyZURpZEVuZChmYWxzZSwgKnRhcmdldEl0ZW0pOworICAg IGlmIChjYW5jZWxsZWQpCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAgICB1aW50NjRfdCBy ZW5kZXJUcmVlU2l6ZSA9IDA7Ci0gICAgaWYgKFZpZXdTbmFwc2hvdCogc25hcHNob3QgPSB0YXJn ZXRJdGVtLT5zbmFwc2hvdCgpKQorICAgIGlmIChWaWV3U25hcHNob3QqIHNuYXBzaG90ID0gdGFy Z2V0SXRlbS5zbmFwc2hvdCgpKQogICAgICAgICByZW5kZXJUcmVlU2l6ZSA9IHNuYXBzaG90LT5y ZW5kZXJUcmVlU2l6ZSgpOwogICAgIGF1dG8gcmVuZGVyVHJlZVNpemVUaHJlc2hvbGQgPSByZW5k ZXJUcmVlU2l6ZSAqIHN3aXBlU25hcHNob3RSZW1vdmFsUmVuZGVyVHJlZVNpemVUYXJnZXRGcmFj dGlvbjsKIAotICAgIG1fd2ViUGFnZVByb3h5Lm5hdmlnYXRpb25HZXN0dXJlRGlkRW5kKHRydWUs ICp0YXJnZXRJdGVtKTsKLSAgICBtX3dlYlBhZ2VQcm94eS5nb1RvQmFja0ZvcndhcmRJdGVtKCp0 YXJnZXRJdGVtKTsKKyAgICBtX3dlYlBhZ2VQcm94eS5nb1RvQmFja0ZvcndhcmRJdGVtKHRhcmdl dEl0ZW0pOwogCiAgICAgYXV0byogY3VycmVudEl0ZW0gPSBtX3dlYlBhZ2VQcm94eS5iYWNrRm9y d2FyZExpc3QoKS5jdXJyZW50SXRlbSgpOwogICAgIC8vIFRoZSBtYWluIGZyYW1lIHdpbGwgbm90 IGJlIG5hdmlnYXRlZCBzbyBoaWRlIHRoZSBzbmFwc2hvdCByaWdodCBhd2F5LgotICAgIGlmIChj dXJyZW50SXRlbSAmJiBjdXJyZW50SXRlbS0+aXRlbUlzQ2xvbmUoKnRhcmdldEl0ZW0pKSB7Cisg ICAgaWYgKGN1cnJlbnRJdGVtICYmIGN1cnJlbnRJdGVtLT5pdGVtSXNDbG9uZSh0YXJnZXRJdGVt KSkgewogICAgICAgICByZW1vdmVTd2lwZVNuYXBzaG90KCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CkBAIC01ODgsNyArNTc3LDggQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmVuZFN3 aXBlR2VzdHVyZShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiB0YXJnZXRJdGVtLAogICAgIFNuYXBz aG90UmVtb3ZhbFRyYWNrZXI6OkV2ZW50cyBkZXNpcmVkRXZlbnRzID0gU25hcHNob3RSZW1vdmFs VHJhY2tlcjo6VmlzdWFsbHlOb25FbXB0eUxheW91dAogICAgICAgICB8IFNuYXBzaG90UmVtb3Zh bFRyYWNrZXI6Ok1haW5GcmFtZUxvYWQKICAgICAgICAgfCBTbmFwc2hvdFJlbW92YWxUcmFja2Vy OjpTdWJyZXNvdXJjZUxvYWRzCi0gICAgICAgIHwgU25hcHNob3RSZW1vdmFsVHJhY2tlcjo6U2Ny b2xsUG9zaXRpb25SZXN0b3JhdGlvbjsKKyAgICAgICAgfCBTbmFwc2hvdFJlbW92YWxUcmFja2Vy OjpTY3JvbGxQb3NpdGlvblJlc3RvcmF0aW9uCisgICAgICAgIHwgU25hcHNob3RSZW1vdmFsVHJh Y2tlcjo6U3dpcGVBbmltYXRpb25FbmQ7CiAKICAgICBpZiAocmVuZGVyVHJlZVNpemVUaHJlc2hv bGQpIHsKICAgICAgICAgZGVzaXJlZEV2ZW50cyB8PSBTbmFwc2hvdFJlbW92YWxUcmFja2VyOjpS ZW5kZXJUcmVlU2l6ZVRocmVzaG9sZDsKQEAgLTYwMCwxMCArNTkwLDMwIEBAIHZvaWQgVmlld0dl c3R1cmVDb250cm9sbGVyOjplbmRTd2lwZUdlc3R1cmUoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSog dGFyZ2V0SXRlbSwKICAgICAvLyBGSVhNRTogTGlrZSBvbiBpT1MsIHdlIHNob3VsZCBlbnN1cmUg dGhhdCBldmVuIGlmIG9uZSBvZiB0aGUgdGltZW91dHMgZmlyZXMsCiAgICAgLy8gd2UgbmV2ZXIg c2hvdyB0aGUgb2xkIHBhZ2UgY29udGVudCwgaW5zdGVhZCBzaG93aW5nIHRoZSBzbmFwc2hvdCBi YWNrZ3JvdW5kIGNvbG9yLgogCi0gICAgaWYgKFZpZXdTbmFwc2hvdCogc25hcHNob3QgPSB0YXJn ZXRJdGVtLT5zbmFwc2hvdCgpKQorICAgIGlmIChWaWV3U25hcHNob3QqIHNuYXBzaG90ID0gdGFy Z2V0SXRlbS5zbmFwc2hvdCgpKQogICAgICAgICBtX2JhY2tncm91bmRDb2xvckZvckN1cnJlbnRT bmFwc2hvdCA9IHNuYXBzaG90LT5iYWNrZ3JvdW5kQ29sb3IoKTsKIH0KIAordm9pZCBWaWV3R2Vz dHVyZUNvbnRyb2xsZXI6OmVuZFN3aXBlR2VzdHVyZShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiB0 YXJnZXRJdGVtLCBib29sIGNhbmNlbGxlZCkKK3sKKyAgICBBU1NFUlQobV9hY3RpdmVHZXN0dXJl VHlwZSA9PSBWaWV3R2VzdHVyZVR5cGU6OlN3aXBlKTsKKyAgICBBU1NFUlQodGFyZ2V0SXRlbSk7 CisKKyNpZiBQTEFURk9STShNQUMpCisgICAgbV9zd2lwZUNhbmNlbGxhdGlvblRyYWNrZXIgPSBu dWxscHRyOworI2VuZGlmCisKKyAgICBpZiAoY2FuY2VsbGVkKSB7CisgICAgICAgIHJlbW92ZVN3 aXBlU25hcHNob3QoKTsKKyAgICAgICAgbV93ZWJQYWdlUHJveHkubmF2aWdhdGlvbkdlc3R1cmVE aWRFbmQoZmFsc2UsICp0YXJnZXRJdGVtKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IG1fd2ViUGFnZVByb3h5Lm5hdmlnYXRpb25HZXN0dXJlRGlkRW5kKHRydWUsICp0YXJnZXRJdGVt KTsKKworICAgIG1fc25hcHNob3RSZW1vdmFsVHJhY2tlci5ldmVudE9jY3VycmVkKFNuYXBzaG90 UmVtb3ZhbFRyYWNrZXI6OlN3aXBlQW5pbWF0aW9uRW5kKTsKK30KKwogdm9pZCBWaWV3R2VzdHVy ZUNvbnRyb2xsZXI6OnJlcXVlc3RSZW5kZXJUcmVlU2l6ZU5vdGlmaWNhdGlvbklmTmVlZGVkKCkK IHsKICAgICBpZiAoIW1fc25hcHNob3RSZW1vdmFsVHJhY2tlci5oYXNPdXRzdGFuZGluZ0V2ZW50 KFNuYXBzaG90UmVtb3ZhbFRyYWNrZXI6OlJlbmRlclRyZWVTaXplVGhyZXNob2xkKSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmgKaW5kZXggMGM4 NDkzYTdiMGI0OThhMDU3YzVjNjFhODE2ZmJhNmYzZWZlZWM2NS4uY2U0NDM0YzNiNmNmMzZmNzRl ZTZiNjUzOTk5NmVlNmQ1NWFhYmMyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Vmlld0dlc3R1cmVDb250cm9sbGVyLmgKQEAgLTE5NCw3ICsxOTQsOCBAQCBwcml2YXRlOgogICAg ICAgICAgICAgUmVwYWludEFmdGVyTmF2aWdhdGlvbiA9IDEgPDwgMiwKICAgICAgICAgICAgIE1h aW5GcmFtZUxvYWQgPSAxIDw8IDMsCiAgICAgICAgICAgICBTdWJyZXNvdXJjZUxvYWRzID0gMSA8 PCA0LAotICAgICAgICAgICAgU2Nyb2xsUG9zaXRpb25SZXN0b3JhdGlvbiA9IDEgPDwgNQorICAg ICAgICAgICAgU2Nyb2xsUG9zaXRpb25SZXN0b3JhdGlvbiA9IDEgPDwgNSwKKyAgICAgICAgICAg IFN3aXBlQW5pbWF0aW9uRW5kID0gMSA8PCA2CiAgICAgICAgIH07CiAgICAgICAgIHR5cGVkZWYg dWludDhfdCBFdmVudHM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CmluZGV4IDYyNzJhMDBiMjFkOWFmYjUyZDM3YWJhMWVjNWU4NzFiMjNiMDUyOTguLmRiMmNlMDc5 Y2FhNzc0OGFlMDQwNGUwODNjNjJlNTA0ZGY5ZjQwN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzEyMiw2ICszMTIyLDkgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgdWludDY0 X3QgbmF2aWcKICAgICAgICAgc2hvdWxkRGVsYXlDbG9zaW5nVW50aWxFbnRlcmluZ0FjY2VsZXJh dGVkQ29tcG9zaXRpbmdNb2RlID0gU2hvdWxkRGVsYXlDbG9zaW5nVW50aWxFbnRlcmluZ0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlOjpZZXM7CiAjZW5kaWYKIAorICAgIGlmIChtX2lzTGF5ZXJU cmVlRnJvemVuRHVlVG9Td2lwZUFuaW1hdGlvbikKKyAgICAgICAgc2VuZChNZXNzYWdlczo6V2Vi UGFnZTo6VW5mcmVlemVMYXllclRyZWVEdWVUb1N3aXBlQW5pbWF0aW9uKCkpOworCiAgICAgcHJv Y2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246Ok5hdmlnYXRpb25Td2Fw KTsKIAogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV93ZWJQYWdlSUQpOwpAQCAtODQxNyw2 ICs4NDIwLDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpuYXZpZ2F0aW9uR2VzdHVyZURpZEJlZ2lu KCkKIHZvaWQgV2ViUGFnZVByb3h5OjpuYXZpZ2F0aW9uR2VzdHVyZVdpbGxFbmQoYm9vbCB3aWxs TmF2aWdhdGUsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0pCiB7CiAgICAgUGFnZUNsaWVu dFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKKyAgICBpZiAod2lsbE5hdmlnYXRl KSB7CisgICAgICAgIG1faXNMYXllclRyZWVGcm96ZW5EdWVUb1N3aXBlQW5pbWF0aW9uID0gdHJ1 ZTsKKyAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RnJlZXplTGF5ZXJUcmVlRHVlVG9T d2lwZUFuaW1hdGlvbigpKTsKKyAgICB9CiAKICAgICBwYWdlQ2xpZW50KCkubmF2aWdhdGlvbkdl c3R1cmVXaWxsRW5kKHdpbGxOYXZpZ2F0ZSwgaXRlbSk7CiAKQEAgLTg0MzAsNiArODQzNywxMSBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6bmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQoYm9vbCB3aWxsTmF2 aWdhdGUsIFdlYkJhY2tGb3J3YXJkTGlzdAogICAgIHBhZ2VDbGllbnQoKS5uYXZpZ2F0aW9uR2Vz dHVyZURpZEVuZCh3aWxsTmF2aWdhdGUsIGl0ZW0pOwogCiAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50 LT5kaWRFbmROYXZpZ2F0aW9uR2VzdHVyZSgqdGhpcywgd2lsbE5hdmlnYXRlLCBpdGVtKTsKKwor ICAgIGlmIChtX2lzTGF5ZXJUcmVlRnJvemVuRHVlVG9Td2lwZUFuaW1hdGlvbikgeworICAgICAg ICBtX2lzTGF5ZXJUcmVlRnJvemVuRHVlVG9Td2lwZUFuaW1hdGlvbiA9IGZhbHNlOworICAgICAg ICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVbmZyZWV6ZUxheWVyVHJlZUR1ZVRvU3dpcGVBbmlt YXRpb24oKSk7CisgICAgfQogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6bmF2aWdhdGlvbkdlc3R1 cmVEaWRFbmQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA0YzQ5 ZTk0YWRiOTUwZGYzZGM5MjljNmVmYjcxZWU1NjBjOTJlNjc3Li5hZTM4NTIyMjFkNGE1MjQzNTUy YmEwMjNmMmY0OGI5NGVmN2I5OGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaApAQCAtMTI5MCw2ICsxMjkwLDggQEAgcHVibGljOgogICAgIHZvaWQgZW5kQ29sb3JQaWNr ZXIoKTsKICNlbmRpZgogCisgICAgYm9vbCBpc0xheWVyVHJlZUZyb3plbkR1ZVRvU3dpcGVBbmlt YXRpb24oKSBjb25zdCB7IHJldHVybiBtX2lzTGF5ZXJUcmVlRnJvemVuRHVlVG9Td2lwZUFuaW1h dGlvbjsgfQorCiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtaW5pbXVtU2l6ZUZvckF1dG9MYXlvdXQo KSBjb25zdCB7IHJldHVybiBtX21pbmltdW1TaXplRm9yQXV0b0xheW91dDsgfQogICAgIHZvaWQg c2V0TWluaW11bVNpemVGb3JBdXRvTGF5b3V0KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKIApA QCAtMjYzOSw2ICsyNjQxLDcgQEAgcHJpdmF0ZToKICAgICBDT01QdHI8SUQzRDExRGV2aWNlMT4g bV9kZXZpY2U7CiAjZW5kaWYKICAgICBib29sIG1faXNRdW90YUluY3JlYXNlRGVuaWVkIHsgZmFs c2UgfTsKKyAgICBib29sIG1faXNMYXllclRyZWVGcm96ZW5EdWVUb1N3aXBlQW5pbWF0aW9uIHsg ZmFsc2UgfTsKICAgICAKICAgICBTdHJpbmcgbV9vdmVycmlkZGVuTWVkaWFUeXBlOwogICAgICAg ICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXgg M2MyZmQxMmM1ODhhM2I3ZmJiNDAzZDc5NTM0NzBlNWI3YzJhNmMwYy4uNzM1ZmVhNGVlMTNiZTQy NWMyMzRiZTkyMTIwZmU5ZTdiY2EyZDVjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQ2NjUsNiArNDY2NSwxNiBAQCB2b2lkIFdlYlBhZ2U6 OmVmZmVjdGl2ZUFwcGVhcmFuY2VEaWRDaGFuZ2UoYm9vbCB1c2VEYXJrQXBwZWFyYW5jZSwgYm9v bCB1c2VFbGV2YQogfQogI2VuZGlmCiAKK3ZvaWQgV2ViUGFnZTo6ZnJlZXplTGF5ZXJUcmVlRHVl VG9Td2lwZUFuaW1hdGlvbigpCit7CisgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6 ZVJlYXNvbjo6U3dpcGVBbmltYXRpb24pOworfQorCit2b2lkIFdlYlBhZ2U6OnVuZnJlZXplTGF5 ZXJUcmVlRHVlVG9Td2lwZUFuaW1hdGlvbigpCit7CisgICAgdW5mcmVlemVMYXllclRyZWUoTGF5 ZXJUcmVlRnJlZXplUmVhc29uOjpTd2lwZUFuaW1hdGlvbik7Cit9CisKIHZvaWQgV2ViUGFnZTo6 YmVnaW5QcmludGluZyhGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgY29uc3QgUHJpbnRJbmZvJiBw cmludEluZm8pCiB7CiAgICAgV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2luZ2xldG9u KCkud2ViRnJhbWUoZnJhbWVJRCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgKaW5kZXggZjM1OWU0MTFmM2E2ZDYzOTMwNzM0YjVmYzI1ZmUzM2NiNTZiNTAyMC4u MTVkYjRiODlkNmM4YTdiODJkMWRkZjZiNjc0NTQ0MDU1NjJmMTg4OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtNzI5LDYgKzcyOSw3IEBAIHB1Ymxp YzoKICAgICAgICAgUGFnZVN1c3BlbmRlZCAgICAgICAgICAgPSAxIDw8IDMsCiAgICAgICAgIFBy aW50aW5nICAgICAgICAgICAgICAgID0gMSA8PCA0LAogICAgICAgICBQcm9jZXNzU3dhcCAgICAg ICAgICAgICA9IDEgPDwgNSwKKyAgICAgICAgU3dpcGVBbmltYXRpb24gICAgICAgICAgPSAxIDw8 IDYsCiAgICAgfTsKICAgICB2b2lkIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFz b24pOwogICAgIHZvaWQgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uKTsK QEAgLTczNiw2ICs3MzcsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBtYXJrTGF5ZXJzVm9sYXRpbGUo RnVuY3Rpb248dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlciA9IHsgfSk7CiAgICAgdm9p ZCBjYW5jZWxNYXJrTGF5ZXJzVm9sYXRpbGUoKTsKIAorICAgIHZvaWQgZnJlZXplTGF5ZXJUcmVl RHVlVG9Td2lwZUFuaW1hdGlvbigpOworICAgIHZvaWQgdW5mcmVlemVMYXllclRyZWVEdWVUb1N3 aXBlQW5pbWF0aW9uKCk7CisKICAgICBOb3RpZmljYXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFn ZXIqIG5vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigpOwogCiAgICAgdm9pZCBw YWdlRGlkU2Nyb2xsKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5tZXNzYWdlcy5pbgppbmRleCA1ZjJmMWFkMGM1NDc1M2VmZGVhNmMzMGY3NGFk YTU0MDRlNmY3ODM0Li45OWIzMmZlZjc4NDlhMGQ1ZjhiM2I1M2Y2ZDQyNTBmZjU0MTUwNTAxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3Nh Z2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVz c2FnZXMuaW4KQEAgLTM4MCw2ICszODAsOSBAQCBHZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21t YW5kKGVudW06dWludDhfdCBXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZQogICAg ICMgTm90aWZpY2F0aW9uCiAgICAgRGlkUmVjZWl2ZU5vdGlmaWNhdGlvblBlcm1pc3Npb25EZWNp c2lvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCwgYm9vbCBhbGxvd2VkKQogCisgICAgRnJlZXpl TGF5ZXJUcmVlRHVlVG9Td2lwZUFuaW1hdGlvbigpCisgICAgVW5mcmVlemVMYXllclRyZWVEdWVU b1N3aXBlQW5pbWF0aW9uKCkKKwogICAgICMgUHJpbnRpbmcuCiAgICAgQmVnaW5QcmludGluZyhX ZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgc3RydWN0IFdlYktpdDo6UHJpbnRJbmZv IHByaW50SW5mbykKICAgICBFbmRQcmludGluZygpCg==