199222 2019-06-26 04:25:39 -0700 [iOS Scrolling] Propagate scrolls to non-nested UIScrollViews 2019-06-28 10:25:31 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue simon.fraser webkit-bug-importer oldest_to_newest 1547997 0 koivisto 2019-06-26 04:25:39 -0700 With help of some UIKit SPIs. 1547998 1 372913 koivisto 2019-06-26 04:27:50 -0700 Created attachment 372913 WIP 1547999 2 372914 koivisto 2019-06-26 04:28:15 -0700 Created attachment 372914 test case 1548464 3 373030 koivisto 2019-06-27 06:43:18 -0700 Created attachment 373030 test with more nested scrollers 1548781 4 373104 koivisto 2019-06-28 04:31:45 -0700 Created attachment 373104 patch 1548830 5 373104 simon.fraser 2019-06-28 09:15:08 -0700 Comment on attachment 373104 patch View in context: https://bugs.webkit.org/attachment.cgi?id=373104&action=review > Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:141 > + if (auto* nonAncestorScrollingNode = host.nodeForID(node->relatedScrollContainerIDs()[0])) I'm having a hard time convincing myself that using relatedScrollContainerIDs()[0] is correct. What does it mean to have more than one? What is the order? 1548840 6 koivisto 2019-06-28 09:41:49 -0700 > I'm having a hard time convincing myself that using > relatedScrollContainerIDs()[0] is correct. What does it mean to have more > than one? What is the order? Would knowing that you wrote the code that sets it be help? :) It is simply the layer tree counterpart of ScrollingTreeOverflowScrollProxyNode::m_overflowScrollingNodeID. Having Moves and Stationary cases in a single vector matches the old design where PositionedNode handled both cases. It should really be refactored into two separate variables, matching PositionedNode split. 1548850 7 373104 commit-queue 2019-06-28 10:12:33 -0700 Comment on attachment 373104 patch Clearing flags on attachment: 373104 Committed r246926: <https://trac.webkit.org/changeset/246926> 1548851 8 commit-queue 2019-06-28 10:12:34 -0700 All reviewed patches have been landed. Closing bug. 1548857 9 webkit-bug-importer 2019-06-28 10:17:49 -0700 <rdar://problem/52338107> 1548864 10 koivisto 2019-06-28 10:25:31 -0700 <rdar://problem/49720738> 372913 2019-06-26 04:27:50 -0700 2019-06-28 04:31:45 -0700 WIP non-nested-scroll-wip.patch text/plain 4055 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3Rl TGF5ZXJUcmVlVmlld3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9S ZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZUxheWVyVHJlZVZpZXdzLmgJKHJldmlzaW9uIDI0Njgz NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3Rl TGF5ZXJUcmVlVmlld3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2ltcG9y dCA8V2ViQ29yZS9HcmFwaGljc0xheWVyLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgeworY2xhc3Mg UmVtb3RlTGF5ZXJUcmVlSG9zdDsKIGNsYXNzIFdlYlBhZ2VQcm94eTsKIH0KIApAQCAtNzcsNiAr NzgsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICNpZiBFTkFCTEUoUE9JTlRFUl9FVkVOVFMpCiBP cHRpb25TZXQ8V2ViQ29yZTo6VG91Y2hBY3Rpb24+IHRvdWNoQWN0aW9uc0ZvclBvaW50KFVJVmll dyAqcm9vdFZpZXcsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAjZW5kaWYKK1VJU2Nyb2xs VmlldyAqZmluZFNjcm9sbFBhcmVudChVSVNjcm9sbFZpZXcgKiwgY29uc3QgUmVtb3RlTGF5ZXJU cmVlSG9zdCYpOwogCiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxh eWVyVHJlZS9pb3MvUmVtb3RlTGF5ZXJUcmVlVmlld3MubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVMYXllclRyZWVWaWV3 cy5tbQkocmV2aXNpb24gMjQ2ODM0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3Rl TGF5ZXJUcmVlL2lvcy9SZW1vdGVMYXllclRyZWVWaWV3cy5tbQkod29ya2luZyBjb3B5KQpAQCAt MTI0LDYgKzEyNCwyNyBAQCBPcHRpb25TZXQ8V2ViQ29yZTo6VG91Y2hBY3Rpb24+IHRvdWNoQWN0 CiB9CiAjZW5kaWYKIAorVUlTY3JvbGxWaWV3ICpmaW5kU2Nyb2xsUGFyZW50KFVJU2Nyb2xsVmll dyAqc2Nyb2xsVmlldywgY29uc3QgUmVtb3RlTGF5ZXJUcmVlSG9zdCYgaG9zdCkKK3sKKyAgICBV SVZpZXcgKnZpZXcgPSBbc2Nyb2xsVmlldyBzdXBlcnZpZXddOworICAgIHdoaWxlICh2aWV3KSB7 CisgICAgICAgIGlmIChbdmlldyBpc0tpbmRPZkNsYXNzOltXS0NoaWxkU2Nyb2xsVmlldyBjbGFz c11dKQorICAgICAgICAgICAgcmV0dXJuIChXS0NoaWxkU2Nyb2xsVmlldyAqKXZpZXc7CisgICAg ICAgIGF1dG8qIG5vZGUgPSBSZW1vdGVMYXllclRyZWVOb2RlOjpmb3JDQUxheWVyKHZpZXcubGF5 ZXIpOworICAgICAgICBpZiAobm9kZSkgeworICAgICAgICAgICAgc3dpdGNoIChub2RlLT5yZWxh dGVkU2Nyb2xsQ29udGFpbmVyUG9zaXRpb25pbmdCZWhhdmlvcigpKSB7CisgICAgICAgICAgICBj YXNlIFdlYkNvcmU6OlNjcm9sbFBvc2l0aW9uaW5nQmVoYXZpb3I6Ok1vdmVzOgorICAgICAgICAg ICAgICAgIHJldHVybiAoV0tDaGlsZFNjcm9sbFZpZXcgKilob3N0Lm5vZGVGb3JJRChub2RlLT5y ZWxhdGVkU2Nyb2xsQ29udGFpbmVySURzKClbMF0pLT51aVZpZXcoKTsKKyAgICAgICAgICAgIGNh c2UgV2ViQ29yZTo6U2Nyb2xsUG9zaXRpb25pbmdCZWhhdmlvcjo6U3RhdGlvbmFyeToKKyAgICAg ICAgICAgIGNhc2UgV2ViQ29yZTo6U2Nyb2xsUG9zaXRpb25pbmdCZWhhdmlvcjo6Tm9uZToKKyAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICB2 aWV3ID0gW3ZpZXcgc3VwZXJ2aWV3XTsKKyAgICB9CisgICAgcmV0dXJuIG5pbDsKK30KKwogfQog CiBAaW50ZXJmYWNlIFVJVmlldyAoV0tIaXRUZXN0aW5nKQpJbmRleDogU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURl bGVnYXRlSU9TLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3Rl TGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TLmgJKHJl dmlzaW9uIDI0NjgzNCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJl ZS9pb3MvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUy5oCSh3b3JraW5nIGNv cHkpCkBAIC03Myw2ICs3Myw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGNhbmNlbFBvaW50ZXJzRm9y R2VzdHVyZVJlY29nbml6ZXIoVUlHZXN0dXJlUmVjb2duaXplciopOwogI2VuZGlmCiAKKyAgICBV SVNjcm9sbFZpZXcgKmZpbmRTY3JvbGxQYXJlbnQoKTsKKwogcHJpdmF0ZToKICAgICBVSVNjcm9s bFZpZXcgKnNjcm9sbFZpZXcoKSBjb25zdDsKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRl SU9TLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVy VHJlZS9pb3MvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUy5tbQkocmV2aXNp b24gMjQ2ODM0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lv cy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0yOCw2ICsyOCw3IEBACiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKSAmJiBFTkFCTEUo QVNZTkNfU0NST0xMSU5HKQogCisjaW1wb3J0ICJSZW1vdGVMYXllclRyZWVWaWV3cy5oIgogI2lt cG9ydCAiUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5oIgogI2ltcG9ydCAiUmVtb3Rl U2Nyb2xsaW5nVHJlZS5oIgogI2ltcG9ydCAiVUlLaXRTUEkuaCIKQEAgLTYxLDYgKzYyLDExIEBA IC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFNjcm9sbGluZ1RyZWVOb2QKICAgICByZXR1cm4gc2Vs ZjsKIH0KIAorLSAoVUlTY3JvbGxWaWV3ICopX2Zha2VQYXJlbnRTY3JvbGxWaWV3Rm9yU2Nyb2xs VmlldzooVUlTY3JvbGxWaWV3ICopc2Nyb2xsVmlldworeworICAgIHJldHVybiBfc2Nyb2xsaW5n VHJlZU5vZGVEZWxlZ2F0ZS0+ZmluZFNjcm9sbFBhcmVudCgpOworfQorCiAtICh2b2lkKXNjcm9s bFZpZXdEaWRTY3JvbGw6KFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXcKIHsKICAgICBfc2Nyb2xs aW5nVHJlZU5vZGVEZWxlZ2F0ZS0+c2Nyb2xsVmlld0RpZFNjcm9sbChzY3JvbGxWaWV3LmNvbnRl bnRPZmZzZXQsIF9pblVzZXJJbnRlcmFjdGlvbik7CkBAIC0zMzgsNiArMzQ0LDEzIEBAIFVJU2Ny b2xsVmlldyAqU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUKICAgICByZXR1cm4gc2Nyb2xsVmll dzsKIH0KIAorVUlTY3JvbGxWaWV3ICpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRl SU9TOjpmaW5kU2Nyb2xsUGFyZW50KCkKK3sKKyAgICBhdXRvJiBzY3JvbGxpbmdDb29yZGluYXRv clByb3h5ID0gZG93bmNhc3Q8UmVtb3RlU2Nyb2xsaW5nVHJlZT4oc2Nyb2xsaW5nVHJlZSgpKS5z Y3JvbGxpbmdDb29yZGluYXRvclByb3h5KCk7CisKKyAgICByZXR1cm4gV2ViS2l0OjpmaW5kU2Ny b2xsUGFyZW50KHNjcm9sbFZpZXcoKSwgKnNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkubGF5ZXJU cmVlSG9zdCgpKTsKK30KKwogI2lmIEVOQUJMRShQT0lOVEVSX0VWRU5UUykKIHZvaWQgU2Nyb2xs aW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUzo6Y29tcHV0ZUFjdGl2ZVRvdWNoQWN0aW9u c0Zvckdlc3R1cmVSZWNvZ25pemVyKFVJR2VzdHVyZVJlY29nbml6ZXIqIGdlc3R1cmVSZWNvZ25p emVyKQogewo= 372914 2019-06-26 04:28:15 -0700 2019-06-26 04:28:15 -0700 test case vertical-horizontal.html text/html 641 koivisto PHN0eWxlPgojb3V0ZXIgewogICAgb3ZlcmZsb3cteDogaGlkZGVuOwogICAgb3ZlcmZsb3cteTog c2Nyb2xsOwogICAgd2lkdGg6IDQwMHB4OwogICAgaGVpZ2h0OiA0MDBweDsKICAgIGJvcmRlcjog MnB4IHNvbGlkIHllbGxvdzsKfQojaW5uZXIgewogICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAg b3ZlcmZsb3cteDogc2Nyb2xsOwogICAgb3ZlcmZsb3cteTogaGlkZGVuOwogICAgd2lkdGg6IDQw MHB4OwogICAgaGVpZ2h0OiAyMDBweDsKICAgIGJvcmRlcjogMnB4IHNvbGlkIGJsdWU7Cn0KI2lu bmVyY29udGVudCB7CiAgICB3aWR0aDogMTAwMHB4OwogICAgaGVpZ2h0OiAxMDAwcHg7CiAgICBi b3JkZXI6IDEwcHggc29saWQgZ3JlZW47Cn0KI291dGVyY29udGVudCB7CiAgICB3aWR0aDogMTAw MHB4OwogICAgaGVpZ2h0OiAxMDAwcHg7CiAgICBib3JkZXI6IDEwcHggc29saWQgcmVkOwp9Cjwv c3R5bGU+CjxkaXYgaWQ9b3V0ZXI+CiAgICA8ZGl2IGlkPW91dGVyY29udGVudCBjbGFzcz1jb250 ZW50PgogICAgICAgIFZlcnRpY2FsCiAgICAgICAgPGRpdiBpZD1pbm5lcj4KICAgICAgICAgICAg PGRpdiBpZD1pbm5lcmNvbnRlbnQ+SG9yaXpvbnRhbDwvZGl2PgogICAgICAgIDwvZGl2PgogICAg PC9kaXY+CjwvZGl2Pgo= 373030 2019-06-27 06:43:18 -0700 2019-06-27 06:43:18 -0700 test with more nested scrollers non-nested-scroll-2.html text/html 995 koivisto PHN0eWxlPgojb3V0ZXJvdXRlciB7CiAgICBvdmVyZmxvdy14OiBzY3JvbGw7CiAgICBvdmVyZmxv dy15OiBzY3JvbGw7CiAgICB3aWR0aDogNjAwcHg7CiAgICBoZWlnaHQ6IDYwMHB4OwogICAgYm9y ZGVyOiAycHggc29saWQgcHVycGxlOwp9CiNvdXRlciB7CiAgICBvdmVyZmxvdy14OiBoaWRkZW47 CiAgICBvdmVyZmxvdy15OiBzY3JvbGw7CiAgICB3aWR0aDogNDAwcHg7CiAgICBoZWlnaHQ6IDQw MHB4OwogICAgYm9yZGVyOiAycHggc29saWQgeWVsbG93Owp9CiNpbm5lciB7CiAgICBwb3NpdGlv bjogcmVsYXRpdmU7CiAgICBvdmVyZmxvdy14OiBzY3JvbGw7CiAgICBvdmVyZmxvdy15OiBoaWRk ZW47CiAgICB3aWR0aDogNDAwcHg7CiAgICBoZWlnaHQ6IDUwMHB4OwogICAgYm9yZGVyOiAycHgg c29saWQgYmx1ZTsKfQojaW5uZXJjb250ZW50IHsKICAgIHdpZHRoOiAxMDAwcHg7CiAgICBoZWln aHQ6IDEwMDBweDsKICAgIGJvcmRlcjogMTBweCBzb2xpZCBncmVlbjsKfQojb3V0ZXJjb250ZW50 IHsKICAgIHdpZHRoOiAxMDAwcHg7CiAgICBoZWlnaHQ6IDYwMHB4OwogICAgYm9yZGVyOiAxMHB4 IHNvbGlkIHJlZDsKfQojb3V0ZXJvdXRlcmNvbnRlbnQgewogICAgd2lkdGg6IDEwMDBweDsKICAg IGhlaWdodDogMTAwMHB4OwogICAgYm9yZGVyOiAxMHB4IHNvbGlkIGJsdWU7Cn0KPC9zdHlsZT4K PGRpdiBpZD1vdXRlcm91dGVyPgogICAgPGRpdiBpZD1vdXRlcm91dGVyY29udGVudD4KICAgICAg ICA8ZGl2IGlkPW91dGVyPgogICAgICAgICAgICA8ZGl2IGlkPW91dGVyY29udGVudCBjbGFzcz1j b250ZW50PgogICAgICAgICAgICAgICAgVmVydGljYWwKICAgICAgICAgICAgICAgIDxkaXYgaWQ9 aW5uZXI+CiAgICAgICAgICAgICAgICAgICAgPGRpdiBpZD1pbm5lcmNvbnRlbnQ+SG9yaXpvbnRh bDwvZGl2PgogICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgIDwvZGl2PgogICAgICAg IDwvZGl2PgogICAgPC9kaXY+CjwvZGl2Pgo= 373104 2019-06-28 04:31:45 -0700 2019-06-28 10:12:33 -0700 patch non-acestor-scroll-parent.patch text/plain 6473 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDY5MjMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA2LTI4ICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TIFNjcm9sbGluZ10gUHJvcGFn YXRlIHNjcm9sbHMgdG8gbm9uLW5lc3RlZCBVSVNjcm9sbFZpZXdzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkyMjIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBtYXkgZ2VuZXJhdGUgc2Nyb2xsaW5n IGhpZXJhcmNoaWVzIHdoZXJlIHRoZSBzY3JvbGxpbmcgYW5jZXN0b3Igb2YgYSBsYXllciBpcyBu b3QKKyAgICAgICAgYW4gYW5jZXN0b3IgaW4gdGhlIGxheWVyIHRyZWUuIFdlICBoYW5kbGUgdGhp cyBpbiBtb3N0IHNpdHVhdGlvbnMgYnV0IHRoZXJlIGlzIHN0aWxsCisgICAgICAgIGEgcHJvYmxl bSB3aGVyZSBhIHNjcm9sbGVyIGZhaWxzIHRvIHByb3BhZ2Ugc2Nyb2xsIHRvIHRoZSBhbmNlc3Rv ciB3aGVuIGl0IHJlYWNoZXMKKyAgICAgICAgdGhlIGVkZ2UuCisKKyAgICAgICAgVGhpcyBwYXRj aCBob29rcyB1cCBhIG5ldyBTUEkgdGhhdCBhbGxvd3MgdXMgdG8gdGVsbCBVSUtpdCBhYm91dCBu b24tYW5jZXN0b3Igc2Nyb2xsaW5nCisgICAgICAgIHJlbGF0aW9ucyBhbmQgc29sdmUgdGhpcyBw cm9ibGVtLgorCisgICAgICAgICogVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3Rl TGF5ZXJUcmVlVmlld3MuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lv cy9SZW1vdGVMYXllclRyZWVWaWV3cy5tbToKKyAgICAgICAgKFdlYktpdDo6ZmluZEFjdGluZ1Nj cm9sbFBhcmVudCk6CisgICAgICAgICogVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Ny b2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUy5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJ T1MubW06CisgICAgICAgICgtW1dLU2Nyb2xsaW5nTm9kZVNjcm9sbFZpZXdEZWxlZ2F0ZSBfYWN0 aW5nUGFyZW50U2Nyb2xsVmlld0ZvclNjcm9sbFZpZXc6XSk6CisKKyAgICAgICAgSG9vayBpbnRv IFVJS2l0IFNQSS4KKworICAgICAgICAoV2ViS2l0OjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9k ZURlbGVnYXRlSU9TOjpmaW5kQWN0aW5nU2Nyb2xsUGFyZW50KToKKwogMjAxOS0wNi0yOCAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1NPVVBd IFdlYlNvY2tldHM6IHJ1bnRpbWUgY3JpdGljYWwgd2FybmluZyB3aGVuIGNsb3NpbmcgdGhlIGNv bm5lY3Rpb24gaW4gc29tZSBjYXNlcwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVt b3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVMYXllclRyZWVWaWV3cy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3RlTGF5ZXJUcmVl Vmlld3MuaAkocmV2aXNpb24gMjQ2OTIxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVt b3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVMYXllclRyZWVWaWV3cy5oCSh3b3JraW5nIGNvcHkpCkBA IC0zMSw2ICszMSw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL0dyYXBoaWNzTGF5ZXIuaD4KIAogbmFt ZXNwYWNlIFdlYktpdCB7CitjbGFzcyBSZW1vdGVMYXllclRyZWVIb3N0OwogY2xhc3MgV2ViUGFn ZVByb3h5OwogfQogCkBAIC03Nyw2ICs3OCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogI2lmIEVO QUJMRShQT0lOVEVSX0VWRU5UUykKIE9wdGlvblNldDxXZWJDb3JlOjpUb3VjaEFjdGlvbj4gdG91 Y2hBY3Rpb25zRm9yUG9pbnQoVUlWaWV3ICpyb290VmlldywgY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmKTsKICNlbmRpZgorVUlTY3JvbGxWaWV3ICpmaW5kQWN0aW5nU2Nyb2xsUGFyZW50KFVJU2Ny b2xsVmlldyAqLCBjb25zdCBSZW1vdGVMYXllclRyZWVIb3N0Jik7CiAKIH0KIApJbmRleDogU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVMYXllclRyZWVW aWV3cy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXll clRyZWUvaW9zL1JlbW90ZUxheWVyVHJlZVZpZXdzLm1tCShyZXZpc2lvbiAyNDY5MjEpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZUxheWVyVHJl ZVZpZXdzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMjQsNiArMTI0LDM1IEBAIE9wdGlvblNldDxX ZWJDb3JlOjpUb3VjaEFjdGlvbj4gdG91Y2hBY3QKIH0KICNlbmRpZgogCitVSVNjcm9sbFZpZXcg KmZpbmRBY3RpbmdTY3JvbGxQYXJlbnQoVUlTY3JvbGxWaWV3ICpzY3JvbGxWaWV3LCBjb25zdCBS ZW1vdGVMYXllclRyZWVIb3N0JiBob3N0KQoreworICAgIEhhc2hTZXQ8V2ViQ29yZTo6R3JhcGhp Y3NMYXllcjo6UGxhdGZvcm1MYXllcklEPiBzY3JvbGxlcnNUb1NraXA7CisKKyAgICBmb3IgKFVJ VmlldyAqdmlldyA9IFtzY3JvbGxWaWV3IHN1cGVydmlld107IHZpZXc7IHZpZXcgPSBbdmlldyBz dXBlcnZpZXddKSB7CisgICAgICAgIGlmIChbdmlldyBpc0tpbmRPZkNsYXNzOltXS0NoaWxkU2Ny b2xsVmlldyBjbGFzc11dICYmICFzY3JvbGxlcnNUb1NraXAuY29udGFpbnMoUmVtb3RlTGF5ZXJU cmVlTm9kZTo6bGF5ZXJJRCh2aWV3LmxheWVyKSkpIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBJ ZGVhbGx5IHdlIHdvdWxkIHJldHVybiB0aGUgc2Nyb2xsZXIgd2Ugd2FudCBpbiBhbGwgY2FzZXMg YnV0IHRoZSBjdXJyZW50IFVJS2l0IFNQSSBvbmx5IGFsbG93cyByZXR1cm5pbmcgYSBub24tYW5j ZXN0b3IuCisgICAgICAgICAgICByZXR1cm4gbmlsOworICAgICAgICB9CisKKyAgICAgICAgaWYg KGF1dG8qIG5vZGUgPSBSZW1vdGVMYXllclRyZWVOb2RlOjpmb3JDQUxheWVyKHZpZXcubGF5ZXIp KSB7CisgICAgICAgICAgICBzd2l0Y2ggKG5vZGUtPnJlbGF0ZWRTY3JvbGxDb250YWluZXJQb3Np dGlvbmluZ0JlaGF2aW9yKCkpIHsKKyAgICAgICAgICAgIGNhc2UgV2ViQ29yZTo6U2Nyb2xsUG9z aXRpb25pbmdCZWhhdmlvcjo6TW92ZXM6CisgICAgICAgICAgICAgICAgaWYgKCFub2RlLT5yZWxh dGVkU2Nyb2xsQ29udGFpbmVySURzKCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgICAg IGlmIChhdXRvKiBub25BbmNlc3RvclNjcm9sbGluZ05vZGUgPSBob3N0Lm5vZGVGb3JJRChub2Rl LT5yZWxhdGVkU2Nyb2xsQ29udGFpbmVySURzKClbMF0pKQorICAgICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIChXS0NoaWxkU2Nyb2xsVmlldyAqKW5vbkFuY2VzdG9yU2Nyb2xsaW5nTm9kZS0+ dWlWaWV3KCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgY2FzZSBXZWJDb3JlOjpTY3JvbGxQb3NpdGlvbmluZ0JlaGF2aW9yOjpTdGF0aW9u YXJ5OgorICAgICAgICAgICAgICAgIHNjcm9sbGVyc1RvU2tpcC5hZGQobm9kZS0+cmVsYXRlZFNj cm9sbENvbnRhaW5lcklEcygpLmJlZ2luKCksIG5vZGUtPnJlbGF0ZWRTY3JvbGxDb250YWluZXJJ RHMoKS5lbmQoKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFdl YkNvcmU6OlNjcm9sbFBvc2l0aW9uaW5nQmVoYXZpb3I6Ok5vbmU6CisgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG5pbDsK K30KKwogfQogCiBAaW50ZXJmYWNlIFVJVmlldyAoV0tIaXRUZXN0aW5nKQpJbmRleDogU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xs aW5nTm9kZURlbGVnYXRlSU9TLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRl SU9TLmgJKHJldmlzaW9uIDI0NjkyMSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUy5oCSh3 b3JraW5nIGNvcHkpCkBAIC03Myw2ICs3Myw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGNhbmNlbFBv aW50ZXJzRm9yR2VzdHVyZVJlY29nbml6ZXIoVUlHZXN0dXJlUmVjb2duaXplciopOwogI2VuZGlm CiAKKyAgICBVSVNjcm9sbFZpZXcgKmZpbmRBY3RpbmdTY3JvbGxQYXJlbnQoVUlTY3JvbGxWaWV3 ICopOworCiBwcml2YXRlOgogICAgIFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldygpIGNvbnN0Owog CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9s bGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJT1MubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xs aW5nTm9kZURlbGVnYXRlSU9TLm1tCShyZXZpc2lvbiAyNDY5MjEpCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl RGVsZWdhdGVJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpICYmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCiAKKyNpbXBvcnQg IlJlbW90ZUxheWVyVHJlZVZpZXdzLmgiCiAjaW1wb3J0ICJSZW1vdGVTY3JvbGxpbmdDb29yZGlu YXRvclByb3h5LmgiCiAjaW1wb3J0ICJSZW1vdGVTY3JvbGxpbmdUcmVlLmgiCiAjaW1wb3J0ICJV SUtpdFNQSS5oIgpAQCAtNjEsNiArNjIsMTIgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoU2Ny b2xsaW5nVHJlZU5vZAogICAgIHJldHVybiBzZWxmOwogfQogCistIChVSVNjcm9sbFZpZXcgKilf YWN0aW5nUGFyZW50U2Nyb2xsVmlld0ZvclNjcm9sbFZpZXc6KFVJU2Nyb2xsVmlldyAqKXNjcm9s bFZpZXcKK3sKKyAgICAvLyBBbiAiYWN0aW5nIHBhcmVudCIgaXMgYSBub24tYW5jZXN0b3Igc2Ny b2xsaW5nIHBhcmVudC4gV2UgdGVsbCB0aGlzIHRvIFVJS2l0IHNvIGl0IGNhbiBwcm9wYWdhdGUg c2Nyb2xscyBjb3JyZWN0bHkuCisgICAgcmV0dXJuIF9zY3JvbGxpbmdUcmVlTm9kZURlbGVnYXRl LT5maW5kQWN0aW5nU2Nyb2xsUGFyZW50KHNjcm9sbFZpZXcpOworfQorCiAtICh2b2lkKXNjcm9s bFZpZXdEaWRTY3JvbGw6KFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXcKIHsKICAgICBfc2Nyb2xs aW5nVHJlZU5vZGVEZWxlZ2F0ZS0+c2Nyb2xsVmlld0RpZFNjcm9sbChzY3JvbGxWaWV3LmNvbnRl bnRPZmZzZXQsIF9pblVzZXJJbnRlcmFjdGlvbik7CkBAIC0zMzgsNiArMzQ1LDE0IEBAIFVJU2Ny b2xsVmlldyAqU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUKICAgICByZXR1cm4gc2Nyb2xsVmll dzsKIH0KIAorVUlTY3JvbGxWaWV3ICpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRl SU9TOjpmaW5kQWN0aW5nU2Nyb2xsUGFyZW50KFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldykKK3sK KyAgICBBU1NFUlQoc2Nyb2xsVmlldyA9PSB0aGlzLT5zY3JvbGxWaWV3KCkpOworCisgICAgYXV0 byYgc2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSA9IGRvd25jYXN0PFJlbW90ZVNjcm9sbGluZ1Ry ZWU+KHNjcm9sbGluZ1RyZWUoKSkuc2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSgpOworICAgIHJl dHVybiBXZWJLaXQ6OmZpbmRBY3RpbmdTY3JvbGxQYXJlbnQoc2Nyb2xsVmlldywgKnNjcm9sbGlu Z0Nvb3JkaW5hdG9yUHJveHkubGF5ZXJUcmVlSG9zdCgpKTsKK30KKwogI2lmIEVOQUJMRShQT0lO VEVSX0VWRU5UUykKIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUzo6 Y29tcHV0ZUFjdGl2ZVRvdWNoQWN0aW9uc0Zvckdlc3R1cmVSZWNvZ25pemVyKFVJR2VzdHVyZVJl Y29nbml6ZXIqIGdlc3R1cmVSZWNvZ25pemVyKQogewo=