231395 2021-10-07 15:08:45 -0700 Minor refactoring to use ScrollUpdate in more places 2021-10-07 17:33:18 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 231402 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr luiz mmaxfield simon.fraser tonikitoo webkit-bug-importer oldest_to_newest 1801811 0 simon.fraser 2021-10-07 15:08:45 -0700 Minor refactoring to use ScrollUpdate in more places 1801814 1 440544 simon.fraser 2021-10-07 15:11:09 -0700 Created attachment 440544 Patch 1801821 2 440544 mmaxfield 2021-10-07 15:17:53 -0700 Comment on attachment 440544 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440544&action=review > Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp:263 > + auto scrollUpdate = ScrollUpdate { scrollingNodeID, scrollPosition, { }, ScrollingLayerPositionAction::Set }; Why not ScrollUpdate scrollUpdate(scrollingNodeID, scrollPosition, { }, ScrollingLayerPositionAction::Set);? Or even applyScrollUpdate(ScrollUpdate(scrollingNodeID, scrollPosition, { }, ScrollingLayerPositionAction::Set), ScrollType::Programmatic);? > Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp:309 > + applyScrollPositionUpdate(WTFMove(update), ScrollType::User); Cool. > Source/WebCore/page/scrolling/ScrollingCoordinatorTypes.h:105 > +struct ScrollUpdate { If you're going to move this, why not move it into its own file? 1801882 3 ews-feeder 2021-10-07 17:32:39 -0700 Committed r283761 (242681@main): <https://commits.webkit.org/242681@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440544. 1801883 4 webkit-bug-importer 2021-10-07 17:33:18 -0700 <rdar://problem/84007408> 440544 2021-10-07 15:11:09 -0700 2021-10-07 17:32:41 -0700 Patch bug-231395-20211007151108.patch text/plain 14701 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBiNjY1Yjk5YWJmN2Zm OWQ4NzAzMGI3YmFkNDRmYzBjNzc0MTQxZS4uY2ZkNGYxZWZlZmVmN2Q1MzE5MjM1NGQ1MTgzZDBj M2Y3YjZiOWM5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTEwLTA3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1pbm9yIHJlZmFj dG9yaW5nIHRvIHVzZSBTY3JvbGxVcGRhdGUgaW4gbW9yZSBwbGFjZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTM5NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgU2Nyb2xsVXBkYXRlIGlz IHVzZWQgdG8gY29tbXVuaWNhdGUgY2hhbmdlcyBmcm9tIHRoZSBzY3JvbGxpbmcgdHJlZSBiYWNr IHRvIEZyYW1lVmlldyBldGMuCisKKyAgICAgICAgRnV0dXJlIHBhdGNoZXMgd2lsbCBleHRlbmQg U2Nyb2xsVXBkYXRlIGEgbGl0dGxlLiBNb3ZlIHRvIFNjcm9sbGluZ0Nvb3JkaW5hdG9yVHlwZXMu aCwgYW5kCisgICAgICAgIHBhc3MgU2Nyb2xsVXBkYXRlIHRvIHNvbWUgbW9yZSBBc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yIGZ1bmN0aW9ucywgb25seSB1bnBhY2tpbmcgYXQgdGhlCisgICAgICAg IGxhc3QgbWludXRlLgorCisgICAgICAgIE1vdmUgU2Nyb2xsVHlwZSB0byB0aGUgZW5kIG9mIHRo ZSB1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwoKSBhcmd1bWVudCBsaXN0IHNp bmNlCisgICAgICAgIGl0J3Mgbm90IHBhcnQgb2YgU2Nyb2xsVXBkYXRlLgorCisgICAgICAgICog cGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpyZXF1ZXN0U2Nyb2xsUG9zaXRpb25V cGRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6c3lu Y2hyb25pemVTdGF0ZUZyb21TY3JvbGxpbmdUcmVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5j U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmFwcGx5UGVuZGluZ1Njcm9sbFVwZGF0ZXMpOgorICAgICAg ICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6YXBwbHlTY3JvbGxVcGRhdGUp OgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6YXBwbHlTY3Jv bGxQb3NpdGlvblVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yOjp1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwpOgorICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDoKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvclR5cGVzLmg6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxVcGRhdGU6OmNhbk1lcmdlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbFVwZGF0ZTo6bWVyZ2UpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1Ry ZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6dGFrZVBlbmRpbmdTY3Jv bGxVcGRhdGVzKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmg6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpTY3JvbGxVcGRhdGU6OmNhbk1lcmdlIGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWU6OlNjcm9sbFVw ZGF0ZTo6bWVyZ2UpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVk U2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRlZFNjcm9sbGluZ1Ry ZWU6OnNjcm9sbGluZ1RyZWVOb2RlRGlkU2Nyb2xsKToKKwogMjAyMS0xMC0wNiAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBzdGF0ZSBt YWludGVuYW5jZSBhcm91bmQgYW5pbWF0ZWQgc2Nyb2xscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBiODQzNjAwN2U4 YjVkYjcxZGVkZWU1NjJhOTJlNzAzY2YzMGZlNzJkLi5hYjA4ZDdmZGMxMThiZDhkNWUwMjFlMWJm NDMwODM1NDhlMDQ2Mzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTEwLTA3ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1pbm9yIHJl ZmFjdG9yaW5nIHRvIHVzZSBTY3JvbGxVcGRhdGUgaW4gbW9yZSBwbGFjZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTM5NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvci5tbToKKyAgICAgICAg KFdlYktpdDo6UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNjcm9sbFBvc2l0aW9uQ2hhbmdl ZEZvck5vZGUpOgorCiAyMDIxLTEwLTA3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgogCiAgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byBkaXNwYXRjaCBtZXNzYWdlcyB0 byBtdWx0aXBsZSByZWNlaXZlciB0eXBlcyBpbiBJUEM6OlN0cmVhbVNlcnZlckNvbm5lY3Rpb24K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3Jv bGxpbmdDb29yZGluYXRvci5jcHAKaW5kZXggY2RkZjM0YmI2YzA5MGU0MDdhZmMyNzNiZTM0NmVh YzlmNDlmOTYxNS4uNTI4OWVkYjdjMTQxODRlNjg3ZDhlMzQyNjVhMTdlYzIwNDUxNDU0MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29y ZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3Jv bGxpbmdDb29yZGluYXRvci5jcHAKQEAgLTI1OSw4ICsyNTksMTAgQEAgYm9vbCBBc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yOjpyZXF1ZXN0U2Nyb2xsUG9zaXRpb25VcGRhdGUoU2Nyb2xsYWJsZUFy ZWEmIHNjcm8KICAgICBib29sIGluQmFja0ZvcndhcmRDYWNoZSA9IGZyYW1lVmlldy0+ZnJhbWUo KS5kb2N1bWVudCgpLT5iYWNrRm9yd2FyZENhY2hlU3RhdGUoKSAhPSBEb2N1bWVudDo6Tm90SW5C YWNrRm9yd2FyZENhY2hlOwogICAgIGJvb2wgaXNTbmFwc2hvdHRpbmcgPSBtX3BhZ2UtPmlzVGFr aW5nU25hcHNob3RzRm9yQXBwbGljYXRpb25TdXNwZW5zaW9uKCk7CiAgICAgYm9vbCBpblByb2dy YW1tYXRpY1Njcm9sbCA9IHNjcm9sbGFibGVBcmVhLmN1cnJlbnRTY3JvbGxUeXBlKCkgPT0gU2Ny b2xsVHlwZTo6UHJvZ3JhbW1hdGljOwotICAgIGlmIChpblByb2dyYW1tYXRpY1Njcm9sbCB8fCBp bkJhY2tGb3J3YXJkQ2FjaGUpCi0gICAgICAgIGFwcGx5U2Nyb2xsVXBkYXRlKHNjcm9sbGluZ05v ZGVJRCwgc2Nyb2xsUG9zaXRpb24sIHsgfSwgU2Nyb2xsVHlwZTo6UHJvZ3JhbW1hdGljLCBTY3Jv bGxpbmdMYXllclBvc2l0aW9uQWN0aW9uOjpTZXQpOworICAgIGlmIChpblByb2dyYW1tYXRpY1Nj cm9sbCB8fCBpbkJhY2tGb3J3YXJkQ2FjaGUpIHsKKyAgICAgICAgYXV0byBzY3JvbGxVcGRhdGUg PSBTY3JvbGxVcGRhdGUgeyBzY3JvbGxpbmdOb2RlSUQsIHNjcm9sbFBvc2l0aW9uLCB7IH0sIFNj cm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlNldCB9OworICAgICAgICBhcHBseVNjcm9sbFVw ZGF0ZShXVEZNb3ZlKHNjcm9sbFVwZGF0ZSksIFNjcm9sbFR5cGU6OlByb2dyYW1tYXRpYyk7Cisg ICAgfQogCiAgICAgQVNTRVJUKGluUHJvZ3JhbW1hdGljU2Nyb2xsID09IChzY3JvbGxUeXBlID09 IFNjcm9sbFR5cGU6OlByb2dyYW1tYXRpYykpOwogCkBAIC0yOTEsNyArMjkzLDcgQEAgdm9pZCBB c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpzeW5jaHJvbml6ZVN0YXRlRnJvbVNjcm9sbGluZ1Ry ZWUoKQogICAgIG1fc2Nyb2xsaW5nVHJlZS0+dHJhdmVyc2VTY3JvbGxpbmdUcmVlKFsmXShTY3Jv bGxpbmdOb2RlSUQgbm9kZUlELCBTY3JvbGxpbmdOb2RlVHlwZSwgc3RkOjpvcHRpb25hbDxGbG9h dFBvaW50PiBzY3JvbGxQb3NpdGlvbiwgc3RkOjpvcHRpb25hbDxGbG9hdFBvaW50PiBsYXlvdXRW aWV3cG9ydE9yaWdpbiwgYm9vbCBzY3JvbGxlZFNpbmNlTGFzdENvbW1pdCkgewogICAgICAgICBp ZiAoc2Nyb2xsUG9zaXRpb24gJiYgc2Nyb2xsZWRTaW5jZUxhc3RDb21taXQpIHsKICAgICAgICAg ICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCAiQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvcjo6c3luY2hyb25pemVTdGF0ZUZyb21TY3JvbGxpbmdUcmVlIC0gbm9kZSAiIDw8 IG5vZGVJRCA8PCAiIHNjcm9sbCBwb3NpdGlvbiAiIDw8IHNjcm9sbFBvc2l0aW9uKTsKLSAgICAg ICAgICAgIHVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChub2RlSUQsIHNjcm9s bFBvc2l0aW9uLnZhbHVlKCksIGxheW91dFZpZXdwb3J0T3JpZ2luLCBTY3JvbGxUeXBlOjpVc2Vy LCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uOjpTZXQpOworICAgICAgICAgICAgdXBkYXRl U2Nyb2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKG5vZGVJRCwgc2Nyb2xsUG9zaXRpb24udmFs dWUoKSwgbGF5b3V0Vmlld3BvcnRPcmlnaW4sIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246 OlNldCwgU2Nyb2xsVHlwZTo6VXNlcik7CiAgICAgICAgIH0KICAgICB9KTsKIH0KQEAgLTMwNCw3 ICszMDYsNyBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmFwcGx5UGVuZGluZ1Nj cm9sbFVwZGF0ZXMoKQogICAgIGF1dG8gc2Nyb2xsVXBkYXRlcyA9IG1fc2Nyb2xsaW5nVHJlZS0+ dGFrZVBlbmRpbmdTY3JvbGxVcGRhdGVzKCk7CiAgICAgZm9yIChhdXRvJiB1cGRhdGUgOiBzY3Jv bGxVcGRhdGVzKSB7CiAgICAgICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8 PCAiQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6YXBwbHlQZW5kaW5nU2Nyb2xsVXBkYXRlcyAt IG5vZGUgIiA8PCB1cGRhdGUubm9kZUlEIDw8ICIgc2Nyb2xsIHBvc2l0aW9uICIgPDwgdXBkYXRl LnNjcm9sbFBvc2l0aW9uKTsKLSAgICAgICAgdXBkYXRlU2Nyb2xsUG9zaXRpb25BZnRlckFzeW5j U2Nyb2xsKHVwZGF0ZS5ub2RlSUQsIHVwZGF0ZS5zY3JvbGxQb3NpdGlvbiwgdXBkYXRlLmxheW91 dFZpZXdwb3J0T3JpZ2luLCBTY3JvbGxUeXBlOjpVc2VyLCB1cGRhdGUudXBkYXRlTGF5ZXJQb3Np dGlvbkFjdGlvbik7CisgICAgICAgIGFwcGx5U2Nyb2xsUG9zaXRpb25VcGRhdGUoV1RGTW92ZSh1 cGRhdGUpLCBTY3JvbGxUeXBlOjpVc2VyKTsKICAgICB9CiB9CiAKQEAgLTM0NSwxMyArMzQ3LDE4 IEBAIEZyYW1lVmlldyogQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3Rm9yU2Ny b2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotdm9p ZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjphcHBseVNjcm9sbFVwZGF0ZShTY3JvbGxpbmdO b2RlSUQgc2Nyb2xsaW5nTm9kZUlELCBjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwg c3RkOjpvcHRpb25hbDxGbG9hdFBvaW50PiBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgU2Nyb2xsVHlw ZSBzY3JvbGxUeXBlLCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uIHNjcm9sbGluZ0xheWVy UG9zaXRpb25BY3Rpb24pCit2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmFwcGx5U2Ny b2xsVXBkYXRlKFNjcm9sbFVwZGF0ZSYmIHVwZGF0ZSwgU2Nyb2xsVHlwZSBzY3JvbGxUeXBlKQog ewogICAgIGFwcGx5UGVuZGluZ1Njcm9sbFVwZGF0ZXMoKTsKLSAgICB1cGRhdGVTY3JvbGxQb3Np dGlvbkFmdGVyQXN5bmNTY3JvbGwoc2Nyb2xsaW5nTm9kZUlELCBzY3JvbGxQb3NpdGlvbiwgbGF5 b3V0Vmlld3BvcnRPcmlnaW4sIHNjcm9sbFR5cGUsIHNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rp b24pOworICAgIGFwcGx5U2Nyb2xsUG9zaXRpb25VcGRhdGUoV1RGTW92ZSh1cGRhdGUpLCBzY3Jv bGxUeXBlKTsKK30KKwordm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjphcHBseVNjcm9s bFBvc2l0aW9uVXBkYXRlKFNjcm9sbFVwZGF0ZSYmIHVwZGF0ZSwgU2Nyb2xsVHlwZSBzY3JvbGxU eXBlKQoreworICAgIHVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbCh1cGRhdGUu bm9kZUlELCB1cGRhdGUuc2Nyb2xsUG9zaXRpb24sIHVwZGF0ZS5sYXlvdXRWaWV3cG9ydE9yaWdp biwgdXBkYXRlLnVwZGF0ZUxheWVyUG9zaXRpb25BY3Rpb24sIHNjcm9sbFR5cGUpOwogfQogCi12 b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJB c3luY1Njcm9sbChTY3JvbGxpbmdOb2RlSUQgc2Nyb2xsaW5nTm9kZUlELCBjb25zdCBGbG9hdFBv aW50JiBzY3JvbGxQb3NpdGlvbiwgc3RkOjpvcHRpb25hbDxGbG9hdFBvaW50PiBsYXlvdXRWaWV3 cG9ydE9yaWdpbiwgU2Nyb2xsVHlwZSBzY3JvbGxUeXBlLCBTY3JvbGxpbmdMYXllclBvc2l0aW9u QWN0aW9uIHNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24pCit2b2lkIEFzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3I6OnVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChTY3JvbGxp bmdOb2RlSUQgc2Nyb2xsaW5nTm9kZUlELCBjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlv biwgc3RkOjpvcHRpb25hbDxGbG9hdFBvaW50PiBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgU2Nyb2xs aW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uLCBTY3Jv bGxUeXBlIHNjcm9sbFR5cGUpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29y ZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvci5oCmluZGV4IGIyZTRlZTE3NmJlYzZiNTA3ZDNiOWNjZjIyZWNhMGI3ZWQ4ZmZh YjMuLmQwYjlhNTE2MTFlYzJjMDliZmNjM2Q2MzMxMTU3NmYzYzYzZTgzMDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yLmgKQEAgLTU0LDcgKzU0LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBhcHBseVBlbmRp bmdTY3JvbGxVcGRhdGVzKCk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGFwcGx5U2Nyb2xs VXBkYXRlKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgRmxvYXRQb2ludCYsIHN0ZDo6b3B0aW9uYWw8 RmxvYXRQb2ludD4gbGF5b3V0Vmlld3BvcnRPcmlnaW4sIFNjcm9sbFR5cGUsIFNjcm9sbGluZ0xh eWVyUG9zaXRpb25BY3Rpb24pOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgYXBwbHlTY3JvbGxV cGRhdGUoU2Nyb2xsVXBkYXRlJiYsIFNjcm9sbFR5cGUpOwogCiAjaWYgUExBVEZPUk0oQ09DT0Ep CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBoYW5kbGVXaGVlbEV2ZW50UGhhc2UoU2Nyb2xsaW5n Tm9kZUlELCBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZSkgZmluYWw7CkBAIC0xNTEsNyArMTUxLDgg QEAgcHJpdmF0ZToKICAgICB2b2lkIHNldEV2ZW50VHJhY2tpbmdSZWdpb25zRGlydHkoKTsKICAg ICB2b2lkIHVwZGF0ZUV2ZW50VHJhY2tpbmdSZWdpb25zKCk7CiAgICAgCi0gICAgdm9pZCB1cGRh dGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwoU2Nyb2xsaW5nTm9kZUlELCBjb25zdCBG bG9hdFBvaW50Jiwgc3RkOjpvcHRpb25hbDxGbG9hdFBvaW50PiBsYXlvdXRWaWV3cG9ydE9yaWdp biwgU2Nyb2xsVHlwZSwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbik7CisgICAgdm9pZCBh cHBseVNjcm9sbFBvc2l0aW9uVXBkYXRlKFNjcm9sbFVwZGF0ZSYmLCBTY3JvbGxUeXBlKTsKKyAg ICB2b2lkIHVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChTY3JvbGxpbmdOb2Rl SUQsIGNvbnN0IEZsb2F0UG9pbnQmLCBzdGQ6Om9wdGlvbmFsPEZsb2F0UG9pbnQ+IGxheW91dFZp ZXdwb3J0T3JpZ2luLCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uLCBTY3JvbGxUeXBlKTsK ICAgICAKICAgICBGcmFtZVZpZXcqIGZyYW1lVmlld0ZvclNjcm9sbGluZ05vZGUoU2Nyb2xsaW5n Tm9kZUlEKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3JUeXBlcy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3JUeXBlcy5oCmluZGV4IGVlY2FiNmY1NWI2NWM0NjAx OTlmODBlZjA1MDY1NTJiNzFmMzA4MDMuLjA0N2YyYzU1YTY1YjA1YzYwMTFlM2NmMmYzMmI4YTI3 MmYzZDhlZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ0Nvb3JkaW5hdG9yVHlwZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdDb29yZGluYXRvclR5cGVzLmgKQEAgLTEwMiw2ICsxMDIsMjQgQEAgZW51bSBj bGFzcyBWaWV3cG9ydFJlY3RTdGFiaWxpdHkgewogICAgIENoYW5naW5nT2JzY3VyZWRJbnNldHNJ bnRlcmFjdGl2ZWx5IC8vIFRoaXMgaW1wbGllcyBVbnN0YWJsZS4KIH07CiAKK3N0cnVjdCBTY3Jv bGxVcGRhdGUgeworICAgIFNjcm9sbGluZ05vZGVJRCBub2RlSUQgeyAwIH07CisgICAgRmxvYXRQ b2ludCBzY3JvbGxQb3NpdGlvbjsKKyAgICBzdGQ6Om9wdGlvbmFsPEZsb2F0UG9pbnQ+IGxheW91 dFZpZXdwb3J0T3JpZ2luOworICAgIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24gdXBkYXRl TGF5ZXJQb3NpdGlvbkFjdGlvbiB7IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlN5bmMg fTsKKyAgICAKKyAgICBib29sIGNhbk1lcmdlKGNvbnN0IFNjcm9sbFVwZGF0ZSYgb3RoZXIpIGNv bnN0CisgICAgeworICAgICAgICByZXR1cm4gbm9kZUlEID09IG90aGVyLm5vZGVJRCAmJiB1cGRh dGVMYXllclBvc2l0aW9uQWN0aW9uID09IG90aGVyLnVwZGF0ZUxheWVyUG9zaXRpb25BY3Rpb247 CisgICAgfQorICAgIAorICAgIHZvaWQgbWVyZ2UoU2Nyb2xsVXBkYXRlJiYgb3RoZXIpCisgICAg eworICAgICAgICBzY3JvbGxQb3NpdGlvbiA9IG90aGVyLnNjcm9sbFBvc2l0aW9uOworICAgICAg ICBsYXlvdXRWaWV3cG9ydE9yaWdpbiA9IG90aGVyLmxheW91dFZpZXdwb3J0T3JpZ2luOworICAg IH0KK307CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogbmFtZXNwYWNlIFdURiB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCmluZGV4IDU5 NGE4YWEzYzQ0OWExYmE1ZTNjOTY4MjQ1YzI3MzEwMjg3ZjIyYzkuLmMxYTdlNzdmODljYTViMTYw YmVjNjliNmFkZjkxMWEwMzZmNWU5ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCkBAIC02MTQsNyArNjE0LDcgQEAgdm9pZCBTY3JvbGxp bmdUcmVlOjphZGRQZW5kaW5nU2Nyb2xsVXBkYXRlKFNjcm9sbFVwZGF0ZSYmIHVwZGF0ZSkKICAg ICBtX3BlbmRpbmdTY3JvbGxVcGRhdGVzLmFwcGVuZChXVEZNb3ZlKHVwZGF0ZSkpOwogfQogCi1W ZWN0b3I8U2Nyb2xsaW5nVHJlZTo6U2Nyb2xsVXBkYXRlPiBTY3JvbGxpbmdUcmVlOjp0YWtlUGVu ZGluZ1Njcm9sbFVwZGF0ZXMoKQorVmVjdG9yPFNjcm9sbFVwZGF0ZT4gU2Nyb2xsaW5nVHJlZTo6 dGFrZVBlbmRpbmdTY3JvbGxVcGRhdGVzKCkKIHsKICAgICBMb2NrZXIgbG9ja2VyIHsgbV9wZW5k aW5nU2Nyb2xsVXBkYXRlc0xvY2sgfTsKICAgICByZXR1cm4gc3RkOjpleGNoYW5nZShtX3BlbmRp bmdTY3JvbGxVcGRhdGVzLCB7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZS5oCmluZGV4IDNjYTM0NzM5NGJlM2UzYmRjZTNjNGNkOWY5ZmFkM2JmNzMw NmVlNzYuLmJiNTNkNTA0MTQyZTMyOGQ0NDM0MTQ0YWUxYTljOTc4YWI3NGZmZDggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAgLTIyNCwyNCAr MjI0LDYgQEAgcHVibGljOgogICAgIGJvb2wgaGFzUHJvY2Vzc2VkV2hlZWxFdmVudHNSZWNlbnRs eSgpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgd2lsbFByb2Nlc3NXaGVlbEV2ZW50KCk7CiAK LSAgICBzdHJ1Y3QgU2Nyb2xsVXBkYXRlIHsKLSAgICAgICAgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJ RCB7IDAgfTsKLSAgICAgICAgRmxvYXRQb2ludCBzY3JvbGxQb3NpdGlvbjsKLSAgICAgICAgc3Rk OjpvcHRpb25hbDxGbG9hdFBvaW50PiBsYXlvdXRWaWV3cG9ydE9yaWdpbjsKLSAgICAgICAgU2Ny b2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiB1cGRhdGVMYXllclBvc2l0aW9uQWN0aW9uIHsgU2Ny b2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U3luYyB9OwotICAgICAgICAKLSAgICAgICAgYm9v bCBjYW5NZXJnZShjb25zdCBTY3JvbGxVcGRhdGUmIG90aGVyKSBjb25zdAotICAgICAgICB7Ci0g ICAgICAgICAgICByZXR1cm4gbm9kZUlEID09IG90aGVyLm5vZGVJRCAmJiB1cGRhdGVMYXllclBv c2l0aW9uQWN0aW9uID09IG90aGVyLnVwZGF0ZUxheWVyUG9zaXRpb25BY3Rpb247Ci0gICAgICAg IH0KLSAgICAgICAgCi0gICAgICAgIHZvaWQgbWVyZ2UoU2Nyb2xsVXBkYXRlJiYgb3RoZXIpCi0g ICAgICAgIHsKLSAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0gb3RoZXIuc2Nyb2xsUG9zaXRp b247Ci0gICAgICAgICAgICBsYXlvdXRWaWV3cG9ydE9yaWdpbiA9IG90aGVyLmxheW91dFZpZXdw b3J0T3JpZ2luOwotICAgICAgICB9Ci0gICAgfTsKLQogICAgIHZvaWQgYWRkUGVuZGluZ1Njcm9s bFVwZGF0ZShTY3JvbGxVcGRhdGUmJik7CiAgICAgVmVjdG9yPFNjcm9sbFVwZGF0ZT4gdGFrZVBl bmRpbmdTY3JvbGxVcGRhdGVzKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3BwCmluZGV4IDZjMDExMWU5MGY4M2M4 ZDY1ODlkMDJhZTE0YmJkZmRiZDhlMzBjMDEuLmVhYTAwM2FkMWE5ZTAwNjYxNmM0ZDQ5ZjNkZDky MjZlOWRiM2U4YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Ro cmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcApAQCAtMjA3LDE0ICsyMDcsMTUgQEAgdm9pZCBU aHJlYWRlZFNjcm9sbGluZ1RyZWU6OnNjcm9sbGluZ1RyZWVOb2RlRGlkU2Nyb2xsKFNjcm9sbGlu Z1RyZWVTY3JvbGxpbmdOb2QKICAgICBpZiAoaXM8U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZT4obm9kZSkpCiAgICAgICAgIGxheW91dFZpZXdwb3J0T3JpZ2luID0gZG93bmNhc3Q8U2Ny b2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZT4obm9kZSkubGF5b3V0Vmlld3BvcnQoKS5sb2Nh dGlvbigpOwogCisgICAgYXV0byBzY3JvbGxVcGRhdGUgPSBTY3JvbGxVcGRhdGUgeyBub2RlLnNj cm9sbGluZ05vZGVJRCgpLCBzY3JvbGxQb3NpdGlvbiwgbGF5b3V0Vmlld3BvcnRPcmlnaW4sIHNj cm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24gfTsKKwogICAgIGlmIChSdW5Mb29wOjppc01haW4o KSkgewotICAgICAgICBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yLT5hcHBseVNjcm9sbFVwZGF0ZShu b2RlLnNjcm9sbGluZ05vZGVJRCgpLCBzY3JvbGxQb3NpdGlvbiwgbGF5b3V0Vmlld3BvcnRPcmln aW4sIFNjcm9sbFR5cGU6OlVzZXIsIHNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24pOworICAg ICAgICBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yLT5hcHBseVNjcm9sbFVwZGF0ZShXVEZNb3ZlKHNj cm9sbFVwZGF0ZSksIFNjcm9sbFR5cGU6OlVzZXIpOwogICAgICAgICByZXR1cm47CiAgICAgfQog CiAgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8ICJUaHJlYWRlZFNjcm9s bGluZ1RyZWU6OnNjcm9sbGluZ1RyZWVOb2RlRGlkU2Nyb2xsICIgPDwgbm9kZS5zY3JvbGxpbmdO b2RlSUQoKSA8PCAiIHRvICIgPDwgc2Nyb2xsUG9zaXRpb24gPDwgIiB0cmlnZ2VyaW5nIG1haW4g dGhyZWFkIHJlbmRlcmluZyB1cGRhdGUiKTsKIAotICAgIGF1dG8gc2Nyb2xsVXBkYXRlID0gU2Ny b2xsVXBkYXRlIHsgbm9kZS5zY3JvbGxpbmdOb2RlSUQoKSwgc2Nyb2xsUG9zaXRpb24sIGxheW91 dFZpZXdwb3J0T3JpZ2luLCBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uIH07CiAgICAgYWRk UGVuZGluZ1Njcm9sbFVwZGF0ZShXVEZNb3ZlKHNjcm9sbFVwZGF0ZSkpOwogCiAgICAgYXV0byBk ZWZlcnJlciA9IFdoZWVsRXZlbnRUZXN0TW9uaXRvckNvbXBsZXRpb25EZWZlcnJlciB7IHdoZWVs RXZlbnRUZXN0TW9uaXRvcigpLCByZWludGVycHJldF9jYXN0PFdoZWVsRXZlbnRUZXN0TW9uaXRv cjo6U2Nyb2xsYWJsZUFyZWFJZGVudGlmaWVyPihub2RlLnNjcm9sbGluZ05vZGVJRCgpKSwgV2hl ZWxFdmVudFRlc3RNb25pdG9yOjpTY3JvbGxpbmdUaHJlYWRTeW5jTmVlZGVkIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVt b3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3IubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3IubW0KaW5kZXgg YWMxMTVlMzFmZGQ0YzRlMDljODQ0ZGFlOWFmNjM3ZWIwOTliYjg0Yi4uYjc4MDRjZjA4ZmZjOGZi MDI1ODI2ZDcxY2Y1NDRmZWM1NzJhN2E3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJl ZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvci5tbQpAQCAtMTA3LDcgKzEwNyw4IEBAIHZvaWQg UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmJ1aWxkVHJhbnNhY3Rpb24oUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JUcmFuCiAvLyBOb3RpZmljYXRpb24gZnJvbSB0aGUgVUkgcHJvY2VzcyB0 aGF0IHdlIHNjcm9sbGVkLgogdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvcjo6c2Nyb2xs UG9zaXRpb25DaGFuZ2VkRm9yTm9kZShTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBjb25zdCBGbG9h dFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCBzeW5jTGF5ZXJQb3NpdGlvbikKIHsKLSAgICBh cHBseVNjcm9sbFVwZGF0ZShub2RlSUQsIHNjcm9sbFBvc2l0aW9uLCBzdGQ6Om51bGxvcHQsIFNj cm9sbFR5cGU6OlVzZXIsIHN5bmNMYXllclBvc2l0aW9uID8gU2Nyb2xsaW5nTGF5ZXJQb3NpdGlv bkFjdGlvbjo6U3luYyA6IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlNldCk7CisgICAg YXV0byBzY3JvbGxVcGRhdGUgPSBTY3JvbGxVcGRhdGUgeyBub2RlSUQsIHNjcm9sbFBvc2l0aW9u LCB7IH0sIHN5bmNMYXllclBvc2l0aW9uID8gU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6 U3luYyA6IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlNldCB9OworICAgIGFwcGx5U2Ny b2xsVXBkYXRlKFdURk1vdmUoc2Nyb2xsVXBkYXRlKSwgU2Nyb2xsVHlwZTo6VXNlcik7CiB9CiAK IHZvaWQgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmN1cnJlbnRTbmFwUG9pbnRJbmRpY2Vz Q2hhbmdlZEZvck5vZGUoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgc3RkOjpvcHRpb25hbDx1bnNp Z25lZD4gaG9yaXpvbnRhbCwgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gdmVydGljYWwpCg==