136861 2014-09-16 11:46:37 -0700 overflow:scroll should not leave space for a scroll corner with overlay scrollbars 2014-09-16 13:32:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin sam simon.fraser thorton oldest_to_newest 1035520 0 bdakin 2014-09-16 11:46:37 -0700 overflow:scroll should not leave space for a scroll corner on the Mac with overlay scrollbars because it looks wrong. Historically, overflow:scroll elements were meant to have scrollbar tracks and scroll corners whether or not there was content to scroll to. Since overlay scrollbars only appear when the user is scrolling, we don't do anything to differentiate overflow:scroll from overflow:auto if there is nothing to scroll too -- EXCEPT that we leave space for a scroll corner, which just looks wrong. We should stop doing that and embrace the fact that overflow:scroll just means something slightly different in the world of overlay scrollbars. 1035524 1 238191 bdakin 2014-09-16 11:47:54 -0700 Created attachment 238191 Test case Here's a test case that shows the problem. It's silly that we leave space for the scroll corner in the top two <div>s. It only makes sense in the bottom <div>. 1035533 2 238192 bdakin 2014-09-16 11:52:56 -0700 Created attachment 238192 Patch 1035559 3 bdakin 2014-09-16 13:32:52 -0700 Thanks Sam! http://trac.webkit.org/changeset/173668 238191 2014-09-16 11:47:54 -0700 2014-09-16 11:47:54 -0700 Test case overflow-scroll.html text/html 711 bdakin PGJvZHkgc3R5bGU9ImhlaWdodDoyMDAwcHg7IHdpZHRoOjIwMDBweDsiPgoKPGRpdiBzdHlsZT0i d2lkdGg6MjAwcHg7IGhlaWdodDoyMDBweDsgYm9yZGVyOjJweCBzb2xpZCBibGFjazsgb3ZlcmZs b3c6c2Nyb2xsOyI+CiAgICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOnB1cnBsZTsgd2lk dGg6MTBweDsgaGVpZ2h0OjUwMHB4OyBib3JkZXI6MnB4IHNvbGlkIHJlZDsiPjwvZGl2Pgo8L2Rp dj4KCjxkaXYgc3R5bGU9IndpZHRoOjIwMHB4OyBoZWlnaHQ6MjAwcHg7IGJvcmRlcjoycHggc29s aWQgYmxhY2s7IG92ZXJmbG93OnNjcm9sbDsiPgogICAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZC1j b2xvcjpwdXJwbGU7IHdpZHRoOjUwMHB4OyBoZWlnaHQ6MTBweDsgYm9yZGVyOjJweCBzb2xpZCBy ZWQ7Ij48L2Rpdj4KPC9kaXY+Cgo8ZGl2IHN0eWxlPSJ3aWR0aDoyMDBweDsgaGVpZ2h0OjIwMHB4 OyBib3JkZXI6MnB4IHNvbGlkIGJsYWNrOyBvdmVyZmxvdzpzY3JvbGw7Ij4KICAgIDxkaXYgc3R5 bGU9ImJhY2tncm91bmQtY29sb3I6cHVycGxlOyB3aWR0aDo1MDBweDsgaGVpZ2h0OjEwcHg7IGJv cmRlcjoycHggc29saWQgcmVkOyI+PC9kaXY+CiAgICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWNv bG9yOnB1cnBsZTsgd2lkdGg6MTBweDsgaGVpZ2h0OjUwMHB4OyBib3JkZXI6MnB4IHNvbGlkIHJl ZDsiPjwvZGl2Pgo8L2Rpdj4KCjwvYm9keT4K 238192 2014-09-16 11:52:56 -0700 2014-09-16 11:58:10 -0700 Patch for-review.txt text/plain 10777 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTA5LTE2ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBvdmVyZmxvdzpzY3JvbGwgc2hvdWxk IG5vdCBsZWF2ZSBzcGFjZSBmb3IgYSBzY3JvbGwgY29ybmVyIHdpdGggb3ZlcmxheSBzY3JvbGxi YXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY4 NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBvdmVy ZmxvdzpzY3JvbGwgc2hvdWxkIGJlaGF2ZSBsaWtlIG92ZXJmbG93OmF1dG8gd2hlbiB0aGUgc2Ny b2xsYmFyIHdpbGwgcmVuZGVyIGFzIAorICAgICAgICBhbiBvdmVybGF5IHNjcm9sbGJhci4KKwor ICAgICAgICBSZS1uYW1lIGhhc0F1dG9WZXJ0aWNhbFNjcm9sbGJhcigpL0hvcml6b250YWwgdG8g CisgICAgICAgIGhhc1ZlcnRpY2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpL0hvcml6b250 YWwsIGFuZCByZXR1cm4gdHJ1ZSBmb3IgCisgICAgICAgIG92ZXJmbG93OnNjcm9sbCBzY3JvbGxi YXJzIHRoYXQgd2lsbCByZW5kZXIgYXMgb3ZlcmxheSBzY3JvbGxiYXJzLgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpoYXNW ZXJ0aWNhbFNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQm94OjpoYXNIb3Jpem9udGFsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcik6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpz Y3JvbGxzT3ZlcmZsb3dYKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2Nyb2xsc092 ZXJmbG93WSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc0F1dG9WZXJ0aWNhbFNj cm9sbGJhcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc0F1dG9I b3Jpem9udGFsU2Nyb2xsYmFyKTogRGVsZXRlZC4KKworICAgICAgICBSZS1uYW1lIG92ZXJmbG93 UmVxdWlyZXNTY3JvbGxiYXIoKSB0byBzdHlsZVJlcXVpcmVzU2Nyb2xsYmFyKCkgYW5kIGFsc28g cmUtbmFtZSAKKyAgICAgICAgb3ZlcmZsb3dEZWZpbmVzQXV0b21hdGljU2Nyb2xsYmFyKCkgdG8g c3R5bGVEZWZpbmVzQXV0b21hdGljU2Nyb2xsYmFyKCksIGFuZCBtYWtlICAgICAgICAgCisgICAg ICAgIHRoZXNlIGZ1bmN0aW9ucyB0YWtlIGludG8gYWNjb3VudCB0aGUgZmFjdCB0aGF0IG92ZXJm bG93OnNjcm9sbCBzaG91bGQgYWN0IGxpa2UgCisgICAgICAgIG92ZXJmbG93OmF1dG8gd2hlbiB0 aGUgc2Nyb2xsYmFyIHdpbGwgcmVuZGVyIGFzIGFuIG92ZXJsYXkgc2Nyb2xsYmFyLgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzdHlsZVJl cXVpcmVzU2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNvcmU6OnN0eWxlRGVmaW5lc0F1dG9tYXRp Y1Njcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlU2Nyb2xs YmFyc0FmdGVyTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxh dGVDbGlwUmVjdHMpOgorCiAyMDE0LTA5LTE2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgUmVuYW1lIE5vZGU6Om5vZGVJbmRleCgpIHRvIGNvbXB1dGVOb2RlSW5k ZXgoKSBmb3IgY2xhcml0eQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAJKHJldmlzaW9uIDE3MzY2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw3IEBACiAjaW5jbHVkZSAiUmVuZGVy VGFibGVDZWxsLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKICNpbmNsdWRlICJSZW5kZXJW aWV3LmgiCisjaW5jbHVkZSAiU2Nyb2xsYmFyVGhlbWUuaCIKICNpbmNsdWRlICJUcmFuc2Zvcm1T dGF0ZS5oIgogI2luY2x1ZGUgImh0bWxlZGl0aW5nLmgiCiAjaW5jbHVkZSA8YWxnb3JpdGhtPgpA QCAtOTI4LDYgKzkyOSwxOCBAQCB2b2lkIFJlbmRlckJveDo6cGFuU2Nyb2xsKGNvbnN0IEludFBv aW50CiAgICAgICAgIGxheWVyKCktPnBhblNjcm9sbEZyb21Qb2ludChzb3VyY2UpOwogfQogCiti b29sIFJlbmRlckJveDo6aGFzVmVydGljYWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkgY29u c3QKK3sKKyAgICBib29sIG92ZXJmbG93U2Nyb2xsQWN0c0xpa2VBdXRvID0gc3R5bGUoKS5vdmVy Zmxvd1koKSA9PSBPU0NST0xMICYmICFzdHlsZSgpLmhhc1BzZXVkb1N0eWxlKFNDUk9MTEJBUikg JiYgU2Nyb2xsYmFyVGhlbWU6OnRoZW1lKCktPnVzZXNPdmVybGF5U2Nyb2xsYmFycygpOworICAg IHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAoc3R5bGUoKS5vdmVyZmxvd1koKSA9PSBPQVVU TyB8fCBzdHlsZSgpLm92ZXJmbG93WSgpID09IE9PVkVSTEFZIHx8IG92ZXJmbG93U2Nyb2xsQWN0 c0xpa2VBdXRvKTsKK30KKworYm9vbCBSZW5kZXJCb3g6Omhhc0hvcml6b250YWxTY3JvbGxiYXJX aXRoQXV0b0JlaGF2aW9yKCkgY29uc3QKK3sKKyAgICBib29sIG92ZXJmbG93U2Nyb2xsQWN0c0xp a2VBdXRvID0gc3R5bGUoKS5vdmVyZmxvd1goKSA9PSBPU0NST0xMICYmICFzdHlsZSgpLmhhc1Bz ZXVkb1N0eWxlKFNDUk9MTEJBUikgJiYgU2Nyb2xsYmFyVGhlbWU6OnRoZW1lKCktPnVzZXNPdmVy bGF5U2Nyb2xsYmFycygpOworICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSAmJiAoc3R5bGUo KS5vdmVyZmxvd1goKSA9PSBPQVVUTyB8fCBzdHlsZSgpLm92ZXJmbG93WCgpID09IE9PVkVSTEFZ IHx8IG92ZXJmbG93U2Nyb2xsQWN0c0xpa2VBdXRvKTsKK30KKwogYm9vbCBSZW5kZXJCb3g6Om5l ZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlvbigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHN0 eWxlKCkucGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50KCkgfHwgc3R5bGUoKS5wYWRkaW5nRW5kKCku aXNQZXJjZW50KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCShyZXZp c2lvbiAxNzM2NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHdv cmtpbmcgY29weSkKQEAgLTQ2NiwxMSArNDY2LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgc3RvcEF1dG9zY3JvbGwoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcGFuU2Nyb2xsKGNvbnN0 IEludFBvaW50Jik7CiAKLSAgICBib29sIGhhc0F1dG9WZXJ0aWNhbFNjcm9sbGJhcigpIGNvbnN0 IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93WSgpID09IE9B VVRPIHx8IHN0eWxlKCkub3ZlcmZsb3dZKCkgPT0gT09WRVJMQVkpOyB9Ci0gICAgYm9vbCBoYXNB dXRvSG9yaXpvbnRhbFNjcm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgp ICYmIChzdHlsZSgpLm92ZXJmbG93WCgpID09IE9BVVRPIHx8IHN0eWxlKCkub3ZlcmZsb3dYKCkg PT0gT09WRVJMQVkpOyB9CisgICAgYm9vbCBoYXNWZXJ0aWNhbFNjcm9sbGJhcldpdGhBdXRvQmVo YXZpb3IoKSBjb25zdDsKKyAgICBib29sIGhhc0hvcml6b250YWxTY3JvbGxiYXJXaXRoQXV0b0Jl aGF2aW9yKCkgY29uc3Q7CiAgICAgYm9vbCBzY3JvbGxzT3ZlcmZsb3coKSBjb25zdCB7IHJldHVy biBzY3JvbGxzT3ZlcmZsb3dYKCkgfHwgc2Nyb2xsc092ZXJmbG93WSgpOyB9Ci0gICAgYm9vbCBz Y3JvbGxzT3ZlcmZsb3dYKCkgY29uc3QgeyByZXR1cm4gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHN0 eWxlKCkub3ZlcmZsb3dYKCkgPT0gT1NDUk9MTCB8fCBoYXNBdXRvSG9yaXpvbnRhbFNjcm9sbGJh cigpKTsgfQotICAgIGJvb2wgc2Nyb2xsc092ZXJmbG93WSgpIGNvbnN0IHsgcmV0dXJuIGhhc092 ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93WSgpID09IE9TQ1JPTEwgfHwgaGFzQXV0 b1ZlcnRpY2FsU2Nyb2xsYmFyKCkpOyB9CisgICAgYm9vbCBzY3JvbGxzT3ZlcmZsb3dYKCkgY29u c3QgeyByZXR1cm4gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHN0eWxlKCkub3ZlcmZsb3dYKCkgPT0g T1NDUk9MTCB8fCBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpKTsgfQor ICAgIGJvb2wgc2Nyb2xsc092ZXJmbG93WSgpIGNvbnN0IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xp cCgpICYmIChzdHlsZSgpLm92ZXJmbG93WSgpID09IE9TQ1JPTEwgfHwgaGFzVmVydGljYWxTY3Jv bGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkpOyB9CiAgICAgYm9vbCBoYXNTY3JvbGxhYmxlT3ZlcmZs b3dYKCkgY29uc3QgeyByZXR1cm4gc2Nyb2xsc092ZXJmbG93WCgpICYmIHNjcm9sbFdpZHRoKCkg IT0gY2xpZW50V2lkdGgoKTsgfQogICAgIGJvb2wgaGFzU2Nyb2xsYWJsZU92ZXJmbG93WSgpIGNv bnN0IHsgcmV0dXJuIHNjcm9sbHNPdmVyZmxvd1koKSAmJiBzY3JvbGxIZWlnaHQoKSAhPSBjbGll bnRIZWlnaHQoKTsgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5jcHAJKHJldmlzaW9uIDE3MzY2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyNTUsNiArMzI1NSwyMCBAQCBib29sIFJl bmRlckxheWVyOjpoYXNWZXJ0aWNhbE92ZXJmbG93KCkgCiAgICAgcmV0dXJuIHNjcm9sbEhlaWdo dCgpID4gcmVuZGVyQm94KCktPnBpeGVsU25hcHBlZENsaWVudEhlaWdodCgpOwogfQogCitzdGF0 aWMgYm9vbCBzdHlsZVJlcXVpcmVzU2Nyb2xsYmFyKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwg U2Nyb2xsYmFyT3JpZW50YXRpb24gYXhpcykKK3sKKyAgICBFT3ZlcmZsb3cgb3ZlcmZsb3cgPSBh eGlzID09IFNjcm9sbGJhck9yaWVudGF0aW9uOjpIb3Jpem9udGFsU2Nyb2xsYmFyID8gc3R5bGUu b3ZlcmZsb3dYKCkgOiBzdHlsZS5vdmVyZmxvd1koKTsKKyAgICBib29sIG92ZXJmbG93U2Nyb2xs QWN0c0xpa2VBdXRvID0gb3ZlcmZsb3cgPT0gT1NDUk9MTCAmJiAhc3R5bGUuaGFzUHNldWRvU3R5 bGUoU0NST0xMQkFSKSAmJiBTY3JvbGxiYXJUaGVtZTo6dGhlbWUoKS0+dXNlc092ZXJsYXlTY3Jv bGxiYXJzKCk7CisgICAgcmV0dXJuIG92ZXJmbG93ID09IE9TQ1JPTEwgJiYgIW92ZXJmbG93U2Ny b2xsQWN0c0xpa2VBdXRvOworfQorCitzdGF0aWMgYm9vbCBzdHlsZURlZmluZXNBdXRvbWF0aWNT Y3JvbGxiYXIoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBTY3JvbGxiYXJPcmllbnRhdGlvbiBh eGlzKQoreworICAgIEVPdmVyZmxvdyBvdmVyZmxvdyA9IGF4aXMgPT0gU2Nyb2xsYmFyT3JpZW50 YXRpb246Okhvcml6b250YWxTY3JvbGxiYXIgPyBzdHlsZS5vdmVyZmxvd1goKSA6IHN0eWxlLm92 ZXJmbG93WSgpOworICAgIGJvb2wgb3ZlcmZsb3dTY3JvbGxBY3RzTGlrZUF1dG8gPSBvdmVyZmxv dyA9PSBPU0NST0xMICYmICFzdHlsZS5oYXNQc2V1ZG9TdHlsZShTQ1JPTExCQVIpICYmIFNjcm9s bGJhclRoZW1lOjp0aGVtZSgpLT51c2VzT3ZlcmxheVNjcm9sbGJhcnMoKTsKKyAgICByZXR1cm4g b3ZlcmZsb3cgPT0gT0FVVE8gfHwgb3ZlcmZsb3cgPT0gT09WRVJMQVkgfHwgb3ZlcmZsb3dTY3Jv bGxBY3RzTGlrZUF1dG87Cit9CisKIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbGJhcnNB ZnRlckxheW91dCgpCiB7CiAgICAgUmVuZGVyQm94KiBib3ggPSByZW5kZXJCb3goKTsKQEAgLTMy NjcsMjAgKzMyODEsMjAgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlU2Nyb2xsYmFyc0FmdGVy TAogICAgIGJvb2wgaGFzSG9yaXpvbnRhbE92ZXJmbG93ID0gdGhpcy0+aGFzSG9yaXpvbnRhbE92 ZXJmbG93KCk7CiAgICAgYm9vbCBoYXNWZXJ0aWNhbE92ZXJmbG93ID0gdGhpcy0+aGFzVmVydGlj YWxPdmVyZmxvdygpOwogCi0gICAgLy8gb3ZlcmZsb3c6c2Nyb2xsIHNob3VsZCBqdXN0IGVuYWJs ZS9kaXNhYmxlLgotICAgIGlmIChyZW5kZXJlcigpLnN0eWxlKCkub3ZlcmZsb3dYKCkgPT0gT1ND Uk9MTCkKKyAgICAvLyBJZiBvdmVyZmxvdyByZXF1aXJlcyBhIHNjcm9sbGJhciwgdGhlbiB3ZSBq dXN0IG5lZWQgdG8gZW5hYmxlIG9yIGRpc2FibGUuCisgICAgaWYgKHN0eWxlUmVxdWlyZXNTY3Jv bGxiYXIocmVuZGVyZXIoKS5zdHlsZSgpLCBIb3Jpem9udGFsU2Nyb2xsYmFyKSkKICAgICAgICAg bV9oQmFyLT5zZXRFbmFibGVkKGhhc0hvcml6b250YWxPdmVyZmxvdyk7Ci0gICAgaWYgKHJlbmRl cmVyKCkuc3R5bGUoKS5vdmVyZmxvd1koKSA9PSBPU0NST0xMKQorICAgIGlmIChzdHlsZVJlcXVp cmVzU2Nyb2xsYmFyKHJlbmRlcmVyKCkuc3R5bGUoKSwgVmVydGljYWxTY3JvbGxiYXIpKQogICAg ICAgICBtX3ZCYXItPnNldEVuYWJsZWQoaGFzVmVydGljYWxPdmVyZmxvdyk7CiAKLSAgICAvLyBv dmVyZmxvdzphdXRvIG1heSBuZWVkIHRvIGxheSBvdXQgYWdhaW4gaWYgc2Nyb2xsYmFycyBnb3Qg YWRkZWQvcmVtb3ZlZC4KLSAgICBib29sIGF1dG9Ib3Jpem9udGFsU2Nyb2xsQmFyQ2hhbmdlZCA9 IGJveC0+aGFzQXV0b0hvcml6b250YWxTY3JvbGxiYXIoKSAmJiAoaGFzSG9yaXpvbnRhbFNjcm9s bGJhcigpICE9IGhhc0hvcml6b250YWxPdmVyZmxvdyk7Ci0gICAgYm9vbCBhdXRvVmVydGljYWxT Y3JvbGxCYXJDaGFuZ2VkID0gYm94LT5oYXNBdXRvVmVydGljYWxTY3JvbGxiYXIoKSAmJiAoaGFz VmVydGljYWxTY3JvbGxiYXIoKSAhPSBoYXNWZXJ0aWNhbE92ZXJmbG93KTsKKyAgICAvLyBTY3Jv bGxiYXJzIHdpdGggYXV0byBiZWhhdmlvciBtYXkgbmVlZCB0byBsYXkgb3V0IGFnYWluIGlmIHNj cm9sbGJhcnMgZ290IGFkZGVkIG9yIHJlbW92ZWQuCisgICAgYm9vbCBhdXRvSG9yaXpvbnRhbFNj cm9sbEJhckNoYW5nZWQgPSBib3gtPmhhc0hvcml6b250YWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2 aW9yKCkgJiYgKGhhc0hvcml6b250YWxTY3JvbGxiYXIoKSAhPSBoYXNIb3Jpem9udGFsT3ZlcmZs b3cpOworICAgIGJvb2wgYXV0b1ZlcnRpY2FsU2Nyb2xsQmFyQ2hhbmdlZCA9IGJveC0+aGFzVmVy dGljYWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkgJiYgKGhhc1ZlcnRpY2FsU2Nyb2xsYmFy KCkgIT0gaGFzVmVydGljYWxPdmVyZmxvdyk7CiAKICAgICBpZiAoYXV0b0hvcml6b250YWxTY3Jv bGxCYXJDaGFuZ2VkIHx8IGF1dG9WZXJ0aWNhbFNjcm9sbEJhckNoYW5nZWQpIHsKLSAgICAgICAg aWYgKGJveC0+aGFzQXV0b0hvcml6b250YWxTY3JvbGxiYXIoKSkKKyAgICAgICAgaWYgKGJveC0+ aGFzSG9yaXpvbnRhbFNjcm9sbGJhcldpdGhBdXRvQmVoYXZpb3IoKSkKICAgICAgICAgICAgIHNl dEhhc0hvcml6b250YWxTY3JvbGxiYXIoaGFzSG9yaXpvbnRhbE92ZXJmbG93KTsKLSAgICAgICAg aWYgKGJveC0+aGFzQXV0b1ZlcnRpY2FsU2Nyb2xsYmFyKCkpCisgICAgICAgIGlmIChib3gtPmhh c1ZlcnRpY2FsU2Nyb2xsYmFyV2l0aEF1dG9CZWhhdmlvcigpKQogICAgICAgICAgICAgc2V0SGFz VmVydGljYWxTY3JvbGxiYXIoaGFzVmVydGljYWxPdmVyZmxvdyk7CiAKICAgICAgICAgdXBkYXRl U2VsZlBhaW50aW5nTGF5ZXIoKTsKQEAgLTYzODcsMTYgKzY0MDEsNiBAQCB2b2lkIFJlbmRlckxh eWVyOjp1cGRhdGVTdGFja2luZ0NvbnRleHRzCiAgICAgfQogfQogCi1zdGF0aWMgYm9vbCBvdmVy Zmxvd1JlcXVpcmVzU2Nyb2xsYmFyKEVPdmVyZmxvdyBvdmVyZmxvdykKLXsKLSAgICByZXR1cm4g b3ZlcmZsb3cgPT0gT1NDUk9MTDsKLX0KLQotc3RhdGljIGJvb2wgb3ZlcmZsb3dEZWZpbmVzQXV0 b21hdGljU2Nyb2xsYmFyKEVPdmVyZmxvdyBvdmVyZmxvdykKLXsKLSAgICByZXR1cm4gb3ZlcmZs b3cgPT0gT0FVVE8gfHwgb3ZlcmZsb3cgPT0gT09WRVJMQVk7Ci19Ci0KIHZvaWQgUmVuZGVyTGF5 ZXI6OnVwZGF0ZVNjcm9sbGJhcnNBZnRlclN0eWxlQ2hhbmdlKGNvbnN0IFJlbmRlclN0eWxlKiBv bGRTdHlsZSkKIHsKICAgICAvLyBPdmVyZmxvdyBhcmUgYSBib3ggY29uY2VwdC4KQEAgLTY0MTIs MjIgKzY0MTYsMTggQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlU2Nyb2xsYmFyc0FmdGVyUwog ICAgIEVPdmVyZmxvdyBvdmVyZmxvd1kgPSBib3gtPnN0eWxlKCkub3ZlcmZsb3dZKCk7CiAKICAg ICAvLyBUbyBhdm9pZCBkb2luZyBhIHJlbGF5b3V0IGluIHVwZGF0ZVNjcm9sbGJhcnNBZnRlckxh eW91dCwgd2UgdHJ5IHRvIGtlZXAgYW55IGF1dG9tYXRpYyBzY3JvbGxiYXIgdGhhdCB3YXMgYWxy ZWFkeSBwcmVzZW50LgotICAgIGJvb2wgbmVlZHNIb3Jpem9udGFsU2Nyb2xsYmFyID0gYm94LT5o YXNPdmVyZmxvd0NsaXAoKSAmJiAoKGhhc0hvcml6b250YWxTY3JvbGxiYXIoKSAmJiBvdmVyZmxv d0RlZmluZXNBdXRvbWF0aWNTY3JvbGxiYXIob3ZlcmZsb3dYKSkgfHwgb3ZlcmZsb3dSZXF1aXJl c1Njcm9sbGJhcihvdmVyZmxvd1gpKTsKLSAgICBib29sIG5lZWRzVmVydGljYWxTY3JvbGxiYXIg PSBib3gtPmhhc092ZXJmbG93Q2xpcCgpICYmICgoaGFzVmVydGljYWxTY3JvbGxiYXIoKSAmJiBv dmVyZmxvd0RlZmluZXNBdXRvbWF0aWNTY3JvbGxiYXIob3ZlcmZsb3dZKSkgfHwgb3ZlcmZsb3dS ZXF1aXJlc1Njcm9sbGJhcihvdmVyZmxvd1kpKTsKKyAgICBib29sIG5lZWRzSG9yaXpvbnRhbFNj cm9sbGJhciA9IGJveC0+aGFzT3ZlcmZsb3dDbGlwKCkgJiYgKChoYXNIb3Jpem9udGFsU2Nyb2xs YmFyKCkgJiYgc3R5bGVEZWZpbmVzQXV0b21hdGljU2Nyb2xsYmFyKGJveC0+c3R5bGUoKSwgSG9y aXpvbnRhbFNjcm9sbGJhcikpIHx8IHN0eWxlUmVxdWlyZXNTY3JvbGxiYXIoYm94LT5zdHlsZSgp LCBIb3Jpem9udGFsU2Nyb2xsYmFyKSk7CisgICAgYm9vbCBuZWVkc1ZlcnRpY2FsU2Nyb2xsYmFy ID0gYm94LT5oYXNPdmVyZmxvd0NsaXAoKSAmJiAoKGhhc1ZlcnRpY2FsU2Nyb2xsYmFyKCkgJiYg c3R5bGVEZWZpbmVzQXV0b21hdGljU2Nyb2xsYmFyKGJveC0+c3R5bGUoKSwgVmVydGljYWxTY3Jv bGxiYXIpKSB8fCBzdHlsZVJlcXVpcmVzU2Nyb2xsYmFyKGJveC0+c3R5bGUoKSwgVmVydGljYWxT Y3JvbGxiYXIpKTsKICAgICBzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKG5lZWRzSG9yaXpvbnRh bFNjcm9sbGJhcik7CiAgICAgc2V0SGFzVmVydGljYWxTY3JvbGxiYXIobmVlZHNWZXJ0aWNhbFNj cm9sbGJhcik7CiAKLSAgICAvLyBXaXRoIG92ZXJmbG93OiBzY3JvbGwsIHNjcm9sbGJhcnMgYXJl IGFsd2F5cyB2aXNpYmxlIGJ1dCBtYXkgYmUgZGlzYWJsZWQuCisgICAgLy8gV2l0aCBub24tb3Zl cmxheSBvdmVyZmxvdzpzY3JvbGwsIHNjcm9sbGJhcnMgYXJlIGFsd2F5cyB2aXNpYmxlIGJ1dCBt YXkgYmUgZGlzYWJsZWQuCiAgICAgLy8gV2hlbiBzd2l0Y2hpbmcgdG8gYW5vdGhlciB2YWx1ZSwg d2UgbmVlZCB0byByZS1lbmFibGUgdGhlbSAoc2VlIGJ1ZyAxMTk4NSkuCi0gICAgaWYgKG5lZWRz SG9yaXpvbnRhbFNjcm9sbGJhciAmJiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+b3ZlcmZsb3dYKCkg PT0gT1NDUk9MTCAmJiBvdmVyZmxvd1ggIT0gT1NDUk9MTCkgewotICAgICAgICBBU1NFUlQoaGFz SG9yaXpvbnRhbFNjcm9sbGJhcigpKTsKKyAgICBpZiAobV9oQmFyICYmIG5lZWRzSG9yaXpvbnRh bFNjcm9sbGJhciAmJiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+b3ZlcmZsb3dYKCkgPT0gT1NDUk9M TCAmJiBvdmVyZmxvd1ggIT0gT1NDUk9MTCkKICAgICAgICAgbV9oQmFyLT5zZXRFbmFibGVkKHRy dWUpOwotICAgIH0KIAotICAgIGlmIChuZWVkc1ZlcnRpY2FsU2Nyb2xsYmFyICYmIG9sZFN0eWxl ICYmIG9sZFN0eWxlLT5vdmVyZmxvd1koKSA9PSBPU0NST0xMICYmIG92ZXJmbG93WSAhPSBPU0NS T0xMKSB7Ci0gICAgICAgIEFTU0VSVChoYXNWZXJ0aWNhbFNjcm9sbGJhcigpKTsKKyAgICBpZiAo bV92QmFyICYmIG5lZWRzVmVydGljYWxTY3JvbGxiYXIgJiYgb2xkU3R5bGUgJiYgb2xkU3R5bGUt Pm92ZXJmbG93WSgpID09IE9TQ1JPTEwgJiYgb3ZlcmZsb3dZICE9IE9TQ1JPTEwpCiAgICAgICAg IG1fdkJhci0+c2V0RW5hYmxlZCh0cnVlKTsKLSAgICB9CiAKICAgICBpZiAoIW1fc2Nyb2xsRGlt ZW5zaW9uc0RpcnR5KQogICAgICAgICB1cGRhdGVTY3JvbGxhYmxlQXJlYVNldChoYXNTY3JvbGxh YmxlSG9yaXpvbnRhbE92ZXJmbG93KCkgfHwgaGFzU2Nyb2xsYWJsZVZlcnRpY2FsT3ZlcmZsb3co KSk7Cg==