226805 2021-06-08 21:55:55 -0700 Clean up scrollbar creation code in RenderLayerScrollableArea 2021-06-09 09:56:09 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser achristensen changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan zimmermann oldest_to_newest 1768048 0 simon.fraser 2021-06-08 21:55:55 -0700 Clean up scrollbar creation code in RenderLayerScrollableArea 1768049 1 430940 simon.fraser 2021-06-08 21:57:50 -0700 Created attachment 430940 Patch 1768160 2 430940 zalan 2021-06-09 06:52:44 -0700 Comment on attachment 430940 Patch Sometimes the nullopt value of optional<bool> puzzles me. It's not too bad here though. 1768196 3 ews-feeder 2021-06-09 09:02:30 -0700 Committed r278661 (238643@main): <https://commits.webkit.org/238643@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430940. 1768197 4 webkit-bug-importer 2021-06-09 09:03:20 -0700 <rdar://problem/79079650> 1768208 5 achristensen 2021-06-09 09:47:47 -0700 This seems to have broken the Windows build. https://ews-build.webkit.org/#/builders/10/builds/95353 1768209 6 simon.fraser 2021-06-09 09:54:20 -0700 Fixing 1768211 7 simon.fraser 2021-06-09 09:56:09 -0700 Fixed in r278664. 430940 2021-06-08 21:57:50 -0700 2021-06-09 09:02:31 -0700 Patch bug-226805-20210608215749.patch text/plain 15267 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWZkYjE3YmQ3MTA4NTdh N2U4MmU5MmU1NGFkNjM3MTljNDJkYWQzOS4uMGY3YjQ5MTQ0MmFhMjkzZmIwODRiZjc2ZDM5ZjJk ZDk4NzQ1YzYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA2LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIHNj cm9sbGJhciBjcmVhdGlvbiBjb2RlIGluIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjgwNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNoYXJlIGNvZGUgYmV0 d2VlbiB1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJTdHlsZUNoYW5nZSgpIGFuZCB1cGRhdGVTY3JvbGxi YXJzQWZ0ZXJMYXlvdXQoKSB3aGljaAorICAgICAgICBoYWQgYSBsb3Qgb2YgY29tbW9uIGxvZ2lj LiB1cGRhdGVTY3JvbGxiYXJQcmVzZW5jZUFuZFN0YXRlKCkgdGFrZXMgdHdvIG9wdGlvbmFscywg aW5kaWNhdGluZworICAgICAgICB3aGV0aGVyIGluZm9ybWF0aW9uIGFib3V0IG92ZXJmbG93IGlz IGF2YWlsYWJsZSAod2hpY2ggaXMgb25seSB0aGUgY2FzZSBhZnRlciBsYXlvdXQpLgorCisgICAg ICAgIEFsc28gbWFrZSBsb3RzIG9mIG1lbWJlciBmdW5jdGlvbiBkZWNsYXJhdGlvbnMgcHJpdmF0 ZSBpbiBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNv bXBvc2l0b3I6OnVwZGF0ZVNjcm9sbGluZ05vZGVMYXllcnMpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyU2Nyb2xsYWJsZUFyZWE6OnVwZGF0ZVNjcm9sbGJhclByZXNlbmNlQW5kU3RhdGUpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6dXBkYXRlU2Nyb2xs YmFyc0FmdGVyU3R5bGVDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJTY3Jv bGxhYmxlQXJlYTo6dXBkYXRlU2Nyb2xsYmFyc0FmdGVyTGF5b3V0KToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oOgorCiAyMDIxLTA2LTA3ICBXZW5zb24g SHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFVwc3RyZWFtIFdlYktp dCBzdXBwb3J0IGZvciBMaXZlIFRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggMWQ3MzliYTE4YTU5M2VlYjgzODk0MDQ2 NDY0OTA5NGEzZGY3YzE2My4uMTFjOWZmN2FkNGViM2ZlMWUyYjExODcwZDk0Mjg1MjhkZmVlNTVl NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAKQEAgLTQ2ODksOSArNDY4OSw2IEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjpwYXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0KGNvbnN0IFJlbmRlckxheWVyCiAK IHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxpbmdOb2RlTGF5ZXJzKFNj cm9sbGluZ05vZGVJRCBub2RlSUQsIFJlbmRlckxheWVyJiBsYXllciwgU2Nyb2xsaW5nQ29vcmRp bmF0b3ImIHNjcm9sbGluZ0Nvb3JkaW5hdG9yKQogewotICAgIGF1dG8qIHNjcm9sbGFibGVBcmVh ID0gbGF5ZXIuc2Nyb2xsYWJsZUFyZWEoKTsKLSAgICBBU1NFUlQoc2Nyb2xsYWJsZUFyZWEpOwot CiAgICAgaWYgKGxheWVyLmlzUmVuZGVyVmlld0xheWVyKCkpIHsKICAgICAgICAgRnJhbWVWaWV3 JiBmcmFtZVZpZXcgPSBtX3JlbmRlclZpZXcuZnJhbWVWaWV3KCk7CiAgICAgICAgIHNjcm9sbGlu Z0Nvb3JkaW5hdG9yLnNldE5vZGVMYXllcnMobm9kZUlELCB7IG51bGxwdHIsCkBAIC00Njk5LDYg KzQ2OTYsOSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsaW5nTm9k ZUxheWVycyhTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBSZQogICAgICAgICAgICAgZml4ZWRSb290 QmFja2dyb3VuZExheWVyKCksIGNsaXBMYXllcigpLCByb290Q29udGVudHNMYXllcigpLAogICAg ICAgICAgICAgZnJhbWVWaWV3LmxheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhcigpLCBmcmFtZVZp ZXcubGF5ZXJGb3JWZXJ0aWNhbFNjcm9sbGJhcigpIH0pOwogICAgIH0gZWxzZSB7CisgICAgICAg IGF1dG8qIHNjcm9sbGFibGVBcmVhID0gbGF5ZXIuc2Nyb2xsYWJsZUFyZWEoKTsKKyAgICAgICAg QVNTRVJUKHNjcm9sbGFibGVBcmVhKTsKKwogICAgICAgICBhdXRvJiBiYWNraW5nID0gKmxheWVy LmJhY2tpbmcoKTsKICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3Iuc2V0Tm9kZUxheWVycyhu b2RlSUQsIHsgYmFja2luZy5ncmFwaGljc0xheWVyKCksCiAgICAgICAgICAgICBiYWNraW5nLnNj cm9sbENvbnRhaW5lckxheWVyKCksIGJhY2tpbmcuc2Nyb2xsZWRDb250ZW50c0xheWVyKCksCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxl QXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxl QXJlYS5jcHAKaW5kZXggODJkZGNkODRmMTgwNzQ0ZTkwNjhmY2U3NGQyZjBiMWZiZGQwZWZlMy4u MDNiYThlYTUxNjYyODNhOTA0MjRmMGM0Mzg4NDRkZTE1NzUxMzA0NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcApA QCAtMTA2Myw2ICsxMDYzLDczIEBAIGJvb2wgUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6aGFz VmVydGljYWxPdmVyZmxvdygpIGNvbnN0CiAgICAgcmV0dXJuIHNjcm9sbEhlaWdodCgpID4gcm91 bmRUb0ludChtX2xheWVyLnJlbmRlckJveCgpLT5jbGllbnRIZWlnaHQoKSk7CiB9CiAKK3ZvaWQg UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6dXBkYXRlU2Nyb2xsYmFyUHJlc2VuY2VBbmRTdGF0 ZShzdGQ6Om9wdGlvbmFsPGJvb2w+IGhhc0hvcml6b250YWxPdmVyZmxvdywgc3RkOjpvcHRpb25h bDxib29sPiBoYXNWZXJ0aWNhbE92ZXJmbG93KQoreworICAgIGF1dG8qIGJveCA9IG1fbGF5ZXIu cmVuZGVyQm94KCk7CisgICAgQVNTRVJUKGJveCk7CisKKyAgICBlbnVtIGNsYXNzIFNjcm9sbGJh clN0YXRlIHsKKyAgICAgICAgTm9TY3JvbGxiYXIsCisgICAgICAgIEVuYWJsZWQsCisgICAgICAg IERpc2FibGVkCisgICAgfTsKKworICAgIGF1dG8gc2Nyb2xsYmFyRm9yQXhpcyA9IFsmXShTY3Jv bGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbikgLT4gUmVmUHRyPFNjcm9sbGJhcj4mIHsKKyAg ICAgICAgcmV0dXJuIG9yaWVudGF0aW9uID09IFNjcm9sbGJhck9yaWVudGF0aW9uOjpIb3Jpem9u dGFsU2Nyb2xsYmFyID8gbV9oQmFyIDogbV92QmFyOworICAgIH07CisKKyAgICBhdXRvIHN0YXRl Rm9yU2Nyb2xsYmFyID0gWyZdKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBzdGQ6 Om9wdGlvbmFsPGJvb2w+IGhhc092ZXJmbG93LCBTY3JvbGxiYXJTdGF0ZSBub25TY3JvbGxhYmxl U3RhdGUpIHsKKyAgICAgICAgaWYgKGhhc092ZXJmbG93KQorICAgICAgICAgICAgcmV0dXJuICpo YXNPdmVyZmxvdyA/IFNjcm9sbGJhclN0YXRlOjpFbmFibGVkIDogbm9uU2Nyb2xsYWJsZVN0YXRl OworICAgICAgICAKKyAgICAgICAgLy8gSWYgd2UgZG9uJ3QgaGF2ZSBpbmZvcm1hdGlvbiBhYm91 dCBvdmVyZmxvdyAoYmVjYXVzZSB3ZSBoYXZlbid0IGRvbmUgbGF5b3V0IHlldCksIGp1c3QgcmV0 dXJuIHRoZSBjdXJyZW50IHN0YXRlIG9mIHRoZSBzY3JvbGxiYXIuCisgICAgICAgIGF1dG8gZXhp c3RpbmdTY3JvbGxiYXIgPSBzY3JvbGxiYXJGb3JBeGlzKG9yaWVudGF0aW9uKTsKKyAgICAgICAg cmV0dXJuIChleGlzdGluZ1Njcm9sbGJhciAmJiBleGlzdGluZ1Njcm9sbGJhci0+ZW5hYmxlZCgp KSA/IFNjcm9sbGJhclN0YXRlOjpFbmFibGVkIDogbm9uU2Nyb2xsYWJsZVN0YXRlOworICAgIH07 CisKKyAgICBhdXRvIHN0YXRlRm9yU2Nyb2xsYmFyT25BeGlzID0gWyZdKFNjcm9sbGJhck9yaWVu dGF0aW9uIG9yaWVudGF0aW9uLCBzdGQ6Om9wdGlvbmFsPGJvb2w+IGhhc092ZXJmbG93KSB7Cisg ICAgICAgIGlmIChib3gtPmhhc0Fsd2F5c1ByZXNlbnRTY3JvbGxiYXIob3JpZW50YXRpb24pKQor ICAgICAgICAgICAgcmV0dXJuIHN0YXRlRm9yU2Nyb2xsYmFyKG9yaWVudGF0aW9uLCBoYXNPdmVy ZmxvdywgU2Nyb2xsYmFyU3RhdGU6OkRpc2FibGVkKTsKKworICAgICAgICBpZiAoYm94LT5oYXNB dXRvU2Nyb2xsYmFyKG9yaWVudGF0aW9uKSkKKyAgICAgICAgICAgIHJldHVybiBzdGF0ZUZvclNj cm9sbGJhcihvcmllbnRhdGlvbiwgaGFzT3ZlcmZsb3csIFNjcm9sbGJhclN0YXRlOjpOb1Njcm9s bGJhcik7CisKKyAgICAgICAgcmV0dXJuIFNjcm9sbGJhclN0YXRlOjpOb1Njcm9sbGJhcjsKKyAg ICB9OworCisgICAgYXV0byBob3Jpem9udGFsQmFyU3RhdGUgPSBzdGF0ZUZvclNjcm9sbGJhck9u QXhpcyhTY3JvbGxiYXJPcmllbnRhdGlvbjo6SG9yaXpvbnRhbFNjcm9sbGJhciwgaGFzSG9yaXpv bnRhbE92ZXJmbG93KTsKKyAgICBzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKGhvcml6b250YWxC YXJTdGF0ZSAhPSBTY3JvbGxiYXJTdGF0ZTo6Tm9TY3JvbGxiYXIpOworICAgIGlmIChob3Jpem9u dGFsQmFyU3RhdGUgIT0gU2Nyb2xsYmFyU3RhdGU6Ok5vU2Nyb2xsYmFyKQorICAgICAgICBtX2hC YXItPnNldEVuYWJsZWQoaG9yaXpvbnRhbEJhclN0YXRlID09IFNjcm9sbGJhclN0YXRlOjpFbmFi bGVkKTsKKworICAgIGF1dG8gdmVydGljYWxCYXJTdGF0ZSA9IHN0YXRlRm9yU2Nyb2xsYmFyT25B eGlzKFNjcm9sbGJhck9yaWVudGF0aW9uOjpWZXJ0aWNhbFNjcm9sbGJhciwgaGFzVmVydGljYWxP dmVyZmxvdyk7CisgICAgc2V0SGFzVmVydGljYWxTY3JvbGxiYXIodmVydGljYWxCYXJTdGF0ZSAh PSBTY3JvbGxiYXJTdGF0ZTo6Tm9TY3JvbGxiYXIpOworICAgIGlmICh2ZXJ0aWNhbEJhclN0YXRl ICE9IFNjcm9sbGJhclN0YXRlOjpOb1Njcm9sbGJhcikKKyAgICAgICAgbV92QmFyLT5zZXRFbmFi bGVkKHZlcnRpY2FsQmFyU3RhdGUgPT0gU2Nyb2xsYmFyU3RhdGU6OkVuYWJsZWQpOworfQorCit2 b2lkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnVwZGF0ZVNjcm9sbGJhcnNBZnRlclN0eWxl Q2hhbmdlKGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkKK3sKKyAgICAvLyBPdmVyZmxvdyBp cyBhIGJveCBjb25jZXB0LgorICAgIFJlbmRlckJveCogYm94ID0gbV9sYXllci5yZW5kZXJCb3go KTsKKyAgICBpZiAoIWJveCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gTGlzdCBib3ggcGFy dHMgaGFuZGxlIHRoZSBzY3JvbGxiYXJzIGJ5IHRoZW1zZWx2ZXMgc28gd2UgaGF2ZSBub3RoaW5n IHRvIGRvLgorICAgIGlmIChib3gtPnN0eWxlKCkuYXBwZWFyYW5jZSgpID09IExpc3Rib3hQYXJ0 KQorICAgICAgICByZXR1cm47CisKKyAgICBib29sIGhhZFZlcnRpY2FsU2Nyb2xsYmFyID0gaGFz VmVydGljYWxTY3JvbGxiYXIoKTsKKyAgICB1cGRhdGVTY3JvbGxiYXJQcmVzZW5jZUFuZFN0YXRl KCk7CisgICAgYm9vbCBoYXNWZXJ0aWNhbFNjcm9sbGJhciA9IHRoaXMtPmhhc1ZlcnRpY2FsU2Ny b2xsYmFyKCk7CisKKyAgICBpZiAoaGFkVmVydGljYWxTY3JvbGxiYXIgIT0gaGFzVmVydGljYWxT Y3JvbGxiYXIgfHwgKGhhc1ZlcnRpY2FsU2Nyb2xsYmFyICYmIG9sZFN0eWxlICYmIG9sZFN0eWxl LT5zaG91bGRQbGFjZVZlcnRpY2FsU2Nyb2xsYmFyT25MZWZ0KCkgIT0gYm94LT5zdHlsZSgpLnNo b3VsZFBsYWNlVmVydGljYWxTY3JvbGxiYXJPbkxlZnQoKSkpCisgICAgICAgIGNvbXB1dGVTY3Jv bGxPcmlnaW4oKTsKKworICAgIGlmICghbV9zY3JvbGxEaW1lbnNpb25zRGlydHkpCisgICAgICAg IHVwZGF0ZVNjcm9sbGFibGVBcmVhU2V0KGhhc1Njcm9sbGFibGVIb3Jpem9udGFsT3ZlcmZsb3co KSB8fCBoYXNTY3JvbGxhYmxlVmVydGljYWxPdmVyZmxvdygpKTsKK30KKwogdm9pZCBSZW5kZXJM YXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJMYXlvdXQoKQogewogICAg IFJlbmRlckJveCogYm94ID0gbV9sYXllci5yZW5kZXJCb3goKTsKQEAgLTEwNzIsNDcgKzExMzks MzggQEAgdm9pZCBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxiYXJzQWZ0 ZXJMYXlvdXQoKQogICAgIGlmIChib3gtPnN0eWxlKCkuYXBwZWFyYW5jZSgpID09IExpc3Rib3hQ YXJ0KQogICAgICAgICByZXR1cm47CiAKLSAgICBib29sIGhhc0hvcml6b250YWxPdmVyZmxvdyA9 IHRoaXMtPmhhc0hvcml6b250YWxPdmVyZmxvdygpOwotICAgIGJvb2wgaGFzVmVydGljYWxPdmVy ZmxvdyA9IHRoaXMtPmhhc1ZlcnRpY2FsT3ZlcmZsb3coKTsKKyAgICBib29sIGhhZEhvcml6b250 YWxTY3JvbGxiYXIgPSBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyKCk7CisgICAgYm9vbCBoYWRWZXJ0 aWNhbFNjcm9sbGJhciA9IGhhc1ZlcnRpY2FsU2Nyb2xsYmFyKCk7CiAKLSAgICAvLyBJZiBvdmVy ZmxvdyByZXF1aXJlcyBhIHNjcm9sbGJhciwgdGhlbiB3ZSBqdXN0IG5lZWQgdG8gZW5hYmxlIG9y IGRpc2FibGUuCi0gICAgYXV0byYgcmVuZGVyZXIgPSBtX2xheWVyLnJlbmRlcmVyKCk7Ci0gICAg aWYgKG1faEJhciAmJiBib3gtPmhhc0Fsd2F5c1ByZXNlbnRTY3JvbGxiYXIoU2Nyb2xsYmFyT3Jp ZW50YXRpb246Okhvcml6b250YWxTY3JvbGxiYXIpKQotICAgICAgICBtX2hCYXItPnNldEVuYWJs ZWQoaGFzSG9yaXpvbnRhbE92ZXJmbG93KTsKLSAgICBpZiAobV92QmFyICYmIGJveC0+aGFzQWx3 YXlzUHJlc2VudFNjcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbjo6VmVydGljYWxTY3JvbGxi YXIpKQotICAgICAgICBtX3ZCYXItPnNldEVuYWJsZWQoaGFzVmVydGljYWxPdmVyZmxvdyk7Cisg ICAgdXBkYXRlU2Nyb2xsYmFyUHJlc2VuY2VBbmRTdGF0ZShoYXNIb3Jpem9udGFsT3ZlcmZsb3co KSwgaGFzVmVydGljYWxPdmVyZmxvdygpKTsKIAogICAgIC8vIFNjcm9sbGJhcnMgd2l0aCBhdXRv IGJlaGF2aW9yIG1heSBuZWVkIHRvIGxheSBvdXQgYWdhaW4gaWYgc2Nyb2xsYmFycyBnb3QgYWRk ZWQgb3IgcmVtb3ZlZC4KLSAgICBib29sIGF1dG9Ib3Jpem9udGFsU2Nyb2xsQmFyQ2hhbmdlZCA9 IGJveC0+aGFzQXV0b1Njcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbjo6SG9yaXpvbnRhbFNj cm9sbGJhcikgJiYgKGhhc0hvcml6b250YWxTY3JvbGxiYXIoKSAhPSBoYXNIb3Jpem9udGFsT3Zl cmZsb3cpOwotICAgIGJvb2wgYXV0b1ZlcnRpY2FsU2Nyb2xsQmFyQ2hhbmdlZCA9IGJveC0+aGFz QXV0b1Njcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbjo6VmVydGljYWxTY3JvbGxiYXIpICYm IChoYXNWZXJ0aWNhbFNjcm9sbGJhcigpICE9IGhhc1ZlcnRpY2FsT3ZlcmZsb3cpOworICAgIGJv b2wgYXV0b0hvcml6b250YWxTY3JvbGxCYXJDaGFuZ2VkID0gYm94LT5oYXNBdXRvU2Nyb2xsYmFy KFNjcm9sbGJhck9yaWVudGF0aW9uOjpIb3Jpem9udGFsU2Nyb2xsYmFyKSAmJiAoaGFkSG9yaXpv bnRhbFNjcm9sbGJhciAhPSBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyKCkpOworICAgIGJvb2wgYXV0 b1ZlcnRpY2FsU2Nyb2xsQmFyQ2hhbmdlZCA9IGJveC0+aGFzQXV0b1Njcm9sbGJhcihTY3JvbGxi YXJPcmllbnRhdGlvbjo6VmVydGljYWxTY3JvbGxiYXIpICYmIChoYWRWZXJ0aWNhbFNjcm9sbGJh ciAhPSBoYXNWZXJ0aWNhbFNjcm9sbGJhcigpKTsKIAogICAgIGlmIChhdXRvSG9yaXpvbnRhbFNj cm9sbEJhckNoYW5nZWQgfHwgYXV0b1ZlcnRpY2FsU2Nyb2xsQmFyQ2hhbmdlZCkgewotICAgICAg ICBpZiAoYm94LT5oYXNBdXRvU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uOjpIb3Jpem9u dGFsU2Nyb2xsYmFyKSkKLSAgICAgICAgICAgIHNldEhhc0hvcml6b250YWxTY3JvbGxiYXIoaGFz SG9yaXpvbnRhbE92ZXJmbG93KTsKLSAgICAgICAgaWYgKGJveC0+aGFzQXV0b1Njcm9sbGJhcihT Y3JvbGxiYXJPcmllbnRhdGlvbjo6VmVydGljYWxTY3JvbGxiYXIpKQotICAgICAgICAgICAgc2V0 SGFzVmVydGljYWxTY3JvbGxiYXIoaGFzVmVydGljYWxPdmVyZmxvdyk7Ci0KICAgICAgICAgaWYg KGF1dG9WZXJ0aWNhbFNjcm9sbEJhckNoYW5nZWQgJiYgc2hvdWxkUGxhY2VWZXJ0aWNhbFNjcm9s bGJhck9uTGVmdCgpKQogICAgICAgICAgICAgY29tcHV0ZVNjcm9sbE9yaWdpbigpOwogCiAgICAg ICAgIG1fbGF5ZXIudXBkYXRlU2VsZlBhaW50aW5nTGF5ZXIoKTsKIAorICAgICAgICBhdXRvJiBy ZW5kZXJlciA9IG1fbGF5ZXIucmVuZGVyZXIoKTsKICAgICAgICAgcmVuZGVyZXIucmVwYWludCgp OwogCiAgICAgICAgIGlmIChyZW5kZXJlci5zdHlsZSgpLm92ZXJmbG93WCgpID09IE92ZXJmbG93 OjpBdXRvIHx8IHJlbmRlcmVyLnN0eWxlKCkub3ZlcmZsb3dZKCkgPT0gT3ZlcmZsb3c6OkF1dG8p IHsKICAgICAgICAgICAgIGlmICghbV9pbk92ZXJmbG93UmVsYXlvdXQpIHsKLSAgICAgICAgICAg ICAgICBtX2luT3ZlcmZsb3dSZWxheW91dCA9IHRydWU7CisgICAgICAgICAgICAgICAgU2V0Rm9y U2NvcGU8Ym9vbD4gaW5PdmVyZmxvd1JlbGF5b3V0U2NvcGUobV9pbk92ZXJmbG93UmVsYXlvdXQs IHRydWUpOwogICAgICAgICAgICAgICAgIHJlbmRlcmVyLnNldE5lZWRzTGF5b3V0KE1hcmtPbmx5 VGhpcyk7CiAgICAgICAgICAgICAgICAgaWYgKGlzPFJlbmRlckJsb2NrPihyZW5kZXJlcikpIHsK LSAgICAgICAgICAgICAgICAgICAgUmVuZGVyQmxvY2smIGJsb2NrID0gZG93bmNhc3Q8UmVuZGVy QmxvY2s+KHJlbmRlcmVyKTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byYgYmxvY2sgPSBkb3du Y2FzdDxSZW5kZXJCbG9jaz4ocmVuZGVyZXIpOwogICAgICAgICAgICAgICAgICAgICBibG9jay5z Y3JvbGxiYXJzQ2hhbmdlZChhdXRvSG9yaXpvbnRhbFNjcm9sbEJhckNoYW5nZWQsIGF1dG9WZXJ0 aWNhbFNjcm9sbEJhckNoYW5nZWQpOwogICAgICAgICAgICAgICAgICAgICBibG9jay5sYXlvdXRC bG9jayh0cnVlKTsKICAgICAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICAgICAg cmVuZGVyZXIubGF5b3V0KCk7Ci0gICAgICAgICAgICAgICAgbV9pbk92ZXJmbG93UmVsYXlvdXQg PSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCisgICAgICAgIC8vIEZJWE1FOiBU aGlzIGRvZXMgbm90IGJlbG9uZyBoZXJlLgogICAgICAgICBSZW5kZXJPYmplY3QqIHBhcmVudCA9 IHJlbmRlcmVyLnBhcmVudCgpOwogICAgICAgICBpZiAocGFyZW50ICYmIHBhcmVudC0+aXNGbGV4 aWJsZUJveCgpICYmIHJlbmRlcmVyLmlzQm94KCkpCiAgICAgICAgICAgICBkb3duY2FzdDxSZW5k ZXJGbGV4aWJsZUJveD4ocGFyZW50KS0+Y2xlYXJDYWNoZWRNYWluU2l6ZUZvckNoaWxkKCptX2xh eWVyLnJlbmRlckJveCgpKTsKQEAgLTE1MzcsNDIgKzE1OTUsNiBAQCBib29sIFJlbmRlckxheWVy U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbGluZ01heVJldmVhbEJhY2tncm91bmQoKSBjb25zdAogICAg IHJldHVybiBzY3JvbGxzT3ZlcmZsb3coKSB8fCB1c2VzQ29tcG9zaXRlZFNjcm9sbGluZygpOwog fQogCi12b2lkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnVwZGF0ZVNjcm9sbGJhcnNBZnRl clN0eWxlQ2hhbmdlKGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkKLXsKLSAgICAvLyBPdmVy ZmxvdyBhcmUgYSBib3ggY29uY2VwdC4KLSAgICBSZW5kZXJCb3gqIGJveCA9IG1fbGF5ZXIucmVu ZGVyQm94KCk7Ci0gICAgaWYgKCFib3gpCi0gICAgICAgIHJldHVybjsKLQotICAgIC8vIExpc3Qg Ym94IHBhcnRzIGhhbmRsZSB0aGUgc2Nyb2xsYmFycyBieSB0aGVtc2VsdmVzIHNvIHdlIGhhdmUg bm90aGluZyB0byBkby4KLSAgICBpZiAoYm94LT5zdHlsZSgpLmFwcGVhcmFuY2UoKSA9PSBMaXN0 Ym94UGFydCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgT3ZlcmZsb3cgb3ZlcmZsb3dYID0gYm94 LT5zdHlsZSgpLm92ZXJmbG93WCgpOwotICAgIE92ZXJmbG93IG92ZXJmbG93WSA9IGJveC0+c3R5 bGUoKS5vdmVyZmxvd1koKTsKLQotICAgIC8vIFRvIGF2b2lkIGRvaW5nIGEgcmVsYXlvdXQgaW4g dXBkYXRlU2Nyb2xsYmFyc0FmdGVyTGF5b3V0LCB3ZSB0cnkgdG8ga2VlcCBhbnkgYXV0b21hdGlj IHNjcm9sbGJhciB0aGF0IHdhcyBhbHJlYWR5IHByZXNlbnQuCi0gICAgYm9vbCBoYWRWZXJ0aWNh bFNjcm9sbGJhciA9IG1fdkJhcjsKLSAgICBib29sIG5lZWRzSG9yaXpvbnRhbFNjcm9sbGJhciA9 IChtX2hCYXIgJiYgYm94LT5oYXNBdXRvU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uOjpI b3Jpem9udGFsU2Nyb2xsYmFyKSkgfHwgYm94LT5oYXNBbHdheXNQcmVzZW50U2Nyb2xsYmFyKFNj cm9sbGJhck9yaWVudGF0aW9uOjpIb3Jpem9udGFsU2Nyb2xsYmFyKTsKLSAgICBib29sIG5lZWRz VmVydGljYWxTY3JvbGxiYXIgPSAobV92QmFyICYmIGJveC0+aGFzQXV0b1Njcm9sbGJhcihTY3Jv bGxiYXJPcmllbnRhdGlvbjo6VmVydGljYWxTY3JvbGxiYXIpKSB8fCBib3gtPmhhc0Fsd2F5c1By ZXNlbnRTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb246OlZlcnRpY2FsU2Nyb2xsYmFyKTsK LSAgICBzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKG5lZWRzSG9yaXpvbnRhbFNjcm9sbGJhcik7 Ci0gICAgc2V0SGFzVmVydGljYWxTY3JvbGxiYXIobmVlZHNWZXJ0aWNhbFNjcm9sbGJhcik7Ci0K LSAgICBpZiAoaGFkVmVydGljYWxTY3JvbGxiYXIgIT0gbmVlZHNWZXJ0aWNhbFNjcm9sbGJhciB8 fCAobmVlZHNWZXJ0aWNhbFNjcm9sbGJhciAmJiBvbGRTdHlsZSAmJiBib3gtPnN0eWxlKCkuc2hv dWxkUGxhY2VWZXJ0aWNhbFNjcm9sbGJhck9uTGVmdCgpICE9IG9sZFN0eWxlLT5zaG91bGRQbGFj ZVZlcnRpY2FsU2Nyb2xsYmFyT25MZWZ0KCkpKQotICAgICAgICBjb21wdXRlU2Nyb2xsT3JpZ2lu KCk7Ci0KLSAgICAvLyBXaXRoIG5vbi1vdmVybGF5IG92ZXJmbG93OnNjcm9sbCwgc2Nyb2xsYmFy cyBhcmUgYWx3YXlzIHZpc2libGUgYnV0IG1heSBiZSBkaXNhYmxlZC4KLSAgICAvLyBXaGVuIHN3 aXRjaGluZyB0byBhbm90aGVyIHZhbHVlLCB3ZSBuZWVkIHRvIHJlLWVuYWJsZSB0aGVtIChzZWUg YnVnIDExOTg1KS4KLSAgICBpZiAobV9oQmFyICYmIG5lZWRzSG9yaXpvbnRhbFNjcm9sbGJhciAm JiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+b3ZlcmZsb3dYKCkgPT0gT3ZlcmZsb3c6OlNjcm9sbCAm JiBvdmVyZmxvd1ggIT0gT3ZlcmZsb3c6OlNjcm9sbCkKLSAgICAgICAgbV9oQmFyLT5zZXRFbmFi bGVkKHRydWUpOwotCi0gICAgaWYgKG1fdkJhciAmJiBuZWVkc1ZlcnRpY2FsU2Nyb2xsYmFyICYm IG9sZFN0eWxlICYmIG9sZFN0eWxlLT5vdmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6U2Nyb2xsICYm IG92ZXJmbG93WSAhPSBPdmVyZmxvdzo6U2Nyb2xsKQotICAgICAgICBtX3ZCYXItPnNldEVuYWJs ZWQodHJ1ZSk7Ci0KLSAgICBpZiAoIW1fc2Nyb2xsRGltZW5zaW9uc0RpcnR5KQotICAgICAgICB1 cGRhdGVTY3JvbGxhYmxlQXJlYVNldChoYXNTY3JvbGxhYmxlSG9yaXpvbnRhbE92ZXJmbG93KCkg fHwgaGFzU2Nyb2xsYWJsZVZlcnRpY2FsT3ZlcmZsb3coKSk7Ci19Ci0KIHZvaWQgUmVuZGVyTGF5 ZXJTY3JvbGxhYmxlQXJlYTo6dXBkYXRlU2Nyb2xsYWJsZUFyZWFTZXQoYm9vbCBoYXNPdmVyZmxv dykKIHsKICAgICBhdXRvJiByZW5kZXJlciA9IG1fbGF5ZXIucmVuZGVyZXIoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oCmlu ZGV4IDE4MDBkOGZkMzI5YzI0N2U0ZTA1ZTMyYjc1OGIxOGExMzg2OTVjYmYuLmU3Y2ZjYTQwOGJm OTk4NTkyYTAzZjE5OGM5ZDU4NmI0MGU2MWM5ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaApAQCAtMTAxLDkgKzEwMSw2 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEhhc0hvcml6b250YWxTY3JvbGxiYXIoYm9vbCk7CiAg ICAgdm9pZCBzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihib29sKTsKIAotICAgIFJlZjxTY3JvbGxi YXI+IGNyZWF0ZVNjcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbik7Ci0gICAgdm9pZCBkZXN0 cm95U2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uKTsKLQogICAgIGJvb2wgcmVxdWlyZXNT Y3JvbGxQb3NpdGlvblJlY29uY2lsaWF0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9yZXF1aXJlc1Nj cm9sbFBvc2l0aW9uUmVjb25jaWxpYXRpb247IH0KICAgICB2b2lkIHNldFJlcXVpcmVzU2Nyb2xs UG9zaXRpb25SZWNvbmNpbGlhdGlvbihib29sIHJlcXVpcmVzUmVjb25jaWxpYXRpb24gPSB0cnVl KSB7IG1fcmVxdWlyZXNTY3JvbGxQb3NpdGlvblJlY29uY2lsaWF0aW9uID0gcmVxdWlyZXNSZWNv bmNpbGlhdGlvbjsgfQogCkBAIC0yMTIsMTMgKzIwOSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHVw ZGF0ZVNjcm9sbGJhcnNBZnRlckxheW91dCgpOwogCiAgICAgdm9pZCBwb3NpdGlvbk92ZXJmbG93 Q29udHJvbHMoY29uc3QgSW50U2l6ZSYpOwotICAgIHZvaWQgY2xlYXJTY3JvbGxDb3JuZXIoKTsK LSAgICB2b2lkIGNsZWFyUmVzaXplcigpOwogCiAgICAgdm9pZCB1cGRhdGVBbGxTY3JvbGxiYXJS ZWxhdGVkU3R5bGUoKTsKIAotICAgIHZvaWQgZHJhd1BsYXRmb3JtUmVzaXplckltYWdlKEdyYXBo aWNzQ29udGV4dCYsIGNvbnN0IExheW91dFJlY3QmIHJlc2l6ZXJDb3JuZXJSZWN0KTsKLQogICAg IExheW91dFVuaXQgb3ZlcmZsb3dUb3AoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG92ZXJmbG93 Qm90dG9tKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBvdmVyZmxvd0xlZnQoKSBjb25zdDsKQEAg LTIzMCwyNSArMjIzLDE0IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgc2Nyb2xsaW5nTWF5UmV2ZWFs QmFja2dyb3VuZCgpIGNvbnN0OwogCi0gICAgdm9pZCBjb21wdXRlU2Nyb2xsRGltZW5zaW9ucygp OwotICAgIHZvaWQgY29tcHV0ZVNjcm9sbE9yaWdpbigpOwogICAgIHZvaWQgY29tcHV0ZUhhc0Nv bXBvc2l0ZWRTY3JvbGxhYmxlT3ZlcmZsb3coKTsKIAotICAgIGJvb2wgaGFzSG9yaXpvbnRhbE92 ZXJmbG93KCkgY29uc3Q7Ci0gICAgYm9vbCBoYXNWZXJ0aWNhbE92ZXJmbG93KCkgY29uc3Q7Ci0K LSAgICBib29sIHNob3dzT3ZlcmZsb3dDb250cm9scygpIGNvbnN0OwotCiAgICAgLy8gTk9URTog VGhpcyBzaG91bGQgb25seSBiZSBjYWxsZWQgYnkgdGhlIG92ZXJyaWRkZW4gc2V0U2Nyb2xsT2Zm c2V0IGZyb20gU2Nyb2xsYWJsZUFyZWEuCiAgICAgdm9pZCBzY3JvbGxUbyhjb25zdCBTY3JvbGxQ b3NpdGlvbiYpOwogICAgIHZvaWQgdXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbCgp OwogCiAgICAgSW50U2l6ZSBzY3JvbGxiYXJPZmZzZXQoY29uc3QgU2Nyb2xsYmFyJikgY29uc3Q7 CiAKLSAgICB2b2lkIHVwZGF0ZVNjcm9sbGFibGVBcmVhU2V0KGJvb2wgaGFzT3ZlcmZsb3cpOwot Ci0gICAgU2Nyb2xsT2Zmc2V0IGNsYW1wU2Nyb2xsT2Zmc2V0KGNvbnN0IFNjcm9sbE9mZnNldCYp IGNvbnN0OwotCiAgICAgdm9pZCB1cGRhdGVMYXllclBvc2l0aW9uc0FmdGVyT3ZlcmZsb3dTY3Jv bGwoKTsKICAgICB2b2lkIHVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0ZXJEb2N1bWVudFNjcm9sbCgp OwogCkBAIC0yNjAsOSArMjQyLDMxIEBAIHB1YmxpYzoKICNlbmRpZgogCiBwcml2YXRlOgorICAg IGJvb2wgaGFzSG9yaXpvbnRhbE92ZXJmbG93KCkgY29uc3Q7CisgICAgYm9vbCBoYXNWZXJ0aWNh bE92ZXJmbG93KCkgY29uc3Q7CisKKyAgICBib29sIHNob3dzT3ZlcmZsb3dDb250cm9scygpIGNv bnN0OworCisgICAgU2Nyb2xsT2Zmc2V0IGNsYW1wU2Nyb2xsT2Zmc2V0KGNvbnN0IFNjcm9sbE9m ZnNldCYpIGNvbnN0OworCisgICAgdm9pZCBjb21wdXRlU2Nyb2xsRGltZW5zaW9ucygpOworICAg IHZvaWQgY29tcHV0ZVNjcm9sbE9yaWdpbigpOworCisgICAgdm9pZCB1cGRhdGVTY3JvbGxhYmxl QXJlYVNldChib29sIGhhc092ZXJmbG93KTsKKwogICAgIHZvaWQgdXBkYXRlU2Nyb2xsQ29ybmVy U3R5bGUoKTsKICAgICB2b2lkIHVwZGF0ZVJlc2l6ZXJTdHlsZSgpOwogCisgICAgdm9pZCBkcmF3 UGxhdGZvcm1SZXNpemVySW1hZ2UoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgTGF5b3V0UmVjdCYg cmVzaXplckNvcm5lclJlY3QpOworCisgICAgUmVmPFNjcm9sbGJhcj4gY3JlYXRlU2Nyb2xsYmFy KFNjcm9sbGJhck9yaWVudGF0aW9uKTsKKyAgICB2b2lkIGRlc3Ryb3lTY3JvbGxiYXIoU2Nyb2xs YmFyT3JpZW50YXRpb24pOworCisgICAgdm9pZCBjbGVhclNjcm9sbENvcm5lcigpOworICAgIHZv aWQgY2xlYXJSZXNpemVyKCk7CisKKyAgICB2b2lkIHVwZGF0ZVNjcm9sbGJhclByZXNlbmNlQW5k U3RhdGUoc3RkOjpvcHRpb25hbDxib29sPiBoYXNIb3Jpem9udGFsT3ZlcmZsb3cgPSBzdGQ6Om51 bGxvcHQsIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gaGFzVmVydGljYWxPdmVyZmxvdyA9IHN0ZDo6bnVs bG9wdCk7CisKIHByaXZhdGU6CiAgICAgYm9vbCBtX3Njcm9sbERpbWVuc2lvbnNEaXJ0eSB7IHRy dWUgfTsKICAgICBib29sIG1faW5PdmVyZmxvd1JlbGF5b3V0IHsgZmFsc2UgfTsK