44782 2010-08-27 11:49:20 -0700 [GTK] ScrollbarThemeGtk should respond to theme changes 2010-08-31 15:22:41 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned oldest_to_newest 270635 0 mrobinson 2010-08-27 11:49:20 -0700 Scrollbar.cpp never expects scrollbars to change size, so even though theme changes currently trigger a re-layout, the scrollbar widget size does not change. We need to add some special code in ScrollbarThemeGtk which resizes all scrollbars when the theme specifies a different size. 270638 1 65746 mrobinson 2010-08-27 11:57:05 -0700 Created attachment 65746 Patch 272238 2 65746 gustavo 2010-08-31 11:42:20 -0700 Comment on attachment 65746 Patch 89 // If the theme changed, update the thickness of every scrollbar widget. 90 // The platform-independent scrollbar code isn't yet smart enough to 91 // get this information when it paints. 92 HashSet<Scrollbar*>::iterator end = gScrollbars->end(); 93 for (HashSet<Scrollbar*>::iterator it = gScrollbars->begin(); it != end; ++it) { 94 Scrollbar* scrollbar = (*it); Saying 'If the theme changed' seems to imply that we're depending on a conditional, but if we're in this function it's because the theme has changed, so I'd suggest only stating what is being done. Looks good otherwise! 272392 3 mrobinson 2010-08-31 14:45:11 -0700 > Saying 'If the theme changed' seems to imply that we're depending on a conditional, but if we're in this function it's because the theme has changed, so I'd suggest only stating what is being done. Looks good otherwise! Okay. I'll fix this before landing. Thanks for the review. :) 272434 4 mrobinson 2010-08-31 15:22:41 -0700 Committed r66540: <http://trac.webkit.org/changeset/66540> 65746 2010-08-27 11:57:05 -0700 2010-08-31 11:42:20 -0700 Patch bug-44782-20100827115705.patch text/plain 14487 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDI0MTQ0NDgxZjc4ODM3YTIwZTAwMjJiMGJlZTAzNTE3M2YwNjVmNy4uNjczNjM5Nzc5ZmEwYzc2 NDY0NTEwZjE2MzQxNmMwNTljM2Y4NWYwNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxMC0wOC0yNyAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gU2Nyb2xsYmFyVGhlbWVHdGsgc2hv dWxkIHJlc3BvbmQgdG8gdGhlbWUgY2hhbmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ3ODIKKworICAgICAgICBTY3JvbGxiYXIgaXMgY3VycmVu dGx5IHdyaXR0ZW4gd2l0aCB0aGUgYXNzdW1wdGlvbiB0aGF0IHNjcm9sbGJhcnMgbmV2ZXIgY2hh bmdlCisgICAgICAgIHRoaWNrbmVzcy4gSW4gR1RLKyBjaGFuZ2luZyB0aGUgY3VycmVudCB0aGVt ZSBjYW4gYWx0ZXIgc2Nyb2xsYmFyIHRoaWNrbmVzcy4gVGhpcworICAgICAgICBjaGFuZ2UgbWFu dWFsbHkgcmVzaXplcyBpbnRlcmlvciBmcmFtZSBzY3JvbGxiYXIgd2lkZ2V0cyB3aGVuIHRoZSBH VEsrIHRoZW1lIGNoYW5nZXMuCisgICAgICAgIFNpbmNlIHdlIGFyZSBub3cgdHJhY2tpbmcgc3R5 bGUgY2hhbmdlcywgd2UgbWF5IGFsc28gY2FjaGUgdGhlbWUgcHJvcGVydGllcyB0byBhdm9pZAor ICAgICAgICBoYXZpbmcgdG8gY2FsbCBtb3pfZ3RrX2dldF9zY3JvbGxiYXJfbWV0cmljcyByZXBl YXRlZGx5IGR1cmluZyByZW5kZXJpbmcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6Omd0a1Njcm9s bGJhcik6IEFkZGVkIGFjY2Vzc29yIGZvciB0aGUgTW96aWxsYSB0aGVtaW5nIGNvZGUncworICAg ICAgICBzY3JvbGxiYXIgd2lkZ2V0LiBXZSBhY2Nlc3MgaXQgaGVyZSwgYmVjYXVzZSBSZW5kZXJU aGVtR3RrIHRha2VzIGNhcmUgb2YgaW5pdGlhbGl6aW5nCisgICAgICAgIHRoZSBNb3ppbGxhIGNv ZGUuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmg6IEFkZGVkIGFjY2Vz c29yIGRlY2xhcmF0aW9uLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0 ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUd0azo6U2Nyb2xsYmFyVGhl bWVHdGspOiBVcGRhdGUgdGhlIHN0eWxlIHByb3BlcnR5IGNhY2hlIGR1cmluZyBjb25zdHJ1Y3Rp b24uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUd0azo6cmVnaXN0ZXJTY3JvbGxi YXIpOiBUcmFjayBhbGwgaW50ZXJpb3IgZnJhbWUgc2Nyb2xsYmFycy4KKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGJhclRoZW1lR3RrOjp1bnJlZ2lzdGVyU2Nyb2xsYmFyKTogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUd0azo6dXBkYXRlVGhlbWVQcm9wZXJ0aWVzKTog QWRkZWQgdGhpcyBtZXRob2Qgd2hpY2ggdXBkYXRlcyB0aGUgc3R5bGUgY2FjaGUuCisgICAgICAg IChXZWJDb3JlOjpndGtTdHlsZVNldENhbGxiYWNrKTogQWRkZWQgdGhpcyBzaWduYWwgaGFuZGxl ciBmb3Igd2hlbiB0aGUgc3R5bGUgY2hhbmdlcy4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJh clRoZW1lR3RrOjpiYWNrQnV0dG9uUmVjdCk6IFVzZSB0aGUgc3R5bGUgY2FjaGUgaW5zdGVhZCBv ZiBjYWxsaW5nIG1vel9ndGtfZ2V0X3Njcm9sbGJhcl9tZXRyaWNzLgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsYmFyVGhlbWVHdGs6OmZvcndhcmRCdXR0b25SZWN0KTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUd0azo6dHJhY2tSZWN0KTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRUcmFja0JhY2tncm91bmQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjp0aHVtYlJlY3QpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpwYWludCk6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVHdGs6OnNjcm9sbGJhclRoaWNrbmVzcyk6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVHdGs6OmJ1dHRvblNpemUp OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjptaW5pbXVtVGh1 bWJMZW5ndGgpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVH dGsuaDogQWRkZWQgbmV3IG1ldGhvZCBkZWNsYXJhdGlvbnMuCisKIDIwMTAtMDgtMjYgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCmlu ZGV4IGQ5ZjQ3N2NiMzg5MmYzOWJiMmU4MGU1MTg0Mjk1NGZhNjVkOGU3NTEuLjU4YzE2ZWE5MTg2 OGJkNDFjMGI4YTgyZmRjOTZhOGYyZWRhMGNhY2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5k ZXJUaGVtZUd0ay5jcHAKQEAgLTczMSw2ICs3MzEsMTEgQEAgR3RrV2lkZ2V0KiBSZW5kZXJUaGVt ZUd0azo6Z3RrVHJlZVZpZXcoKSBjb25zdAogICAgIHJldHVybiBtX2d0a1RyZWVWaWV3OwogfQog CitHdGtXaWRnZXQqIFJlbmRlclRoZW1lR3RrOjpndGtTY3JvbGxiYXIoKQoreworICAgIHJldHVy biBtb3pfZ3RrX2dldF9zY3JvbGxiYXJfd2lkZ2V0KCk7Cit9CisKIHZvaWQgUmVuZGVyVGhlbWVH dGs6OnBsYXRmb3JtQ29sb3JzRGlkQ2hhbmdlKCkKIHsKICNpZiBFTkFCTEUoVklERU8pCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5oIGIvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuaAppbmRleCBkMmUwZDcwZWEyMDEwODg4YjEwMGQz ZDM0ZmVlNWFhNTVkZWNlMjNkLi42OTYyMmE1NTdiYTlmZDBjMTNlZjQ5YmQxMDhkMDM5M2JkN2Iy OGJmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5oCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmgKQEAgLTk4LDYgKzk4LDgg QEAgcHVibGljOgogCiAgICAgYm9vbCBwYWludE1vemlsbGFHdGtXaWRnZXQoR3RrVGhlbWVXaWRn ZXRUeXBlLCBHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JiwgR3RrV2lkZ2V0U3RhdGUq LCBpbnQgZmxhZ3MsIEd0a1RleHREaXJlY3Rpb24gPSBHVEtfVEVYVF9ESVJfTk9ORSk7CiAKKyAg ICBHdGtXaWRnZXQqIGd0a1Njcm9sbGJhcigpOworCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBi b29sIHBhaW50Q2hlY2tib3goUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIGksIGNv bnN0IEludFJlY3QmIHIpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRDaGVja2JveFNpemUoUmVuZGVy U3R5bGUqIHN0eWxlKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Nj cm9sbGJhclRoZW1lR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1l R3RrLmNwcAppbmRleCBlZTZmYjM4Y2YzNGNhZDkyMWFmMTQxMjA3YzljMmUyNDgyZTdiMmMxLi5m MGVmYmJmYzRlOGNkYjFmMTYxMTJmNjUxODE1MmM1MzEyYjZiYWJkIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwCkBAIC0yOCwyMiArMjgsODkgQEAKIAogI2lu Y2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5oIgogI2luY2x1ZGUgIlJlbmRlclRoZW1lR3RrLmgi CisjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogI2luY2x1ZGUgIlNjcm9sbGJhci5oIgogI2luY2x1 ZGUgImd0a2RyYXdpbmcuaCIKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAorc3RhdGljIEhhc2hTZXQ8U2Nyb2xsYmFyKj4qIGdTY3JvbGxiYXJzOworc3RhdGlj IHZvaWQgZ3RrU3R5bGVTZXRDYWxsYmFjayhHdGtXaWRnZXQqLCBHdGtTdHlsZSosIFNjcm9sbGJh clRoZW1lR3RrKik7CisKIFNjcm9sbGJhclRoZW1lKiBTY3JvbGxiYXJUaGVtZTo6bmF0aXZlVGhl bWUoKQogewogICAgIHN0YXRpYyBTY3JvbGxiYXJUaGVtZUd0ayB0aGVtZTsKICAgICByZXR1cm4g JnRoZW1lOwogfQogCitTY3JvbGxiYXJUaGVtZUd0azo6U2Nyb2xsYmFyVGhlbWVHdGsoKQorewor ICAgIHVwZGF0ZVRoZW1lUHJvcGVydGllcygpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Qoc3RhdGlj X2Nhc3Q8UmVuZGVyVGhlbWVHdGsqPihSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCkuZ2V0KCkp LT5ndGtTY3JvbGxiYXIoKSwKKyAgICAgICAgICJzdHlsZS1zZXQiLCBHX0NBTExCQUNLKGd0a1N0 eWxlU2V0Q2FsbGJhY2spLCB0aGlzKTsKK30KKwogU2Nyb2xsYmFyVGhlbWVHdGs6On5TY3JvbGxi YXJUaGVtZUd0aygpCiB7CiB9CiAKK3ZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6OnJlZ2lzdGVyU2Ny b2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQoreworICAgIGlmICghZ1Njcm9sbGJhcnMpCisg ICAgICAgIGdTY3JvbGxiYXJzID0gbmV3IEhhc2hTZXQ8U2Nyb2xsYmFyKj47CisgICAgZ1Njcm9s bGJhcnMtPmFkZChzY3JvbGxiYXIpOworfQorCit2b2lkIFNjcm9sbGJhclRoZW1lR3RrOjp1bnJl Z2lzdGVyU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQoreworICAgIGdTY3JvbGxiYXJz LT5yZW1vdmUoc2Nyb2xsYmFyKTsKKyAgICBpZiAoZ1Njcm9sbGJhcnMtPmlzRW1wdHkoKSkgewor ICAgICAgICBkZWxldGUgZ1Njcm9sbGJhcnM7CisgICAgICAgIGdTY3JvbGxiYXJzID0gMDsKKyAg ICB9Cit9CisKK3ZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6OnVwZGF0ZVRoZW1lUHJvcGVydGllcygp Cit7CisgICAgTW96R3RrU2Nyb2xsYmFyTWV0cmljcyBtZXRyaWNzOworICAgIG1vel9ndGtfZ2V0 X3Njcm9sbGJhcl9tZXRyaWNzKCZtZXRyaWNzKTsKKworICAgIG1fdGh1bWJGYXRuZXNzID0gbWV0 cmljcy5zbGlkZXJfd2lkdGg7CisgICAgbV90cm91Z2hCb3JkZXJXaWR0aCA9IG1ldHJpY3MudHJv dWdoX2JvcmRlcjsKKyAgICBtX3N0ZXBwZXJTaXplID0gbWV0cmljcy5zdGVwcGVyX3NpemU7Cisg ICAgbV9zdGVwcGVyU3BhY2luZyA9IG1ldHJpY3Muc3RlcHBlcl9zcGFjaW5nOworICAgIG1fbWlu VGh1bWJMZW5ndGggPSBtZXRyaWNzLm1pbl9zbGlkZXJfc2l6ZTsKKyAgICBtX3Ryb3VnaFVuZGVy U3RlcHBlcnMgPSBtZXRyaWNzLnRyb3VnaF91bmRlcl9zdGVwcGVyczsKKworICAgIGlmICghZ1Nj cm9sbGJhcnMpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIElmIHRoZSB0aGVtZSBjaGFuZ2Vk LCB1cGRhdGUgdGhlIHRoaWNrbmVzcyBvZiBldmVyeSBzY3JvbGxiYXIgd2lkZ2V0LgorICAgIC8v IFRoZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCBzY3JvbGxiYXIgY29kZSBpc24ndCB5ZXQgc21hcnQg ZW5vdWdoIHRvCisgICAgLy8gZ2V0IHRoaXMgaW5mb3JtYXRpb24gd2hlbiBpdCBwYWludHMuCisg ICAgSGFzaFNldDxTY3JvbGxiYXIqPjo6aXRlcmF0b3IgZW5kID0gZ1Njcm9sbGJhcnMtPmVuZCgp OworICAgIGZvciAoSGFzaFNldDxTY3JvbGxiYXIqPjo6aXRlcmF0b3IgaXQgPSBnU2Nyb2xsYmFy cy0+YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgIFNjcm9sbGJhciogc2Nyb2xs YmFyID0gKCppdCk7CisKKyAgICAgICAgLy8gVG9wLWxldmVsIHNjcm9sbGJhciBpLmUuIHNjcm9s bGJhcnMgd2hvIGhhdmUgYSBwYXJlbnQgU2Nyb2xsVmlldworICAgICAgICAvLyB3aXRoIG5vIHBh cmVudCBhcmUgbmF0aXZlLCBhbmQgdGh1cyBkbyBub3QgbmVlZCB0byBiZSByZXNpemVkLgorICAg ICAgICBpZiAoIXNjcm9sbGJhci0+cGFyZW50KCkgfHwgIXNjcm9sbGJhci0+cGFyZW50KCktPnBh cmVudCgpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGludCB0aGlja25lc3MgPSBz Y3JvbGxiYXJUaGlja25lc3Moc2Nyb2xsYmFyLT5jb250cm9sU2l6ZSgpKTsKKyAgICAgICAgaWYg KHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQorICAgICAg ICAgICAgc2Nyb2xsYmFyLT5zZXRGcmFtZVJlY3QoSW50UmVjdCgwLCBzY3JvbGxiYXItPnBhcmVu dCgpLT5oZWlnaHQoKSAtIHRoaWNrbmVzcywgc2Nyb2xsYmFyLT53aWR0aCgpLCB0aGlja25lc3Mp KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgc2Nyb2xsYmFyLT5zZXRGcmFtZVJlY3QoSW50 UmVjdChzY3JvbGxiYXItPnBhcmVudCgpLT53aWR0aCgpIC0gdGhpY2tuZXNzLCAwLCB0aGlja25l c3MsIHNjcm9sbGJhci0+aGVpZ2h0KCkpKTsKKyAgICB9Cit9CisKK3N0YXRpYyB2b2lkIGd0a1N0 eWxlU2V0Q2FsbGJhY2soR3RrV2lkZ2V0KiB3aWRnZXQsIEd0a1N0eWxlKiBwcmV2aW91cywgU2Ny b2xsYmFyVGhlbWVHdGsqIHNjcm9sbGJhclRoZW1lKQoreworICAgIHNjcm9sbGJhclRoZW1lLT51 cGRhdGVUaGVtZVByb3BlcnRpZXMoKTsKK30KKwogYm9vbCBTY3JvbGxiYXJUaGVtZUd0azo6aGFz VGh1bWIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCiB7CiAgICAgLy8gVGhpcyBtZXRob2QgaXMganVz dCBjYWxsZWQgYXMgYSBwYWludC10aW1lIG9wdGltaXphdGlvbiB0byBzZWUgaWYKQEAgLTU3LDEw ICsxMjQsOCBAQCBJbnRSZWN0IFNjcm9sbGJhclRoZW1lR3RrOjpiYWNrQnV0dG9uUmVjdChTY3Jv bGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyUGFydCBwYQogICAgIGlmIChwYXJ0ID09IEJhY2tC dXR0b25FbmRQYXJ0KQogICAgICAgICByZXR1cm4gSW50UmVjdCgpOwogCi0gICAgTW96R3RrU2Ny b2xsYmFyTWV0cmljcyBtZXRyaWNzOwotICAgIG1vel9ndGtfZ2V0X3Njcm9sbGJhcl9tZXRyaWNz KCZtZXRyaWNzKTsKICAgICBJbnRTaXplIHNpemUgPSBidXR0b25TaXplKHNjcm9sbGJhcik7Ci0g ICAgcmV0dXJuIEludFJlY3Qoc2Nyb2xsYmFyLT54KCkgKyBtZXRyaWNzLnRyb3VnaF9ib3JkZXIs IHNjcm9sbGJhci0+eSgpICsgbWV0cmljcy50cm91Z2hfYm9yZGVyLCBzaXplLndpZHRoKCksIHNp emUuaGVpZ2h0KCkpOworICAgIHJldHVybiBJbnRSZWN0KHNjcm9sbGJhci0+eCgpICsgbV90cm91 Z2hCb3JkZXJXaWR0aCwgc2Nyb2xsYmFyLT55KCkgKyBtX3Ryb3VnaEJvcmRlcldpZHRoLCBzaXpl LndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOwogfQogCiBJbnRSZWN0IFNjcm9sbGJhclRoZW1lR3Rr Ojpmb3J3YXJkQnV0dG9uUmVjdChTY3JvbGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyUGFydCBw YXJ0LCBib29sKQpAQCAtNjksMTcgKzEzNCwxNCBAQCBJbnRSZWN0IFNjcm9sbGJhclRoZW1lR3Rr Ojpmb3J3YXJkQnV0dG9uUmVjdChTY3JvbGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyUGFydAog ICAgIGlmIChwYXJ0ID09IEZvcndhcmRCdXR0b25TdGFydFBhcnQpCiAgICAgICAgIHJldHVybiBJ bnRSZWN0KCk7CiAKLSAgICBNb3pHdGtTY3JvbGxiYXJNZXRyaWNzIG1ldHJpY3M7Ci0gICAgbW96 X2d0a19nZXRfc2Nyb2xsYmFyX21ldHJpY3MoJm1ldHJpY3MpOwotCiAgICAgSW50U2l6ZSBzaXpl ID0gYnV0dG9uU2l6ZShzY3JvbGxiYXIpOwogICAgIGludCB4LCB5OwogICAgIGlmIChzY3JvbGxi YXItPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikgewotICAgICAgICB4ID0g c2Nyb2xsYmFyLT54KCkgKyBzY3JvbGxiYXItPndpZHRoKCkgLSBzaXplLndpZHRoKCkgLSBtZXRy aWNzLnRyb3VnaF9ib3JkZXI7Ci0gICAgICAgIHkgPSBzY3JvbGxiYXItPnkoKSArIG1ldHJpY3Mu dHJvdWdoX2JvcmRlcjsKKyAgICAgICAgeCA9IHNjcm9sbGJhci0+eCgpICsgc2Nyb2xsYmFyLT53 aWR0aCgpIC0gc2l6ZS53aWR0aCgpIC0gbV90cm91Z2hCb3JkZXJXaWR0aDsKKyAgICAgICAgeSA9 IHNjcm9sbGJhci0+eSgpICsgbV90cm91Z2hCb3JkZXJXaWR0aDsKICAgICB9IGVsc2UgewotICAg ICAgICB4ID0gc2Nyb2xsYmFyLT54KCkgKyBtZXRyaWNzLnRyb3VnaF9ib3JkZXI7Ci0gICAgICAg IHkgPSBzY3JvbGxiYXItPnkoKSArIHNjcm9sbGJhci0+aGVpZ2h0KCkgLSBzaXplLmhlaWdodCgp IC0gbWV0cmljcy50cm91Z2hfYm9yZGVyOworICAgICAgICB4ID0gc2Nyb2xsYmFyLT54KCkgKyBt X3Ryb3VnaEJvcmRlcldpZHRoOworICAgICAgICB5ID0gc2Nyb2xsYmFyLT55KCkgKyBzY3JvbGxi YXItPmhlaWdodCgpIC0gc2l6ZS5oZWlnaHQoKSAtIG1fdHJvdWdoQm9yZGVyV2lkdGg7CiAgICAg fQogICAgIHJldHVybiBJbnRSZWN0KHgsIHksIHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSk7 CiB9CkBAIC05MCwxNCArMTUyLDEwIEBAIEludFJlY3QgU2Nyb2xsYmFyVGhlbWVHdGs6OnRyYWNr UmVjdChTY3JvbGxiYXIqIHNjcm9sbGJhciwgYm9vbCkKICAgICAvLyBpcyB0aGUgc2l6ZSBvZiB0 cm91Z2ggYm9yZGVyIHBsdXMgdGhlIHNpemUgb2YgdGhlIHN0ZXBwZXIgKGJ1dHRvbikKICAgICAv LyBwbHVzIHRoZSBzaXplIG9mIHN0ZXBwZXIgc3BhY2luZyAodGhlIHNwYWNlIGJldHdlZW4gdGhl IHN0ZXBwZXIgYW5kCiAgICAgLy8gdGhlIHBsYWNlIHdoZXJlIHRoZSB0aHVtYiBzdG9wcykuIFRo ZXJlIGlzIG9mdGVuIG5vIHN0ZXBwZXIgc3BhY2luZy4KLSAgICBNb3pHdGtTY3JvbGxiYXJNZXRy aWNzIG1ldHJpY3M7Ci0gICAgbW96X2d0a19nZXRfc2Nyb2xsYmFyX21ldHJpY3MoJm1ldHJpY3Mp OwotICAgIGludCBtb3ZlbWVudEF4aXNQYWRkaW5nID0gbWV0cmljcy50cm91Z2hfYm9yZGVyICsg bWV0cmljcy5zdGVwcGVyX3NpemUgKyBtZXRyaWNzLnN0ZXBwZXJfc3BhY2luZzsKKyAgICBpbnQg bW92ZW1lbnRBeGlzUGFkZGluZyA9IG1fdHJvdWdoQm9yZGVyV2lkdGggKyBtX3N0ZXBwZXJTaXpl ICsgbV9zdGVwcGVyU3BhY2luZzsKIAotICAgIC8vIFRoZSB0aGlja25lc3MgKG9mIHRoZSBsb25n IHBhcnQpIG9mIHRoZSBzY3JvbGxiYXIuIFdlIGNvdWxkIGFsc28KLSAgICAvLyB1c2Ugc2Nyb2xs YmFyVGhpY2tuZXNzIGhlcmUsIGJ1dCB0aGF0IHdvdWxkIG1lYW4gb25lIG1vcmUgY2FsbCB0bwot ICAgIC8vIG1vel9ndGtfZ2V0X3Njcm9sbGJhcl9tZXRyaWNzLgotICAgIGludCB0aGlja25lc3Mg PSBtZXRyaWNzLnNsaWRlcl93aWR0aCArIChtZXRyaWNzLnRyb3VnaF9ib3JkZXIgKiAyKTsKKyAg ICAvLyBUaGUgZmF0bmVzcyBvZiB0aGUgc2Nyb2xsYmFyIG9uIHRoZSBub24tbW92ZW1lbnQgYXhp cy4KKyAgICBpbnQgdGhpY2tuZXNzID0gc2Nyb2xsYmFyVGhpY2tuZXNzKHNjcm9sbGJhci0+Y29u dHJvbFNpemUoKSk7CiAKICAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6 b250YWxTY3JvbGxiYXIpIHsKICAgICAgICAgLy8gT25jZSB0aGUgc2Nyb2xsYmFyIGJlY29tZXMg c21hbGxlciB0aGFuIHRoZSBuYXR1cmFsIHNpemUgb2YgdGhlCkBAIC0xMjUsMTEgKzE4Myw4IEBA IHZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6OnBhaW50VHJhY2tCYWNrZ3JvdW5kKEdyYXBoaWNzQ29u dGV4dCogY29udGV4dCwgU2Nyb2xsYmFyCiAgICAgLy8gUGFpbnQgdGhlIHRyYWNrIGJhY2tncm91 bmQuIElmIHRoZSB0cm91Z2gtdW5kZXItc3RlcHBlcnMgcHJvcGVydHkgaXMgdHJ1ZSwgdGhpcwog ICAgIC8vIHNob3VsZCBiZSB0aGUgZnVsbCBzaXplIG9mIHRoZSBzY3JvbGxiYXIsIGJ1dCBpZiBp cyBmYWxzZSwgaXQgc2hvdWxkIG9ubHkgYmUgdGhlCiAgICAgLy8gdHJhY2sgcmVjdC4KLSAgICBN b3pHdGtTY3JvbGxiYXJNZXRyaWNzIG1ldHJpY3M7Ci0gICAgbW96X2d0a19nZXRfc2Nyb2xsYmFy X21ldHJpY3MoJm1ldHJpY3MpOwotCiAgICAgSW50UmVjdCBmdWxsU2Nyb2xsYmFyUmVjdCA9IHJl Y3Q7Ci0gICAgaWYgKG1ldHJpY3MudHJvdWdoX3VuZGVyX3N0ZXBwZXJzKQorICAgIGlmIChtX3Ry b3VnaFVuZGVyU3RlcHBlcnMpCiAgICAgICAgIGZ1bGxTY3JvbGxiYXJSZWN0ID0gSW50UmVjdChz Y3JvbGxiYXItPngoKSwgc2Nyb2xsYmFyLT55KCksIHNjcm9sbGJhci0+d2lkdGgoKSwgc2Nyb2xs YmFyLT5oZWlnaHQoKSk7CiAKICAgICBHdGtUaGVtZVdpZGdldFR5cGUgdHlwZSA9IHNjcm9sbGJh ci0+b3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbFNjcm9sbGJhciA/IE1PWl9HVEtfU0NST0xMQkFS X1RSQUNLX1ZFUlRJQ0FMIDogTU9aX0dUS19TQ1JPTExCQVJfVFJBQ0tfSE9SSVpPTlRBTDsKQEAg LTE2OCwxNyArMjIzLDEzIEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6OnBhaW50VGh1bWIoR3Jh cGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXIqIHNjcm9sbGJhCiAKIEludFJlY3QgU2Ny b2xsYmFyVGhlbWVHdGs6OnRodW1iUmVjdChTY3JvbGxiYXIqIHNjcm9sbGJhciwgY29uc3QgSW50 UmVjdCYgdW5jb25zdHJhaW5lZFRyYWNrUmVjdCkKIHsKLSAgICBNb3pHdGtTY3JvbGxiYXJNZXRy aWNzIG1ldHJpY3M7Ci0gICAgbW96X2d0a19nZXRfc2Nyb2xsYmFyX21ldHJpY3MoJm1ldHJpY3Mp OwotCiAgICAgSW50UmVjdCB0cmFja1JlY3QgPSBjb25zdHJhaW5UcmFja1JlY3RUb1RyYWNrUGll Y2VzKHNjcm9sbGJhciwgdW5jb25zdHJhaW5lZFRyYWNrUmVjdCk7Ci0gICAgaW50IHRoaWNrbmVz cyA9IG1ldHJpY3Muc2xpZGVyX3dpZHRoOwogICAgIGludCB0aHVtYlBvcyA9IHRodW1iUG9zaXRp b24oc2Nyb2xsYmFyKTsKICAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6 b250YWxTY3JvbGxiYXIpCi0gICAgICAgIHJldHVybiBJbnRSZWN0KHRyYWNrUmVjdC54KCkgKyB0 aHVtYlBvcywgdHJhY2tSZWN0LnkoKSArICh0cmFja1JlY3QuaGVpZ2h0KCkgLSB0aGlja25lc3Mp IC8gMiwgdGh1bWJMZW5ndGgoc2Nyb2xsYmFyKSwgdGhpY2tuZXNzKTsgCisgICAgICAgIHJldHVy biBJbnRSZWN0KHRyYWNrUmVjdC54KCkgKyB0aHVtYlBvcywgdHJhY2tSZWN0LnkoKSArICh0cmFj a1JlY3QuaGVpZ2h0KCkgLSBtX3RodW1iRmF0bmVzcykgLyAyLCB0aHVtYkxlbmd0aChzY3JvbGxi YXIpLCBtX3RodW1iRmF0bmVzcyk7IAogCiAgICAgLy8gVmVydGljYWxTY3JvbGxiYXIKLSAgICBy ZXR1cm4gSW50UmVjdCh0cmFja1JlY3QueCgpICsgKHRyYWNrUmVjdC53aWR0aCgpIC0gdGhpY2tu ZXNzKSAvIDIsIHRyYWNrUmVjdC55KCkgKyB0aHVtYlBvcywgdGhpY2tuZXNzLCB0aHVtYkxlbmd0 aChzY3JvbGxiYXIpKTsKKyAgICByZXR1cm4gSW50UmVjdCh0cmFja1JlY3QueCgpICsgKHRyYWNr UmVjdC53aWR0aCgpIC0gbV90aHVtYkZhdG5lc3MpIC8gMiwgdHJhY2tSZWN0LnkoKSArIHRodW1i UG9zLCBtX3RodW1iRmF0bmVzcywgdGh1bWJMZW5ndGgoc2Nyb2xsYmFyKSk7CiB9CiAKIGJvb2wg U2Nyb2xsYmFyVGhlbWVHdGs6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGljc0Nv bnRleHQqIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCkKQEAgLTIw OSwxMCArMjYwLDcgQEAgYm9vbCBTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnQoU2Nyb2xsYmFyKiBz Y3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb24KICAgICBpZiAoZGFtYWdlUmVj dC5pbnRlcnNlY3RzKHRyYWNrUGFpbnRSZWN0KSkKICAgICAgICAgc2Nyb2xsTWFzayB8PSBUcmFj a0JHUGFydDsKIAotICAgIE1vekd0a1Njcm9sbGJhck1ldHJpY3MgbWV0cmljczsKLSAgICBtb3pf Z3RrX2dldF9zY3JvbGxiYXJfbWV0cmljcygmbWV0cmljcyk7Ci0gICAgaWYgKG1ldHJpY3MudHJv dWdoX3VuZGVyX3N0ZXBwZXJzCi0gICAgICAgICAgICAmJiAoc2Nyb2xsTWFzayAmIEJhY2tCdXR0 b25TdGFydFBhcnQKKyAgICBpZiAobV90cm91Z2hVbmRlclN0ZXBwZXJzICYmIChzY3JvbGxNYXNr ICYgQmFja0J1dHRvblN0YXJ0UGFydAogICAgICAgICAgICAgfHwgc2Nyb2xsTWFzayAmIEJhY2tC dXR0b25FbmRQYXJ0CiAgICAgICAgICAgICB8fCBzY3JvbGxNYXNrICYgRm9yd2FyZEJ1dHRvblN0 YXJ0UGFydAogICAgICAgICAgICAgfHwgc2Nyb2xsTWFzayAmIEZvcndhcmRCdXR0b25FbmRQYXJ0 KSkKQEAgLTI5NiwyOCArMzQ0LDIxIEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVHdGs6OnNob3VsZENl bnRlck9uVGh1bWIoU2Nyb2xsYmFyKiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50CiAKIGludCBT Y3JvbGxiYXJUaGVtZUd0azo6c2Nyb2xsYmFyVGhpY2tuZXNzKFNjcm9sbGJhckNvbnRyb2xTaXpl KQogewotICAgIE1vekd0a1Njcm9sbGJhck1ldHJpY3MgbWV0cmljczsKLSAgICBtb3pfZ3RrX2dl dF9zY3JvbGxiYXJfbWV0cmljcygmbWV0cmljcyk7Ci0gICAgcmV0dXJuIG1ldHJpY3Muc2xpZGVy X3dpZHRoICsgKG1ldHJpY3MudHJvdWdoX2JvcmRlciAqIDIpOworICAgIHJldHVybiBtX3RodW1i RmF0bmVzcyArIChtX3Ryb3VnaEJvcmRlcldpZHRoICogMik7CiB9CiAKIEludFNpemUgU2Nyb2xs YmFyVGhlbWVHdGs6OmJ1dHRvblNpemUoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCiB7Ci0gICAgTW96 R3RrU2Nyb2xsYmFyTWV0cmljcyBtZXRyaWNzOwotICAgIG1vel9ndGtfZ2V0X3Njcm9sbGJhcl9t ZXRyaWNzKCZtZXRyaWNzKTsKLQogICAgIGlmIChzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0g VmVydGljYWxTY3JvbGxiYXIpCi0gICAgICAgIHJldHVybiBJbnRTaXplKG1ldHJpY3Muc2xpZGVy X3dpZHRoLCBtZXRyaWNzLnN0ZXBwZXJfc2l6ZSk7CisgICAgICAgIHJldHVybiBJbnRTaXplKG1f dGh1bWJGYXRuZXNzLCBtX3N0ZXBwZXJTaXplKTsKIAogICAgIC8vIEhvcml6b250YWxTY3JvbGxi YXIKLSAgICByZXR1cm4gSW50U2l6ZShtZXRyaWNzLnN0ZXBwZXJfc2l6ZSwgbWV0cmljcy5zbGlk ZXJfd2lkdGgpOworICAgIHJldHVybiBJbnRTaXplKG1fc3RlcHBlclNpemUsIG1fdGh1bWJGYXRu ZXNzKTsKIH0KIAogaW50IFNjcm9sbGJhclRoZW1lR3RrOjptaW5pbXVtVGh1bWJMZW5ndGgoU2Ny b2xsYmFyKiBzY3JvbGxiYXIpCiB7Ci0gICAgTW96R3RrU2Nyb2xsYmFyTWV0cmljcyBtZXRyaWNz OwotICAgIG1vel9ndGtfZ2V0X3Njcm9sbGJhcl9tZXRyaWNzKCZtZXRyaWNzKTsKLSAgICByZXR1 cm4gbWV0cmljcy5taW5fc2xpZGVyX3NpemU7CisgICAgcmV0dXJuIG1fbWluVGh1bWJMZW5ndGg7 CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1l R3RrLmggYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5oCmluZGV4IDQw ODBiNzcxOTVkOTAyYjNlODE2ZjU1YzE4ODEyNzY5NGU5MGUyMTguLmVmZjJmZWUwYjY2MTFlMjY1 YWExNTBjOGJhOTU2MjRlNTVlZjY3OWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1Njcm9sbGJhclRoZW1lR3RrLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFy VGhlbWVHdGsuaApAQCAtMzQsNiArMzQsNyBAQCBjbGFzcyBTY3JvbGxiYXI7CiAKIGNsYXNzIFNj cm9sbGJhclRoZW1lR3RrIDogcHVibGljIFNjcm9sbGJhclRoZW1lQ29tcG9zaXRlIHsKIHB1Ymxp YzoKKyAgICBTY3JvbGxiYXJUaGVtZUd0aygpOwogICAgIHZpcnR1YWwgflNjcm9sbGJhclRoZW1l R3RrKCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFzQnV0dG9ucyhTY3JvbGxiYXIqKSB7IHJldHVy biB0cnVlOyB9CkBAIC01Niw3ICs1NywxNyBAQCBwdWJsaWM6CiAgICAgLy8gVE9ETzogVGhlc2Ug YXJlIHRoZSBkZWZhdWx0IEdUSysgdmFsdWVzLiBBdCBzb21lIHBvaW50IHdlIHNob3VsZCBwdWxs IHRoZXNlIGZyb20gdGhlIHRoZW1lIGl0c2VsZi4KICAgICB2aXJ0dWFsIGRvdWJsZSBpbml0aWFs QXV0b3Njcm9sbFRpbWVyRGVsYXkoKSB7IHJldHVybiAwLjIwOyB9CiAgICAgdmlydHVhbCBkb3Vi bGUgYXV0b3Njcm9sbFRpbWVyRGVsYXkoKSB7IHJldHVybiAwLjAyOyB9CisgICAgdm9pZCB1cGRh dGVUaGVtZVByb3BlcnRpZXMoKTsKKyAgICB2b2lkIHJlZ2lzdGVyU2Nyb2xsYmFyKFNjcm9sbGJh ciopOworICAgIHZvaWQgdW5yZWdpc3RlclNjcm9sbGJhcihTY3JvbGxiYXIqKTsKIAorcHJvdGVj dGVkOgorICAgIGludCBtX3RodW1iRmF0bmVzczsKKyAgICBpbnQgbV90cm91Z2hCb3JkZXJXaWR0 aDsKKyAgICBpbnQgbV9zdGVwcGVyU2l6ZTsKKyAgICBpbnQgbV9zdGVwcGVyU3BhY2luZzsKKyAg ICBpbnQgbV9taW5UaHVtYkxlbmd0aDsKKyAgICBib29sIG1fdHJvdWdoVW5kZXJTdGVwcGVyczsK IH07CiAKIH0K