192398 2018-12-05 05:37:05 -0800 Minor refactoring of the scrolling code 2019-01-22 08:59:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 176914 192395 1 fred.wang fred.wang commit-queue simon.fraser webkit-bug-importer oldest_to_newest 1485214 0 fred.wang 2018-12-05 05:37:05 -0800 Minor refactoring of the scrolling tree 1485217 1 356598 fred.wang 2018-12-05 05:44:08 -0800 Created attachment 356598 Patch 1485285 2 356598 simon.fraser 2018-12-05 10:21:00 -0800 Comment on attachment 356598 Patch Clearing flags on attachment: 356598 Committed r238898: <https://trac.webkit.org/changeset/238898> 1485286 3 simon.fraser 2018-12-05 10:21:02 -0800 All reviewed patches have been landed. Closing bug. 1485287 4 webkit-bug-importer 2018-12-05 10:22:32 -0800 <rdar://problem/46491395> 1496781 5 356598 fred.wang 2019-01-22 08:51:56 -0800 Comment on attachment 356598 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=356598&action=review > Source/WebCore/page/scrolling/ScrollingStateTree.h:37 > +class ScrollingStateFrameScrollingNode; I think this has caused ScrollingStateScrollingNode.h from not being included from ScrollingTreeScrollingNode.cpp, hence possible build error when unified sources rotate. Will land a fix. 1496783 6 fred.wang 2019-01-22 08:59:22 -0800 Committed r240252: <https://trac.webkit.org/changeset/240252> 356598 2018-12-05 05:44:08 -0800 2018-12-05 10:21:00 -0800 Patch bug-192398-20181205144407.patch text/plain 11561 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4ODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI1ZTIxYmJiMjY3NDA2 Zjc4ODM4Y2Q3MmViZDMxZWMwYTU0NjU0MC4uYjJjZWMzM2JjMGNlMjg4NWI0MmE1MjU2ZGZmMjIx ZmJkMjhkMzIzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE4LTEyLTA1ICBGcmVk ZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAgICAgICBNaW5vciByZWZhY3Rvcmlu ZyBvZiB0aGUgc2Nyb2xsaW5nIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MjM5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEJhc2VkIG9uIGFuIGVhcmxpZXIgcGF0Y2ggYnkgU2ltb24gRnJhc2Vy LgorCisgICAgICAgIFRoaXMgcGF0Y2ggcGVyZm9ybXMgc29tZSBtaW5vciByZWZhY3RvcmluZyBv ZiB0aGUgc2Nyb2xsaW5nIGNvZGU6CisgICAgICAgIC0gUmVuYW1lIFNjcm9sbGluZ0Nvb3JkaW5h dG9yOjp1bmlxdWVTY3JvbGxMYXllcklEKCkgdG8gdW5pcXVlU2Nyb2xsaW5nTm9kZUlEKCkgc2lu Y2UgaXQKKyAgICAgICAgICBpcyByZWFsbHkgYSBub2RlIGlkLgorICAgICAgICAtIElubGluZSBT Y3JvbGxpbmdTdGF0ZVRyZWU6OnNldFJvb3RTdGF0ZU5vZGUoKSBzbyB3ZSBvbmx5IG5lZWQgdG8g Zm9yd2FyZCBkZWNsYXJlCisgICAgICAgICAgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGUgaW4gaGVhZGVycy4KKyAgICAgICAgLSBQYXNzIGFyZ3VtZW50IHRvIFNjcm9sbGluZ1N0YXRl VHJlZTo6YWRkTm9kZSgpIGFzIGEgcmVmZXJlbmNlIHJhdGhlciB0aGFuIGEgcG9pbnRlci4KKyAg ICAgICAgLSBJbml0aWFsaXplIFNjcm9sbGluZ1N0YXRlVHJlZTo6bV9jaGFuZ2VkUHJvcGVydGll cyBhbmQgU2Nyb2xsaW5nU3RhdGVUcmVlOjptX3BhcmVudCBpbgorICAgICAgICAgIHRoZSBoZWFk ZXIgZmlsZS4KKyAgICAgICAgLSBSZW1vdmUgb2Jzb2xldGUgY29tbWVudCBhYm91dCBTY3JvbGxp bmdDb29yZGluYXRvck1hYy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGJlaGF2aW9yIHVuY2hh bmdlZC4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yOjp1bmlxdWVTY3JvbGxp bmdOb2RlSUQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVuaXF1 ZVNjcm9sbExheWVySUQpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3Rh dGVOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlTm9kZTo6U2Nyb2xs aW5nU3RhdGVOb2RlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5v ZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVUcmVlOjphdHRhY2hOb2RlKToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJlZTo6c2V0Um9vdFN0YXRlTm9kZSk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVRyZWU6OmFkZE5vZGUpOgorICAgICAgICAqIHBh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsaW5nU3RhdGVUcmVlOjpzZXRSb290U3RhdGVOb2RlKTogRGVsZXRlZC4KKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGlu Zy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5oOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjphdHRhY2hTY3JvbGxpbmdOb2RlKToKKwogMjAxOC0xMi0wNSAg Um9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtNYWNdIEhFQUQgcmVxdWVz dHMgY2hhbmdlZCB0byBHRVQgYWZ0ZXIgMzAxLCAzMDIsIGFuZCAzMDMgcmVkaXJlY3Rpb25zICho dHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2hlYWQtcmVkaXJlY3Rpb24uaHRtbCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cAppbmRleCBmNTAyMjFhNTFjZTdlZjNjOTIxMTYyNmExYjFlYWQ2NmRhOTlmZWE5Li4yODE4ZWE5 NGJmMGU5M2I0MzAzMWJlOTM0YWU2Y2I3MDhiZTgyMWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBAIC0zNjEs MTAgKzM2MSwxMCBAQCBib29sIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpzaG91bGRVcGRhdGVTY3Jv bGxMYXllclBvc2l0aW9uU3luY2hyb25vdXNseShjb25zdCBGcgogICAgIHJldHVybiB0cnVlOwog fQogCi1TY3JvbGxpbmdOb2RlSUQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVuaXF1ZVNjcm9sbExh eWVySUQoKQorU2Nyb2xsaW5nTm9kZUlEIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjp1bmlxdWVTY3Jv bGxpbmdOb2RlSUQoKQogewotICAgIHN0YXRpYyBTY3JvbGxpbmdOb2RlSUQgdW5pcXVlU2Nyb2xs TGF5ZXJJRCA9IDE7Ci0gICAgcmV0dXJuIHVuaXF1ZVNjcm9sbExheWVySUQrKzsKKyAgICBzdGF0 aWMgU2Nyb2xsaW5nTm9kZUlEIHVuaXF1ZVNjcm9sbGluZ05vZGVJRCA9IDE7CisgICAgcmV0dXJu IHVuaXF1ZVNjcm9sbGluZ05vZGVJRCsrOwogfQogCiBTdHJpbmcgU2Nyb2xsaW5nQ29vcmRpbmF0 b3I6OnNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dChTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhh dmlvcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdDb29yZGluYXRvci5oCmluZGV4IGY5MTcwODlhNWFmZTQyOWM2NjMxYmQyZjcxNTdmZjNl YWUxZTBlZGIuLjUzYTY5MThlYzJlZWU2OTg5NmU4MTI3YTQ3NTY5M2UwYjllMDY4MWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9y LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuaApAQCAtMTYxLDcgKzE2MSw2IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHNldEZvcmNlU3luY2hyb25vdXNTY3JvbGxMYXllclBvc2l0aW9uVXBkYXRlcyhib29sKTsKIAog ICAgIC8vIFRoZXNlIHZpcnR1YWwgZnVuY3Rpb25zIGFyZSBjdXJyZW50bHkgdW5pcXVlIHRvIHRo ZSB0aHJlYWRlZCBzY3JvbGxpbmcgYXJjaGl0ZWN0dXJlLiAKLSAgICAvLyBUaGVpciBtZWFuaW5n ZnVsIGltcGxlbWVudGF0aW9ucyBhcmUgaW4gU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMuCiAgICAg dmlydHVhbCB2b2lkIGNvbW1pdFRyZWVTdGF0ZUlmTmVlZGVkKCkgeyB9CiAgICAgdmlydHVhbCBi b29sIHJlcXVlc3RTY3JvbGxQb3NpdGlvblVwZGF0ZShGcmFtZVZpZXcmLCBjb25zdCBJbnRQb2lu dCYpIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGhhbmRsZVdoZWVsRXZlbnQo RnJhbWVWaWV3JiwgY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JikgeyByZXR1cm4gdHJ1ZTsgfQpA QCAtMTk4LDggKzE5Nyw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU2Nyb2xs U25hcFByb3BlcnRpZXNXaXRoRnJhbWVWaWV3KGNvbnN0IEZyYW1lVmlldyYpIHsgfQogICAgIHZp cnR1YWwgdm9pZCBzZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoU2Nyb2xsUGlubmluZ0JlaGF2aW9y KSB7IH0KIAotICAgIC8vIEdlbmVyYXRlZCBhIHVuaXF1ZSBpZCBmb3Igc2Nyb2xsIGxheWVycy4K LSAgICBTY3JvbGxpbmdOb2RlSUQgdW5pcXVlU2Nyb2xsTGF5ZXJJRCgpOworICAgIC8vIEdlbmVy YXRlZCBhIHVuaXF1ZSBpZCBmb3Igc2Nyb2xsaW5nIG5vZGVzLgorICAgIFNjcm9sbGluZ05vZGVJ RCB1bmlxdWVTY3JvbGxpbmdOb2RlSUQoKTsKIAogICAgIGVudW0gTWFpblRocmVhZFNjcm9sbGlu Z1JlYXNvbkZsYWdzIHsKICAgICAgICAgRm9yY2VkT25NYWluVGhyZWFkICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxIDw8IDAsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmNwcAppbmRleCA0YzdlMTQz ZmEyZmMwYTg2ZTRlYTY3N2NlMGRhNWYwMTZhMzJhZjlkLi5kOWJmN2M1ZTY4MDQwYzNiNDc4NjVl NGQ3NjdjYjE1MTNlZmVjYTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAKQEAgLTM5LDkgKzM5LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogU2Nyb2xsaW5nU3RhdGVOb2RlOjpTY3JvbGxpbmdTdGF0ZU5vZGUoU2Nyb2xs aW5nTm9kZVR5cGUgbm9kZVR5cGUsIFNjcm9sbGluZ1N0YXRlVHJlZSYgc2Nyb2xsaW5nU3RhdGVU cmVlLCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQogICAgIDogbV9ub2RlVHlwZShub2RlVHlwZSkK ICAgICAsIG1fbm9kZUlEKG5vZGVJRCkKLSAgICAsIG1fY2hhbmdlZFByb3BlcnRpZXMoMCkKICAg ICAsIG1fc2Nyb2xsaW5nU3RhdGVUcmVlKHNjcm9sbGluZ1N0YXRlVHJlZSkKLSAgICAsIG1fcGFy ZW50KG51bGxwdHIpCiB7CiB9CiAKQEAgLTUyLDExICs1MCwxMCBAQCBTY3JvbGxpbmdTdGF0ZU5v ZGU6OlNjcm9sbGluZ1N0YXRlTm9kZShjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUmIHN0YXRlTm9k ZSwgU2NybwogICAgICwgbV9ub2RlSUQoc3RhdGVOb2RlLnNjcm9sbGluZ05vZGVJRCgpKQogICAg ICwgbV9jaGFuZ2VkUHJvcGVydGllcyhzdGF0ZU5vZGUuY2hhbmdlZFByb3BlcnRpZXMoKSkKICAg ICAsIG1fc2Nyb2xsaW5nU3RhdGVUcmVlKGFkb3B0aXZlVHJlZSkKLSAgICAsIG1fcGFyZW50KG51 bGxwdHIpCiB7CiAgICAgaWYgKGhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxMYXllcikpCiAgICAg ICAgIHNldExheWVyKHN0YXRlTm9kZS5sYXllcigpLnRvUmVwcmVzZW50YXRpb24oYWRvcHRpdmVU cmVlLnByZWZlcnJlZExheWVyUmVwcmVzZW50YXRpb24oKSkpOwotICAgIHNjcm9sbGluZ1N0YXRl VHJlZSgpLmFkZE5vZGUodGhpcyk7CisgICAgc2Nyb2xsaW5nU3RhdGVUcmVlKCkuYWRkTm9kZSgq dGhpcyk7CiB9CiAKIFNjcm9sbGluZ1N0YXRlTm9kZTo6flNjcm9sbGluZ1N0YXRlTm9kZSgpID0g ZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1N0YXRlTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n U3RhdGVOb2RlLmgKaW5kZXggNDU1ZGMxYWRmYWU4MGI3YTA4ZGVhYWY0ZTNjNzQ1OGE2NjU0YmY1 Mi4uZjMxMDQ4NzQ1NGY0Y2M0MTU2ODM4NmUwNzk4NGIwMTM3ODc5MGJhOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKQEAgLTI0 OCwxMiArMjQ4LDEyIEBAIHByaXZhdGU6CiAgICAgdm9pZCBkdW1wKFdURjo6VGV4dFN0cmVhbSYs IFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yKSBjb25zdDsKIAogICAgIGNvbnN0IFNj cm9sbGluZ05vZGVUeXBlIG1fbm9kZVR5cGU7Ci0gICAgU2Nyb2xsaW5nTm9kZUlEIG1fbm9kZUlE OwotICAgIENoYW5nZWRQcm9wZXJ0aWVzIG1fY2hhbmdlZFByb3BlcnRpZXM7CisgICAgY29uc3Qg U2Nyb2xsaW5nTm9kZUlEIG1fbm9kZUlEOworICAgIENoYW5nZWRQcm9wZXJ0aWVzIG1fY2hhbmdl ZFByb3BlcnRpZXMgeyAwIH07CiAKICAgICBTY3JvbGxpbmdTdGF0ZVRyZWUmIG1fc2Nyb2xsaW5n U3RhdGVUcmVlOwogCi0gICAgU2Nyb2xsaW5nU3RhdGVOb2RlKiBtX3BhcmVudDsKKyAgICBTY3Jv bGxpbmdTdGF0ZU5vZGUqIG1fcGFyZW50IHsgbnVsbHB0ciB9OwogICAgIHN0ZDo6dW5pcXVlX3B0 cjxWZWN0b3I8UmVmUHRyPFNjcm9sbGluZ1N0YXRlTm9kZT4+PiBtX2NoaWxkcmVuOwogCiAgICAg TGF5ZXJSZXByZXNlbnRhdGlvbiBtX2xheWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5jcHAKaW5kZXggYjMzYWEwY2RhZmU0OTdh MmY4ZjljYTZiN2IwNzlmNDUyZmE3YjA3Ni4uNzBhOTVmNDdlNjhhYmY0ODg0MWRhZDU5ZjM4ZGY1 MDU4ZjVjOTNjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdTdGF0ZVRyZWUuY3BwCkBAIC0xMDUsNyArMTA1LDcgQEAgU2Nyb2xsaW5nTm9kZUlE IFNjcm9sbGluZ1N0YXRlVHJlZTo6YXR0YWNoTm9kZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlw ZSwgU2Nyb2wKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAgICAgICAvLyBJZiB0aGUg dHlwZSBoYXMgY2hhbmdlZCwgd2UgbmVlZCB0byBkZXN0cm95IGFuZCByZWNyZWF0ZSB0aGUgbm9k ZSB3aXRoIGEgbmV3IElELgogICAgICAgICBpZiAobm9kZVR5cGUgIT0gbm9kZS0+bm9kZVR5cGUo KSkKLSAgICAgICAgICAgIG5ld05vZGVJRCA9IG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVuaXF1 ZVNjcm9sbExheWVySUQoKTsKKyAgICAgICAgICAgIG5ld05vZGVJRCA9IG1fc2Nyb2xsaW5nQ29v cmRpbmF0b3ItPnVuaXF1ZVNjcm9sbGluZ05vZGVJRCgpOwogI2VuZGlmCiAKICAgICAgICAgLy8g VGhlIG5vZGUgaXMgYmVpbmcgcmUtcGFyZW50ZWQuIFRvIGRvIHRoYXQsIHdlJ2xsIHJlbW92ZSBp dCwgYW5kIHRoZW4gY3JlYXRlIGEgbmV3IG5vZGUuCkBAIC0xOTYsOSArMTk2LDE0IEBAIHN0ZDo6 dW5pcXVlX3B0cjxTY3JvbGxpbmdTdGF0ZVRyZWU+IFNjcm9sbGluZ1N0YXRlVHJlZTo6Y29tbWl0 KExheWVyUmVwcmVzZW50YXRpCiAgICAgcmV0dXJuIHRyZWVTdGF0ZUNsb25lOwogfQogCi12b2lk IFNjcm9sbGluZ1N0YXRlVHJlZTo6YWRkTm9kZShTY3JvbGxpbmdTdGF0ZU5vZGUqIG5vZGUpCit2 b2lkIFNjcm9sbGluZ1N0YXRlVHJlZTo6c2V0Um9vdFN0YXRlTm9kZShSZWY8U2Nyb2xsaW5nU3Rh dGVGcmFtZVNjcm9sbGluZ05vZGU+JiYgcm9vdFN0YXRlTm9kZSkKIHsKLSAgICBtX3N0YXRlTm9k ZU1hcC5hZGQobm9kZS0+c2Nyb2xsaW5nTm9kZUlEKCksIG5vZGUpOworICAgIG1fcm9vdFN0YXRl Tm9kZSA9IFdURk1vdmUocm9vdFN0YXRlTm9kZSk7Cit9CisKK3ZvaWQgU2Nyb2xsaW5nU3RhdGVU cmVlOjphZGROb2RlKFNjcm9sbGluZ1N0YXRlTm9kZSYgbm9kZSkKK3sKKyAgICBtX3N0YXRlTm9k ZU1hcC5hZGQobm9kZS5zY3JvbGxpbmdOb2RlSUQoKSwgJm5vZGUpOwogfQogCiB2b2lkIFNjcm9s bGluZ1N0YXRlVHJlZTo6cmVtb3ZlTm9kZUFuZEFsbERlc2NlbmRhbnRzKFNjcm9sbGluZ1N0YXRl Tm9kZSogbm9kZSwgU3ViZnJhbWVOb2RlUmVtb3ZhbCBzdWJmcmFtZU5vZGVSZW1vdmFsKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVUcmVl LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuaApp bmRleCAzYjI1NjE1MWFkNzQ0YmNmMDIzNGQ3MmQ0ZmQzYTBjNzVkNDM2OTExLi5jYzllNTcxYWJk ODNiOWIwN2Y4NjcwM2UwYTViYjQ4ZDY4OWEyMjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuaApAQCAtMjcsMTIgKzI3LDE0IEBA CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKSB8fCBVU0UoQ09PUkRJTkFURURfR1JBUEhJ Q1MpCiAKLSNpbmNsdWRlICJTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oIgorI2lu Y2x1ZGUgIlNjcm9sbGluZ0Nvb3JkaW5hdG9yLmgiCisjaW5jbHVkZSAiU2Nyb2xsaW5nU3RhdGVO b2RlLmgiCiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CiBjbGFzcyBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOworY2xhc3MgU2Nyb2xsaW5nU3RhdGVG cmFtZVNjcm9sbGluZ05vZGU7CiAKIC8vIFRoZSBTY3JvbGxpbmdTdGF0ZVRyZWUgaXMgYSB0cmVl IHRoYXQgbWFuYWdlZCBTY3JvbGxpbmdTdGF0ZU5vZGVzLiBUaGUgbm9kZXMga2VlcCB0cmFjayBv ZiB0aGUgY3VycmVudAogLy8gc3RhdGUgb2Ygc2Nyb2xsaW5nIHJlbGF0ZWQgcHJvcGVydGllcy4g V2hlbmV2ZXIgYW55IHByb3BlcnRpZXMgY2hhbmdlLCB0aGUgc2Nyb2xsaW5nIGNvb3JkaW5hdG9y CkBAIC03NCw4ICs3Niw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFByZWZlcnJlZExheWVyUmVw cmVzZW50YXRpb24oTGF5ZXJSZXByZXNlbnRhdGlvbjo6VHlwZSByZXByZXNlbnRhdGlvbikgeyBt X3ByZWZlcnJlZExheWVyUmVwcmVzZW50YXRpb24gPSByZXByZXNlbnRhdGlvbjsgfQogCiBwcml2 YXRlOgotICAgIHZvaWQgc2V0Um9vdFN0YXRlTm9kZShSZWY8U2Nyb2xsaW5nU3RhdGVGcmFtZVNj cm9sbGluZ05vZGU+JiYgcm9vdFN0YXRlTm9kZSkgeyBtX3Jvb3RTdGF0ZU5vZGUgPSBXVEZNb3Zl KHJvb3RTdGF0ZU5vZGUpOyB9Ci0gICAgdm9pZCBhZGROb2RlKFNjcm9sbGluZ1N0YXRlTm9kZSop OworICAgIHZvaWQgc2V0Um9vdFN0YXRlTm9kZShSZWY8U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9s bGluZ05vZGU+JiYpOworICAgIHZvaWQgYWRkTm9kZShTY3JvbGxpbmdTdGF0ZU5vZGUmKTsKIAog ICAgIFJlZjxTY3JvbGxpbmdTdGF0ZU5vZGU+IGNyZWF0ZU5vZGUoU2Nyb2xsaW5nTm9kZVR5cGUs IFNjcm9sbGluZ05vZGVJRCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZS5jcHAKaW5kZXggZWY0ZDVjNDQ2MjFhOWM2NTFmZTQ0YTZjNjQwNTQwODA4 OTRmNjFlNS4uMDNkZmJlNDlmYzk4YmU4NzAzYTA0NmM3YTgxNmJlNjAwZTNjOTkzZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTMx LDYgKzMxLDcgQEAKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5o IgogI2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgorI2luY2x1ZGUgIlNjcm9sbGluZ1N0 YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmgiCiAjaW5jbHVkZSAiU2Nyb2xsaW5nU3RhdGVUcmVlLmgi CiAjaW5jbHVkZSAiU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5oIgogI2luY2x1ZGUg IlNjcm9sbGluZ1RyZWVOb2RlLmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5oIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVNYWMuaAppbmRleCBhODk0MjMzZTFhMDVhZDc4MWM3NGZkMmY3MTk2M2FjNzg3NjlkNmUxLi4y YzgxOTBkZmFmODMzODRlZDBhZDEzOWE1ZTc4MTBiNGY2MDE2MDJlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLmgKQEAgLTI5LDYgKzI5LDcgQEAKIAogI2luY2x1 ZGUgIlNjcm9sbENvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJTY3JvbGxiYXJUaGVtZU1hYy5oIgor I2luY2x1ZGUgIlNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmgiCiAjaW5jbHVkZSAi U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5oIgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5Q dHIuaD4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcAppbmRleCBlYzJmNWEwNTM5ZDA3N2ExYzYzZjQ5Yzk0YjE2MzE3NDYzNTk4NGRi Li43N2IwMTIwZmJhZWQzMjIzNmQwM2Y3ZTg1OGRjZDc4MTlmZGE1MDVlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMzgz NSw3ICszODM1LDcgQEAgU2Nyb2xsaW5nTm9kZUlEIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6YXR0 YWNoU2Nyb2xsaW5nTm9kZShSZW5kZXJMYXllciYgbGF5ZXIsIFMKICAgICBMYXllclNjcm9sbENv b3JkaW5hdGlvblJvbGUgcm9sZSA9IHNjcm9sbENvb3JkaW5hdGlvblJvbGVGb3JOb2RlVHlwZShu b2RlVHlwZSk7CiAgICAgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCA9IGJhY2tpbmctPnNjcm9sbGlu Z05vZGVJREZvclJvbGUocm9sZSk7CiAgICAgaWYgKCFub2RlSUQpCi0gICAgICAgIG5vZGVJRCA9 IHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT51bmlxdWVTY3JvbGxMYXllcklEKCk7CisgICAgICAgIG5v ZGVJRCA9IHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT51bmlxdWVTY3JvbGxpbmdOb2RlSUQoKTsKIAog ICAgIG5vZGVJRCA9IHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5hdHRhY2hUb1N0YXRlVHJlZShub2Rl VHlwZSwgbm9kZUlELCBwYXJlbnROb2RlSUQpOwogICAgIGlmICghbm9kZUlEKQo=