44791 2010-08-27 13:27:11 -0700 [GTK] ScrollbarThemeGtk should support secondary steppers 2010-09-06 12:49:24 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned oldest_to_newest 270702 0 mrobinson 2010-08-27 13:27:11 -0700 Currently ScrollbarThemeGtk does not support secondary steppers, yet some popular themes (like older versions of Elementary) have these. This bug tracks adding this feature. 270707 1 65760 mrobinson 2010-08-27 13:37:22 -0700 Created attachment 65760 Adding alternate stepper support 274753 2 65760 gustavo 2010-09-06 12:36:30 -0700 Comment on attachment 65760 Adding alternate stepper support Looks good to me! 274755 3 65760 mrobinson 2010-09-06 12:49:20 -0700 Comment on attachment 65760 Adding alternate stepper support Clearing flags on attachment: 65760 Committed r66845: <http://trac.webkit.org/changeset/66845> 274756 4 mrobinson 2010-09-06 12:49:24 -0700 All reviewed patches have been landed. Closing bug. 65760 2010-08-27 13:37:22 -0700 2010-09-06 12:49:20 -0700 Adding alternate stepper support bug-44791-20100827133723.patch text/plain 9918 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjczNjM5Nzc5ZmEwYzc2NDY0NTEwZjE2MzQxNmMwNTljM2Y4NWYwNy4uZjYzYzM2YTY1MDY0NGI2 MjQ2YWNhNWU0YjFhZmQ2MGJlMmIzZmY2ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyOSBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIFtHVEtdIFNjcm9sbGJhclRoZW1lR3Rr IHNob3VsZCBzdXBwb3J0IHNlY29uZGFyeSBzdGVwcGVycworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ3OTEKKworICAgICAgICBBZGQgc3VwcG9ydCB0 byBTY3JvbGxiYXJUaGVtZUd0ayBmb3IgZHJhd2luZyBhbHRlcm5hdGUgc3RlcHBlcnMuIEFkanVz dAorICAgICAgICB0aGUgYWxnb3JpdGhtcyBmb3IgY2FsY3VsYXRpbmcgZm9yd2FyZCBhbmQgYmFj ayBidXR0b24gcmVjdHMsIGlmIHRoZXkKKyAgICAgICAgYXJlIGFjdGl2ZSBpbiB0aGUgdGhlbWUu IEV4cG9zZSB0aGlzIGluZm9ybWF0aW9uIHZpYSBHdGtTY3JvbGxiYXJNZXRyaWNzLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGJhclRoZW1lR3RrOjp1cGRhdGVUaGVtZVByb3BlcnRpZXMpOiBBY2Nlc3MgdGhl IHNlY29uZGFyeSBzdGVwcGVyIHByb3BlcnRpZXMKKyAgICAgICAgb2YgR3RrU2Nyb2xsYmFyTWV0 cmljcyB3aGVuIHVwZGF0aW5nIHRoZSBzdHlsZSBjYWNoZS4KKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGJhclRoZW1lR3RrOjpiYWNrQnV0dG9uUmVjdCk6IEFjY291bnQgZm9yIGFsdGVybmF0ZSBz dGVwcGVycy4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpmb3J3YXJkQnV0 dG9uUmVjdCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVHdGs6OnRy YWNrUmVjdCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVHdGs6OnBh aW50QnV0dG9uKTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1l R3RrLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL2d0azJkcmF3aW5nLmM6IEV4cG9zZSB3aGV0 aGVyIG9yIG5vdCB0aGUgc3R5bGUgdXNlcyBhbHRlcm5hdGUgc3RlcHBlcnMKKyAgICAgICAgdmlh IEd0a1Njcm9sbGJhck1ldHJpY3MuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcu aDogQWRkZWQgZmllbGRzIHRvIEd0a1Njcm9sbGJhck1ldHJpY3MuCisKKzIwMTAtMDgtMjcgIE1h cnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIFtHVEtdIFNjcm9sbGJhclRoZW1lR3RrIHNo b3VsZCByZXNwb25kIHRvIHRoZW1lIGNoYW5nZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NzgyCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1Njcm9sbGJhclRoZW1lR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9s bGJhclRoZW1lR3RrLmNwcAppbmRleCBmMGVmYmJmYzRlOGNkYjFmMTYxMTJmNjUxODE1MmM1MzEy YjZiYWJkLi5mZTY1YjkyZTkwMjIxMTMwOGFkNGE0OWFjMGRlNWQzNWI3ZjY1ODM3IDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwCkBAIC04Miw2ICs4Miw4IEBA IHZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6OnVwZGF0ZVRoZW1lUHJvcGVydGllcygpCiAgICAgbV9z dGVwcGVyU3BhY2luZyA9IG1ldHJpY3Muc3RlcHBlcl9zcGFjaW5nOwogICAgIG1fbWluVGh1bWJM ZW5ndGggPSBtZXRyaWNzLm1pbl9zbGlkZXJfc2l6ZTsKICAgICBtX3Ryb3VnaFVuZGVyU3RlcHBl cnMgPSBtZXRyaWNzLnRyb3VnaF91bmRlcl9zdGVwcGVyczsKKyAgICBtX2hhc0ZvcndhcmRCdXR0 b25TdGFydFBhcnQgPSBtZXRyaWNzLmhhc19zZWNvbmRhcnlfZm9yd2FyZF9zdGVwcGVyOworICAg IG1faGFzQmFja0J1dHRvbkVuZFBhcnQgPSBtZXRyaWNzLmhhc19zZWNvbmRhcnlfYmFja3dhcmRf c3RlcHBlcjsKIAogICAgIGlmICghZ1Njcm9sbGJhcnMpCiAgICAgICAgIHJldHVybjsKQEAgLTEy MCwzMCArMTIyLDQ1IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVHdGs6Omhhc1RodW1iKFNjcm9sbGJh ciogc2Nyb2xsYmFyKQogCiBJbnRSZWN0IFNjcm9sbGJhclRoZW1lR3RrOjpiYWNrQnV0dG9uUmVj dChTY3JvbGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyUGFydCBwYXJ0LCBib29sKQogewotICAg IC8vIFdlIGRvIG5vdCBzdXBwb3J0IG11bHRpcGxlIHN0ZXBwZXJzIHBlciBlbmQgeWV0LgotICAg IGlmIChwYXJ0ID09IEJhY2tCdXR0b25FbmRQYXJ0KQorICAgIGlmIChwYXJ0ID09IEJhY2tCdXR0 b25FbmRQYXJ0ICYmICFtX2hhc0JhY2tCdXR0b25FbmRQYXJ0KQogICAgICAgICByZXR1cm4gSW50 UmVjdCgpOwogCisgICAgaW50IHggPSBzY3JvbGxiYXItPngoKSArIG1fdHJvdWdoQm9yZGVyV2lk dGg7CisgICAgaW50IHkgPSBzY3JvbGxiYXItPnkoKSArIG1fdHJvdWdoQm9yZGVyV2lkdGg7CiAg ICAgSW50U2l6ZSBzaXplID0gYnV0dG9uU2l6ZShzY3JvbGxiYXIpOwotICAgIHJldHVybiBJbnRS ZWN0KHNjcm9sbGJhci0+eCgpICsgbV90cm91Z2hCb3JkZXJXaWR0aCwgc2Nyb2xsYmFyLT55KCkg KyBtX3Ryb3VnaEJvcmRlcldpZHRoLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOworICAg IGlmIChwYXJ0ID09IEJhY2tCdXR0b25TdGFydFBhcnQpCisgICAgICAgIHJldHVybiBJbnRSZWN0 KHgsIHksIHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSk7CisKKyAgICAvLyBCYWNrQnV0dG9u RW5kUGFydCAoYWx0ZXJuYXRlIGJ1dHRvbikKKyAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlv bigpID09IEhvcml6b250YWxTY3JvbGxiYXIpCisgICAgICAgIHJldHVybiBJbnRSZWN0KHNjcm9s bGJhci0+eCgpICsgc2Nyb2xsYmFyLT53aWR0aCgpIC0gbV90cm91Z2hCb3JkZXJXaWR0aCAtICgy ICogc2l6ZS53aWR0aCgpKSwgeSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKKworICAg IC8vIFZlcnRpY2FsU2Nyb2xsYmFyIGFsdGVybmF0ZSBidXR0b24KKyAgICByZXR1cm4gSW50UmVj dCh4LCBzY3JvbGxiYXItPnkoKSArIHNjcm9sbGJhci0+aGVpZ2h0KCkgLSBtX3Ryb3VnaEJvcmRl cldpZHRoIC0gKDIgKiBzaXplLmhlaWdodCgpKSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgp KTsKIH0KIAogSW50UmVjdCBTY3JvbGxiYXJUaGVtZUd0azo6Zm9yd2FyZEJ1dHRvblJlY3QoU2Ny b2xsYmFyKiBzY3JvbGxiYXIsIFNjcm9sbGJhclBhcnQgcGFydCwgYm9vbCkKIHsKLSAgICAvLyBX ZSBkbyBub3Qgc3VwcG9ydCBtdWx0aXBsZSBzdGVwcGVycyBwZXIgZW5kIHlldC4KLSAgICBpZiAo cGFydCA9PSBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0KQorICAgIGlmIChwYXJ0ID09IEZvcndhcmRC dXR0b25TdGFydFBhcnQgJiYgIW1faGFzRm9yd2FyZEJ1dHRvblN0YXJ0UGFydCkKICAgICAgICAg cmV0dXJuIEludFJlY3QoKTsKIAogICAgIEludFNpemUgc2l6ZSA9IGJ1dHRvblNpemUoc2Nyb2xs YmFyKTsKLSAgICBpbnQgeCwgeTsKICAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09 IEhvcml6b250YWxTY3JvbGxiYXIpIHsKLSAgICAgICAgeCA9IHNjcm9sbGJhci0+eCgpICsgc2Ny b2xsYmFyLT53aWR0aCgpIC0gc2l6ZS53aWR0aCgpIC0gbV90cm91Z2hCb3JkZXJXaWR0aDsKLSAg ICAgICAgeSA9IHNjcm9sbGJhci0+eSgpICsgbV90cm91Z2hCb3JkZXJXaWR0aDsKLSAgICB9IGVs c2UgewotICAgICAgICB4ID0gc2Nyb2xsYmFyLT54KCkgKyBtX3Ryb3VnaEJvcmRlcldpZHRoOwot ICAgICAgICB5ID0gc2Nyb2xsYmFyLT55KCkgKyBzY3JvbGxiYXItPmhlaWdodCgpIC0gc2l6ZS5o ZWlnaHQoKSAtIG1fdHJvdWdoQm9yZGVyV2lkdGg7CisgICAgICAgIGludCB5ID0gc2Nyb2xsYmFy LT55KCkgKyBtX3Ryb3VnaEJvcmRlcldpZHRoOworICAgICAgICBpZiAocGFydCA9PSBGb3J3YXJk QnV0dG9uRW5kUGFydCkKKyAgICAgICAgICAgIHJldHVybiBJbnRSZWN0KHNjcm9sbGJhci0+eCgp ICsgc2Nyb2xsYmFyLT53aWR0aCgpIC0gc2l6ZS53aWR0aCgpIC0gbV90cm91Z2hCb3JkZXJXaWR0 aCwgeSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKKworICAgICAgICAvLyBGb3J3YXJk QnV0dG9uU3RhcnRQYXJ0IChhbHRlcm5hdGUgYnV0dG9uKQorICAgICAgICByZXR1cm4gSW50UmVj dChzY3JvbGxiYXItPngoKSArIG1fdHJvdWdoQm9yZGVyV2lkdGggKyBzaXplLndpZHRoKCksIHks IHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSk7CiAgICAgfQotICAgIHJldHVybiBJbnRSZWN0 KHgsIHksIHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSk7CisKKyAgICAvLyBWZXJ0aWNhbFNj cm9sbGJhcgorICAgIGludCB4ID0gc2Nyb2xsYmFyLT54KCkgKyBtX3Ryb3VnaEJvcmRlcldpZHRo OworICAgIGlmIChwYXJ0ID09IEZvcndhcmRCdXR0b25FbmRQYXJ0KQorICAgICAgICByZXR1cm4g SW50UmVjdCh4LCBzY3JvbGxiYXItPnkoKSArIHNjcm9sbGJhci0+aGVpZ2h0KCkgLSBzaXplLmhl aWdodCgpIC0gbV90cm91Z2hCb3JkZXJXaWR0aCwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgp KTsKKworICAgIC8vIEZvcndhcmRCdXR0b25TdGFydFBhcnQgKGFsdGVybmF0ZSBidXR0b24pCisg ICAgcmV0dXJuIEludFJlY3QoeCwgc2Nyb2xsYmFyLT55KCkgKyBtX3Ryb3VnaEJvcmRlcldpZHRo ICsgc2l6ZS5oZWlnaHQoKSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKIH0KIAogSW50 UmVjdCBTY3JvbGxiYXJUaGVtZUd0azo6dHJhY2tSZWN0KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBi b29sKQpAQCAtMTU3LDE3ICsxNzQsMjggQEAgSW50UmVjdCBTY3JvbGxiYXJUaGVtZUd0azo6dHJh Y2tSZWN0KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBib29sKQogICAgIC8vIFRoZSBmYXRuZXNzIG9m IHRoZSBzY3JvbGxiYXIgb24gdGhlIG5vbi1tb3ZlbWVudCBheGlzLgogICAgIGludCB0aGlja25l c3MgPSBzY3JvbGxiYXJUaGlja25lc3Moc2Nyb2xsYmFyLT5jb250cm9sU2l6ZSgpKTsKIAorICAg IGludCBhbHRlcm5hdGVCdXR0b25PZmZzZXQgPSAwOworICAgIGludCBhbHRlcm5hdGVCdXR0b25X aWR0aCA9IDA7CisgICAgaWYgKG1faGFzRm9yd2FyZEJ1dHRvblN0YXJ0UGFydCkgeworICAgICAg ICBhbHRlcm5hdGVCdXR0b25PZmZzZXQgKz0gbV9zdGVwcGVyU2l6ZTsKKyAgICAgICAgYWx0ZXJu YXRlQnV0dG9uV2lkdGggKz0gbV9zdGVwcGVyU2l6ZTsKKyAgICB9CisgICAgaWYgKG1faGFzQmFj a0J1dHRvbkVuZFBhcnQpCisgICAgICAgIGFsdGVybmF0ZUJ1dHRvbldpZHRoICs9IG1fc3RlcHBl clNpemU7CisKICAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6b250YWxT Y3JvbGxiYXIpIHsKICAgICAgICAgLy8gT25jZSB0aGUgc2Nyb2xsYmFyIGJlY29tZXMgc21hbGxl ciB0aGFuIHRoZSBuYXR1cmFsIHNpemUgb2YgdGhlCiAgICAgICAgIC8vIHR3byBidXR0b25zLCB0 aGUgdHJhY2sgZGlzYXBwZWFycy4KICAgICAgICAgaWYgKHNjcm9sbGJhci0+d2lkdGgoKSA8IDIg KiB0aGlja25lc3MpCiAgICAgICAgICAgICByZXR1cm4gSW50UmVjdCgpOwotICAgICAgICByZXR1 cm4gSW50UmVjdChzY3JvbGxiYXItPngoKSArIG1vdmVtZW50QXhpc1BhZGRpbmcsIHNjcm9sbGJh ci0+eSgpLCBzY3JvbGxiYXItPndpZHRoKCkgLSAoMiAqIG1vdmVtZW50QXhpc1BhZGRpbmcpLCB0 aGlja25lc3MpOworICAgICAgICByZXR1cm4gSW50UmVjdChzY3JvbGxiYXItPngoKSArIG1vdmVt ZW50QXhpc1BhZGRpbmcgKyBhbHRlcm5hdGVCdXR0b25PZmZzZXQsIHNjcm9sbGJhci0+eSgpLAor ICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxiYXItPndpZHRoKCkgLSAoMiAqIG1vdmVtZW50 QXhpc1BhZGRpbmcpIC0gYWx0ZXJuYXRlQnV0dG9uV2lkdGgsIHRoaWNrbmVzcyk7CiAgICAgfQog CiAgICAgaWYgKHNjcm9sbGJhci0+aGVpZ2h0KCkgPCAyICogdGhpY2tuZXNzKQogICAgICAgICBy ZXR1cm4gSW50UmVjdCgpOwotICAgIHJldHVybiBJbnRSZWN0KHNjcm9sbGJhci0+eCgpLCBzY3Jv bGxiYXItPnkoKSArIG1vdmVtZW50QXhpc1BhZGRpbmcsIHRoaWNrbmVzcywgc2Nyb2xsYmFyLT5o ZWlnaHQoKSAtICgyICogbW92ZW1lbnRBeGlzUGFkZGluZykpOworICAgIHJldHVybiBJbnRSZWN0 KHNjcm9sbGJhci0+eCgpLCBzY3JvbGxiYXItPnkoKSArIG1vdmVtZW50QXhpc1BhZGRpbmcgKyBh bHRlcm5hdGVCdXR0b25PZmZzZXQsCisgICAgICAgICAgICAgICAgICAgdGhpY2tuZXNzLCBzY3Jv bGxiYXItPmhlaWdodCgpIC0gKDIgKiBtb3ZlbWVudEF4aXNQYWRkaW5nKSAtIGFsdGVybmF0ZUJ1 dHRvbldpZHRoKTsKIH0KIAogdm9pZCBTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRUcmFja0JhY2tn cm91bmQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXIqIHNjcm9sbGJhciwgY29u c3QgSW50UmVjdCYgcmVjdCkKQEAgLTMwNCwxMCArMzMyLDEwIEBAIHZvaWQgU2Nyb2xsYmFyVGhl bWVHdGs6OnBhaW50QnV0dG9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgU2Nyb2xsYmFyKiBz Y3JvbGxiCiAgICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbFNjcm9s bGJhcikKICAgICAgICAgZmxhZ3MgfD0gTU9aX0dUS19TVEVQUEVSX1ZFUlRJQ0FMOwogCi0gICAg aWYgKHBhcnQgPT0gRm9yd2FyZEJ1dHRvbkVuZFBhcnQpIHsKKyAgICBpZiAocGFydCA9PSBGb3J3 YXJkQnV0dG9uRW5kUGFydCkKKyAgICAgICAgZmxhZ3MgfD0gKE1PWl9HVEtfU1RFUFBFUl9ET1dO IHwgTU9aX0dUS19TVEVQUEVSX0JPVFRPTSk7CisgICAgaWYgKHBhcnQgPT0gRm9yd2FyZEJ1dHRv blN0YXJ0UGFydCkKICAgICAgICAgZmxhZ3MgfD0gTU9aX0dUS19TVEVQUEVSX0RPV047Ci0gICAg ICAgIGZsYWdzIHw9IE1PWl9HVEtfU1RFUFBFUl9CT1RUT007Ci0gICAgfQogCiAgICAgR3RrV2lk Z2V0U3RhdGUgc3RhdGU7CiAgICAgc3RhdGUuZm9jdXNlZCA9IFRSVUU7CkBAIC0zMTUsNyArMzQz LDkgQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRCdXR0b24oR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBTY3JvbGxiYXIqIHNjcm9sbGIKICAgICBzdGF0ZS5jYW5EZWZhdWx0ID0gVFJV RTsKIAogICAgIGlmICgoQmFja0J1dHRvblN0YXJ0UGFydCA9PSBwYXJ0ICYmIHNjcm9sbGJhci0+ Y3VycmVudFBvcygpKQotICAgICAgICB8fCAoRm9yd2FyZEJ1dHRvbkVuZFBhcnQgPT0gcGFydCAm JiBzY3JvbGxiYXItPmN1cnJlbnRQb3MoKSAhPSBzY3JvbGxiYXItPm1heGltdW0oKSkpIHsKKyAg ICAgICAgfHwgKEJhY2tCdXR0b25FbmRQYXJ0ID09IHBhcnQgJiYgc2Nyb2xsYmFyLT5jdXJyZW50 UG9zKCkpCisgICAgICAgIHx8IChGb3J3YXJkQnV0dG9uRW5kUGFydCA9PSBwYXJ0ICYmIHNjcm9s bGJhci0+Y3VycmVudFBvcygpICE9IHNjcm9sbGJhci0+bWF4aW11bSgpKQorICAgICAgICB8fCAo Rm9yd2FyZEJ1dHRvblN0YXJ0UGFydCA9PSBwYXJ0ICYmIHNjcm9sbGJhci0+Y3VycmVudFBvcygp ICE9IHNjcm9sbGJhci0+bWF4aW11bSgpKSkgewogICAgICAgICBzdGF0ZS5kaXNhYmxlZCA9IEZB TFNFOwogICAgICAgICBzdGF0ZS5hY3RpdmUgPSBwYXJ0ID09IHNjcm9sbGJhci0+cHJlc3NlZFBh cnQoKTsKICAgICAgICAgc3RhdGUuaW5Ib3ZlciA9IHBhcnQgPT0gc2Nyb2xsYmFyLT5ob3ZlcmVk UGFydCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVH dGsuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1lR3RrLmgKaW5kZXggZWZm MmZlZTBiNjYxMWUyNjVhYTE1MGM4YmE5NTYyNGU1NWVmNjc5Yi4uOGY5OTBkNWYwNzIzZDE2YmQ1 YmRhZjMxMWVhMjAxYjllOGJjZDc0MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv U2Nyb2xsYmFyVGhlbWVHdGsuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJU aGVtZUd0ay5oCkBAIC02OCw2ICs2OCw4IEBAIHByb3RlY3RlZDoKICAgICBpbnQgbV9zdGVwcGVy U3BhY2luZzsKICAgICBpbnQgbV9taW5UaHVtYkxlbmd0aDsKICAgICBib29sIG1fdHJvdWdoVW5k ZXJTdGVwcGVyczsKKyAgICBib29sIG1faGFzRm9yd2FyZEJ1dHRvblN0YXJ0UGFydDsKKyAgICBi b29sIG1faGFzQmFja0J1dHRvbkVuZFBhcnQ7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9ndGsyZHJhd2luZy5jIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrMmRy YXdpbmcuYwppbmRleCAzNDliZGUwYjU0MjQwOGI1MzRlNTI0YTAxYTg4YThkYWNhZjUwNjM2Li4y ZTc2MjBlMGZhZmJhYTlhOWUyNzI3MDYxYTZkMWIwNjQzODIzNjcwIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9ndGsyZHJhd2luZy5jCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L2d0azJkcmF3aW5nLmMKQEAgLTMwODIsNiArMzA4Miw4IEBAIG1vel9ndGtfZ2V0X3Njcm9sbGJh cl9tZXRyaWNzKE1vekd0a1Njcm9sbGJhck1ldHJpY3MgKm1ldHJpY3MpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICJzdGVwcGVyX3NpemUiLCAmbWV0cmljcy0+c3RlcHBlcl9zaXplLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAic3RlcHBlcl9zcGFjaW5nIiwgJm1ldHJpY3MtPnN0ZXBw ZXJfc3BhY2luZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgInRyb3VnaF91bmRlcl9zdGVw cGVycyIsICZtZXRyaWNzLT50cm91Z2hfdW5kZXJfc3RlcHBlcnMsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICJoYXNfc2Vjb25kYXJ5X2ZvcndhcmRfc3RlcHBlciIsICZtZXRyaWNzLT5oYXNf c2Vjb25kYXJ5X2ZvcndhcmRfc3RlcHBlciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgImhh c19zZWNvbmRhcnlfYmFja3dhcmRfc3RlcHBlciIsICZtZXRyaWNzLT5oYXNfc2Vjb25kYXJ5X2Jh Y2t3YXJkX3N0ZXBwZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOwogCiAgICAg bWV0cmljcy0+bWluX3NsaWRlcl9zaXplID0gZ3RrX3JhbmdlX2dldF9taW5fc2xpZGVyX3NpemUo R1RLX1JBTkdFKGdQYXJ0cy0+aG9yaXpTY3JvbGxiYXJXaWRnZXQpKTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0 a2RyYXdpbmcuaAppbmRleCA5ZDA2ZDVkNzJjZjRlNTA0YWUzZmFlNDZjNzY3ZTI4YjA0OTk2YmEz Li5jMDBkYTk3ZDViYWRjODkyNjQ0YjM0ODhjOGFkOWRlZDBhZDMzMTBhIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9ndGtkcmF3aW5nLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvZ3RrZHJhd2luZy5oCkBAIC03Niw2ICs3Niw4IEBAIHR5cGVkZWYgc3RydWN0IHsKICAgZ2lu dCBzdGVwcGVyX3NwYWNpbmc7CiAgIGdpbnQgbWluX3NsaWRlcl9zaXplOwogICBnYm9vbGVhbiB0 cm91Z2hfdW5kZXJfc3RlcHBlcnM7CisgIGdib29sZWFuIGhhc19zZWNvbmRhcnlfZm9yd2FyZF9z dGVwcGVyOworICBnYm9vbGVhbiBoYXNfc2Vjb25kYXJ5X2JhY2t3YXJkX3N0ZXBwZXI7CiB9IE1v ekd0a1Njcm9sbGJhck1ldHJpY3M7CiAKIHR5cGVkZWYgc3RydWN0IF9HdGtUaGVtZVBhcnRzIHsK