136338 2014-08-28 04:30:46 -0700 [GTK] ScrollbarThemeGtk should not depend on RenderThemeGtk 2014-08-29 00:43:17 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 136336 22176 1 cgarcia webkit-unassigned oldest_to_newest 1031956 0 cgarcia 2014-08-28 04:30:46 -0700 It's a layering violation (RenderThemeGtk is still in platform, but should be moved to WebCore eventually) 1031962 1 237305 cgarcia 2014-08-28 05:05:30 -0700 Created attachment 237305 Patch 1032127 2 cgarcia 2014-08-29 00:43:17 -0700 Committed r173110: <http://trac.webkit.org/changeset/173110> 237305 2014-08-28 05:05:30 -0700 2014-08-29 00:13:43 -0700 Patch wcore-render-theme-scrollbar.diff text/plain 14323 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyYjExMzUzLi42MjA2ZDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzYg QEAKIDIwMTQtMDgtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIFNjcm9sbGJhclRoZW1lR3RrIHNob3VsZCBub3QgZGVwZW5kIG9u IFJlbmRlclRoZW1lR3RrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzYzMzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmUgdGhlIGRlcGVuZGVuY3kgYnkgY3JlYXRpbmcgdGhlIEd0a1N0eWxlQ29u dGV4dCBmb3IgdGhlCisgICAgICAgIHNjcm9sbGJhcnMgaW4gU2Nyb2xsYmFyVGhlbWVHdGsuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Z3RrU3R5bGVDaGFuZ2VkQ2FsbGJhY2spOiBDYWxsIFNjcm9sbGJhclRoZW1lR3RrOjp0 aGVtZUNoYW5nZWQoKS4KKyAgICAgICAgKFdlYkNvcmU6OmdldFN0eWxlQ29udGV4dCk6IFJlbW92 ZSB0aGUgc2Nyb2xsYmFyIHN0eWxlIGNvbnRleHQgc3VwcG9ydC4KKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvUmVuZGVyVGhlbWVHdGsuaDogUmVtb3ZlIGd0a1Njcm9sbGJhclN0eWxlKCkuCisgICAg ICAgICogcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGJhclN0eWxlQ29udGV4dDo6U2Nyb2xsYmFyU3R5bGVDb250ZXh0KTogSGVscGVy CisgICAgICAgIGNsYXNzIHRvIGNyZWF0ZSB0aGUgZ2xvYmFsIEd0a1N0eWxlQ29udGV4dCBmb3Ig c2Nyb2xsYmFycy4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclN0eWxlQ29udGV4dDo6flNj cm9sbGJhclN0eWxlQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJTdHlsZUNv bnRleHQ6OmNvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Z3RrU2Nyb2xsYmFyU3R5bGVDb250 ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpTY3JvbGxiYXJUaGVt ZUd0ayk6IFJlbW92ZSBtX2NvbnRleHQgaW5pdGlhbGl6YXRpb24uCisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxiYXJUaGVtZUd0azo6dGhlbWVDaGFuZ2VkKTogSW52YWxpZGF0ZSB0aGUKKyAgICAg ICAgR3RrU3R5bGVjb250ZXh0IGFuZCBjYWxsIHVwZGF0ZVRoZW1lUHJvcGVydGllcygpLgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVHdGs6OnVwZGF0ZVRoZW1lUHJvcGVydGllcyk6 IFVzZSB0aGUKKyAgICAgICAgZ2xvYmFsIHN0eWxlIGNvbnRleHQuCisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRUcmFja0JhY2tncm91bmQpOiBEaXR0by4KKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpwYWludFNjcm9sbGJhckJhY2tncm91bmQp OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lR3RrOjpwYWludFRodW1i KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRCdXR0 b24pOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuaDoK KworMjAxNC0wOC0yOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKICAgICAgICAgW0dUS10gTWVyZ2UgUmVuZGVyVGhlbWVHdGszLmNwcCBpbnRvIFJlbmRlclRo ZW1lR3RrLmNwcCBhbmQgU2Nyb2xsYmFyVGhlbWVHdGszLmNwcCBpbnRvU2Nyb2xsYmFyVGhlbWVH dGsuY3BwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzYzMzYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRo ZW1lR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5j cHAKaW5kZXggNmU0NmE1MS4uYjQ4NTBjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiUmVu ZGVyQm94LmgiCiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyUHJv Z3Jlc3MuaCIKKyNpbmNsdWRlICJTY3JvbGxiYXJUaGVtZUd0ay5oIgogI2luY2x1ZGUgIlN0cmlu Z1RydW5jYXRvci5oIgogI2luY2x1ZGUgIlRpbWVSYW5nZXMuaCIKICNpbmNsdWRlICJVc2VyQWdl bnRTY3JpcHRzLmgiCkBAIC0xNDAsNiArMTQxLDcgQEAgc3RhdGljIHZvaWQgZ3RrU3R5bGVDaGFu Z2VkQ2FsbGJhY2soR09iamVjdCosIEdQYXJhbVNwZWMqKQogewogICAgIGZvciAoY29uc3QgYXV0 byYgc3R5bGVDb250ZXh0IDogc3R5bGVDb250ZXh0TWFwKCkpCiAgICAgICAgIGd0a19zdHlsZV9j b250ZXh0X2ludmFsaWRhdGUoc3R5bGVDb250ZXh0LnZhbHVlLmdldCgpKTsKKyAgICBzdGF0aWNf Y2FzdDxTY3JvbGxiYXJUaGVtZUd0ayo+KFNjcm9sbGJhclRoZW1lOjp0aGVtZSgpKS0+dGhlbWVD aGFuZ2VkKCk7CiAgICAgUGFnZTo6dXBkYXRlU3R5bGVGb3JBbGxQYWdlc0FmdGVyR2xvYmFsQ2hh bmdlSW5FbnZpcm9ubWVudCgpOwogfQogCkBAIC0xNjUsOSArMTY3LDcgQEAgc3RhdGljIEd0a1N0 eWxlQ29udGV4dCogZ2V0U3R5bGVDb250ZXh0KEdUeXBlIHdpZGdldFR5cGUpCiAgICAgR3RrV2lk Z2V0UGF0aCogcGF0aCA9IGd0a193aWRnZXRfcGF0aF9uZXcoKTsKICAgICBndGtfd2lkZ2V0X3Bh dGhfYXBwZW5kX3R5cGUocGF0aCwgd2lkZ2V0VHlwZSk7CiAKLSAgICBpZiAod2lkZ2V0VHlwZSA9 PSBHVEtfVFlQRV9TQ1JPTExCQVIpCi0gICAgICAgIGd0a193aWRnZXRfcGF0aF9pdGVyX2FkZF9j bGFzcyhwYXRoLCAwLCBHVEtfU1RZTEVfQ0xBU1NfU0NST0xMQkFSKTsKLSAgICBlbHNlIGlmICh3 aWRnZXRUeXBlID09IEdUS19UWVBFX0VOVFJZKQorICAgIGlmICh3aWRnZXRUeXBlID09IEdUS19U WVBFX0VOVFJZKQogICAgICAgICBndGtfd2lkZ2V0X3BhdGhfaXRlcl9hZGRfY2xhc3MocGF0aCwg MCwgR1RLX1NUWUxFX0NMQVNTX0VOVFJZKTsKICAgICBlbHNlIGlmICh3aWRnZXRUeXBlID09IEdU S19UWVBFX0FSUk9XKQogICAgICAgICBndGtfd2lkZ2V0X3BhdGhfaXRlcl9hZGRfY2xhc3MocGF0 aCwgMCwgImFycm93Iik7CkBAIC0xOTcsMTEgKzE5Nyw2IEBAIHN0YXRpYyBHdGtTdHlsZUNvbnRl eHQqIGdldFN0eWxlQ29udGV4dChHVHlwZSB3aWRnZXRUeXBlKQogICAgIHJldHVybiBjb250ZXh0 LmdldCgpOwogfQogCi1HdGtTdHlsZUNvbnRleHQqIFJlbmRlclRoZW1lR3RrOjpndGtTY3JvbGxi YXJTdHlsZSgpCi17Ci0gICAgcmV0dXJuIGdldFN0eWxlQ29udGV4dChHVEtfVFlQRV9TQ1JPTExC QVIpOwotfQotCiBzdGF0aWMgR1JlZlB0cjxHZGtQaXhidWY+IGdldFN0b2NrSWNvbkZvcldpZGdl dFR5cGUoR1R5cGUgd2lkZ2V0VHlwZSwgY29uc3QgY2hhciogaWNvbk5hbWUsIGdpbnQgZGlyZWN0 aW9uLCBnaW50IHN0YXRlLCBnaW50IGljb25TaXplKQogewogICAgIEFTU0VSVChpY29uTmFtZSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5oCmluZGV4IDQ2 Y2Q2Y2UuLmMzMDEzMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9S ZW5kZXJUaGVtZUd0ay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJU aGVtZUd0ay5oCkBAIC0xMDAsOCArMTAwLDYgQEAgcHVibGljOgogI2VuZGlmCiAjZW5kaWYKIAot ICAgIEd0a1N0eWxlQ29udGV4dCogZ3RrU2Nyb2xsYmFyU3R5bGUoKTsKLQogcHJpdmF0ZToKICAg ICBSZW5kZXJUaGVtZUd0aygpOwogICAgIHZpcnR1YWwgflJlbmRlclRoZW1lR3RrKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1lR3RrLmNwcAppbmRl eCBjMTBmNWQ3Li5iNGIyNjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9TY3JvbGxiYXJUaGVtZUd0ay5jcHAKQEAgLTI4LDExICsyOCwxMSBAQAogCiAjaW5jbHVkZSAi UGxhdGZvcm1Db250ZXh0Q2Fpcm8uaCIKICNpbmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIK LSNpbmNsdWRlICJSZW5kZXJUaGVtZUd0ay5oIgogI2luY2x1ZGUgIlNjcm9sbFZpZXcuaCIKICNp bmNsdWRlICJTY3JvbGxiYXIuaCIKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAjaW5jbHVkZSA8d3Rm L05ldmVyRGVzdHJveWVkLmg+CisjaW5jbHVkZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5oPgogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE2MywyMiArMTYzLDUwIEBAIEludFJlY3QgU2Nyb2xs YmFyVGhlbWVHdGs6OnRyYWNrUmVjdChTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyLCBi b29sKQogfQogCiAjaWZuZGVmIEdUS19BUElfVkVSU0lPTl8yCi1zdGF0aWMgdm9pZCBndGtTdHls ZUNoYW5nZWRDYWxsYmFjayhHdGtXaWRnZXQqLCBTY3JvbGxiYXJUaGVtZUd0ayogc2Nyb2xsYmFy VGhlbWUpCitjbGFzcyBTY3JvbGxiYXJTdHlsZUNvbnRleHQgeworICAgIFdURl9NQUtFX05PTkNP UFlBQkxFKFNjcm9sbGJhclN0eWxlQ29udGV4dCk7IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwor cHVibGljOgorICAgIFNjcm9sbGJhclN0eWxlQ29udGV4dCgpCisgICAgICAgIDogbV9jb250ZXh0 KGFkb3B0R1JlZihndGtfc3R5bGVfY29udGV4dF9uZXcoKSkpCisgICAgeworICAgICAgICBHdGtX aWRnZXRQYXRoKiBwYXRoID0gZ3RrX3dpZGdldF9wYXRoX25ldygpOworICAgICAgICBndGtfd2lk Z2V0X3BhdGhfYXBwZW5kX3R5cGUocGF0aCwgR1RLX1RZUEVfU0NST0xMQkFSKTsKKyAgICAgICAg Z3RrX3dpZGdldF9wYXRoX2l0ZXJfYWRkX2NsYXNzKHBhdGgsIDAsIEdUS19TVFlMRV9DTEFTU19T Q1JPTExCQVIpOworICAgICAgICBndGtfc3R5bGVfY29udGV4dF9zZXRfcGF0aChtX2NvbnRleHQu Z2V0KCksIHBhdGgpOworICAgICAgICBndGtfd2lkZ2V0X3BhdGhfZnJlZShwYXRoKTsKKyAgICB9 CisKKyAgICB+U2Nyb2xsYmFyU3R5bGVDb250ZXh0KCkKKyAgICB7CisgICAgfQorCisgICAgR3Rr U3R5bGVDb250ZXh0KiBjb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZXh0LmdldCgpOyB9 CisKK3ByaXZhdGU6CisgICAgR1JlZlB0cjxHdGtTdHlsZUNvbnRleHQ+IG1fY29udGV4dDsKK307 CisKK3N0YXRpYyBHdGtTdHlsZUNvbnRleHQqIGd0a1Njcm9sbGJhclN0eWxlQ29udGV4dCgpCiB7 Ci0gICAgc2Nyb2xsYmFyVGhlbWUtPnVwZGF0ZVRoZW1lUHJvcGVydGllcygpOworICAgIHN0YXRp YyBOZXZlckRlc3Ryb3llZDxTY3JvbGxiYXJTdHlsZUNvbnRleHQ+IHN0eWxlQ29udGV4dDsKKyAg ICByZXR1cm4gc3R5bGVDb250ZXh0LmdldCgpLmNvbnRleHQoKTsKIH0KIAogU2Nyb2xsYmFyVGhl bWVHdGs6OlNjcm9sbGJhclRoZW1lR3RrKCkKLSAgICA6IG1fY29udGV4dChzdGF0aWNfY2FzdDxS ZW5kZXJUaGVtZUd0ayo+KFJlbmRlclRoZW1lOjpkZWZhdWx0VGhlbWUoKS5nZXQoKSktPmd0a1Nj cm9sbGJhclN0eWxlKCkpCiB7CiAgICAgdXBkYXRlVGhlbWVQcm9wZXJ0aWVzKCk7Ci0gICAgZ19z aWduYWxfY29ubmVjdChtX2NvbnRleHQsICJjaGFuZ2VkIiwgR19DQUxMQkFDSyhndGtTdHlsZUNo YW5nZWRDYWxsYmFjayksIHRoaXMpOworfQorCit2b2lkIFNjcm9sbGJhclRoZW1lR3RrOjp0aGVt ZUNoYW5nZWQoKQoreworICAgIGd0a19zdHlsZV9jb250ZXh0X2ludmFsaWRhdGUoZ3RrU2Nyb2xs YmFyU3R5bGVDb250ZXh0KCkpOworICAgIHVwZGF0ZVRoZW1lUHJvcGVydGllcygpOwogfQogCiB2 b2lkIFNjcm9sbGJhclRoZW1lR3RrOjp1cGRhdGVUaGVtZVByb3BlcnRpZXMoKQogewogICAgIGd0 a19zdHlsZV9jb250ZXh0X2dldF9zdHlsZSgKLSAgICAgICAgbV9jb250ZXh0LAorICAgICAgICBn dGtTY3JvbGxiYXJTdHlsZUNvbnRleHQoKSwKICAgICAgICAgIm1pbi1zbGlkZXItbGVuZ3RoIiwg Jm1fbWluVGh1bWJMZW5ndGgsCiAgICAgICAgICJzbGlkZXItd2lkdGgiLCAmbV90aHVtYkZhdG5l c3MsCiAgICAgICAgICJ0cm91Z2gtYm9yZGVyIiwgJm1fdHJvdWdoQm9yZGVyV2lkdGgsCkBAIC0y NTksNTUgKzI4Nyw1OSBAQCB2b2lkIFNjcm9sbGJhclRoZW1lR3RrOjpwYWludFRyYWNrQmFja2dy b3VuZChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFNjcm9sbGJhcgogICAgIGlmIChtX3Ryb3Vn aFVuZGVyU3RlcHBlcnMpCiAgICAgICAgIGZ1bGxTY3JvbGxiYXJSZWN0ID0gSW50UmVjdChzY3Jv bGxiYXItPngoKSwgc2Nyb2xsYmFyLT55KCksIHNjcm9sbGJhci0+d2lkdGgoKSwgc2Nyb2xsYmFy LT5oZWlnaHQoKSk7CiAKLSAgICBndGtfc3R5bGVfY29udGV4dF9zYXZlKG1fY29udGV4dCk7Cisg ICAgR3RrU3R5bGVDb250ZXh0KiBzdHlsZUNvbnRleHQgPSBndGtTY3JvbGxiYXJTdHlsZUNvbnRl eHQoKTsKKyAgICBndGtfc3R5bGVfY29udGV4dF9zYXZlKHN0eWxlQ29udGV4dCk7CiAKLSAgICBh cHBseVNjcm9sbGJhclN0eWxlQ29udGV4dENsYXNzZXMobV9jb250ZXh0LCBzY3JvbGxiYXItPm9y aWVudGF0aW9uKCkpOwotICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhtX2NvbnRleHQs IEdUS19TVFlMRV9DTEFTU19UUk9VR0gpOworICAgIGFwcGx5U2Nyb2xsYmFyU3R5bGVDb250ZXh0 Q2xhc3NlcyhzdHlsZUNvbnRleHQsIHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSk7CisgICAgZ3Rr X3N0eWxlX2NvbnRleHRfYWRkX2NsYXNzKHN0eWxlQ29udGV4dCwgR1RLX1NUWUxFX0NMQVNTX1RS T1VHSCk7CiAKLSAgICBndGtfcmVuZGVyX2JhY2tncm91bmQobV9jb250ZXh0LCBjb250ZXh0LT5w bGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgZnVsbFNjcm9sbGJhclJlY3QueCgpLCBmdWxsU2Nyb2xs YmFyUmVjdC55KCksIGZ1bGxTY3JvbGxiYXJSZWN0LndpZHRoKCksIGZ1bGxTY3JvbGxiYXJSZWN0 LmhlaWdodCgpKTsKLSAgICBndGtfcmVuZGVyX2ZyYW1lKG1fY29udGV4dCwgY29udGV4dC0+cGxh dGZvcm1Db250ZXh0KCktPmNyKCksIGZ1bGxTY3JvbGxiYXJSZWN0LngoKSwgZnVsbFNjcm9sbGJh clJlY3QueSgpLCBmdWxsU2Nyb2xsYmFyUmVjdC53aWR0aCgpLCBmdWxsU2Nyb2xsYmFyUmVjdC5o ZWlnaHQoKSk7CisgICAgZ3RrX3JlbmRlcl9iYWNrZ3JvdW5kKHN0eWxlQ29udGV4dCwgY29udGV4 dC0+cGxhdGZvcm1Db250ZXh0KCktPmNyKCksIGZ1bGxTY3JvbGxiYXJSZWN0LngoKSwgZnVsbFNj cm9sbGJhclJlY3QueSgpLCBmdWxsU2Nyb2xsYmFyUmVjdC53aWR0aCgpLCBmdWxsU2Nyb2xsYmFy UmVjdC5oZWlnaHQoKSk7CisgICAgZ3RrX3JlbmRlcl9mcmFtZShzdHlsZUNvbnRleHQsIGNvbnRl eHQtPnBsYXRmb3JtQ29udGV4dCgpLT5jcigpLCBmdWxsU2Nyb2xsYmFyUmVjdC54KCksIGZ1bGxT Y3JvbGxiYXJSZWN0LnkoKSwgZnVsbFNjcm9sbGJhclJlY3Qud2lkdGgoKSwgZnVsbFNjcm9sbGJh clJlY3QuaGVpZ2h0KCkpOwogCi0gICAgZ3RrX3N0eWxlX2NvbnRleHRfcmVzdG9yZShtX2NvbnRl eHQpOworICAgIGd0a19zdHlsZV9jb250ZXh0X3Jlc3RvcmUoc3R5bGVDb250ZXh0KTsKIH0KIAog dm9pZCBTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRTY3JvbGxiYXJCYWNrZ3JvdW5kKEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJhcikKIHsKLSAg ICBndGtfc3R5bGVfY29udGV4dF9zYXZlKG1fY29udGV4dCk7CisgICAgR3RrU3R5bGVDb250ZXh0 KiBzdHlsZUNvbnRleHQgPSBndGtTY3JvbGxiYXJTdHlsZUNvbnRleHQoKTsKKyAgICBndGtfc3R5 bGVfY29udGV4dF9zYXZlKHN0eWxlQ29udGV4dCk7CiAKLSAgICBhcHBseVNjcm9sbGJhclN0eWxl Q29udGV4dENsYXNzZXMobV9jb250ZXh0LCBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkpOwotICAg IGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhtX2NvbnRleHQsICJzY3JvbGxlZC13aW5kb3ci KTsKLSAgICBndGtfcmVuZGVyX2ZyYW1lKG1fY29udGV4dCwgY29udGV4dC0+cGxhdGZvcm1Db250 ZXh0KCktPmNyKCksIHNjcm9sbGJhci0+eCgpLCBzY3JvbGxiYXItPnkoKSwgc2Nyb2xsYmFyLT53 aWR0aCgpLCBzY3JvbGxiYXItPmhlaWdodCgpKTsKKyAgICBhcHBseVNjcm9sbGJhclN0eWxlQ29u dGV4dENsYXNzZXMoc3R5bGVDb250ZXh0LCBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkpOworICAg IGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhzdHlsZUNvbnRleHQsICJzY3JvbGxlZC13aW5k b3ciKTsKKyAgICBndGtfcmVuZGVyX2ZyYW1lKHN0eWxlQ29udGV4dCwgY29udGV4dC0+cGxhdGZv cm1Db250ZXh0KCktPmNyKCksIHNjcm9sbGJhci0+eCgpLCBzY3JvbGxiYXItPnkoKSwgc2Nyb2xs YmFyLT53aWR0aCgpLCBzY3JvbGxiYXItPmhlaWdodCgpKTsKIAotICAgIGd0a19zdHlsZV9jb250 ZXh0X3Jlc3RvcmUobV9jb250ZXh0KTsKKyAgICBndGtfc3R5bGVfY29udGV4dF9yZXN0b3JlKHN0 eWxlQ29udGV4dCk7CiB9CiAKIHZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6OnBhaW50VGh1bWIoR3Jh cGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyLCBj b25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIGd0a19zdHlsZV9jb250ZXh0X3NhdmUobV9jb250 ZXh0KTsKKyAgICBHdGtTdHlsZUNvbnRleHQqIHN0eWxlQ29udGV4dCA9IGd0a1Njcm9sbGJhclN0 eWxlQ29udGV4dCgpOworICAgIGd0a19zdHlsZV9jb250ZXh0X3NhdmUoc3R5bGVDb250ZXh0KTsK IAogICAgIFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uID0gc2Nyb2xsYmFyLT5vcmll bnRhdGlvbigpOwotICAgIGFwcGx5U2Nyb2xsYmFyU3R5bGVDb250ZXh0Q2xhc3NlcyhtX2NvbnRl eHQsIG9yaWVudGF0aW9uKTsKLSAgICBndGtfc3R5bGVfY29udGV4dF9hZGRfY2xhc3MobV9jb250 ZXh0LCBHVEtfU1RZTEVfQ0xBU1NfU0xJREVSKTsKKyAgICBhcHBseVNjcm9sbGJhclN0eWxlQ29u dGV4dENsYXNzZXMoc3R5bGVDb250ZXh0LCBvcmllbnRhdGlvbik7CisgICAgZ3RrX3N0eWxlX2Nv bnRleHRfYWRkX2NsYXNzKHN0eWxlQ29udGV4dCwgR1RLX1NUWUxFX0NMQVNTX1NMSURFUik7CiAK ICAgICBndWludCBmbGFncyA9IDA7CiAgICAgaWYgKHNjcm9sbGJhci0+cHJlc3NlZFBhcnQoKSA9 PSBUaHVtYlBhcnQpCiAgICAgICAgIGZsYWdzIHw9IEdUS19TVEFURV9GTEFHX0FDVElWRTsKICAg ICBpZiAoc2Nyb2xsYmFyLT5ob3ZlcmVkUGFydCgpID09IFRodW1iUGFydCkKICAgICAgICAgZmxh Z3MgfD0gR1RLX1NUQVRFX0ZMQUdfUFJFTElHSFQ7Ci0gICAgZ3RrX3N0eWxlX2NvbnRleHRfc2V0 X3N0YXRlKG1fY29udGV4dCwgc3RhdGljX2Nhc3Q8R3RrU3RhdGVGbGFncz4oZmxhZ3MpKTsKKyAg ICBndGtfc3R5bGVfY29udGV4dF9zZXRfc3RhdGUoc3R5bGVDb250ZXh0LCBzdGF0aWNfY2FzdDxH dGtTdGF0ZUZsYWdzPihmbGFncykpOwogCi0gICAgZ3RrX3JlbmRlcl9zbGlkZXIobV9jb250ZXh0 LCBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgcmVjdC54KCksIHJlY3QueSgpLCBy ZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCksCisgICAgZ3RrX3JlbmRlcl9zbGlkZXIoc3R5bGVD b250ZXh0LCBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgcmVjdC54KCksIHJlY3Qu eSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCksCiAgICAgICAgIG9yaWVudGF0aW9uID09 IFZlcnRpY2FsU2Nyb2xsYmFyID8gR1RLX09SSUVOVEFUSU9OX1ZFUlRJQ0FMIDogR1RLX09SSUVO VEFUSU9OX0hPUklaT05UQUwpOwogCi0gICAgZ3RrX3N0eWxlX2NvbnRleHRfcmVzdG9yZShtX2Nv bnRleHQpOworICAgIGd0a19zdHlsZV9jb250ZXh0X3Jlc3RvcmUoc3R5bGVDb250ZXh0KTsKIH0K IAogdm9pZCBTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRCdXR0b24oR3JhcGhpY3NDb250ZXh0KiBj b250ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyLCBjb25zdCBJbnRSZWN0JiBy ZWN0LCBTY3JvbGxiYXJQYXJ0IHBhcnQpCiB7Ci0gICAgZ3RrX3N0eWxlX2NvbnRleHRfc2F2ZSht X2NvbnRleHQpOworICAgIEd0a1N0eWxlQ29udGV4dCogc3R5bGVDb250ZXh0ID0gZ3RrU2Nyb2xs YmFyU3R5bGVDb250ZXh0KCk7CisgICAgZ3RrX3N0eWxlX2NvbnRleHRfc2F2ZShzdHlsZUNvbnRl eHQpOwogCiAgICAgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24gPSBzY3JvbGxiYXIt Pm9yaWVudGF0aW9uKCk7Ci0gICAgYXBwbHlTY3JvbGxiYXJTdHlsZUNvbnRleHRDbGFzc2VzKG1f Y29udGV4dCwgb3JpZW50YXRpb24pOworICAgIGFwcGx5U2Nyb2xsYmFyU3R5bGVDb250ZXh0Q2xh c3NlcyhzdHlsZUNvbnRleHQsIG9yaWVudGF0aW9uKTsKIAogICAgIGd1aW50IGZsYWdzID0gMDsK ICAgICBpZiAoKEJhY2tCdXR0b25TdGFydFBhcnQgPT0gcGFydCAmJiBzY3JvbGxiYXItPmN1cnJl bnRQb3MoKSkKQEAgLTMyMCwxNCArMzUyLDE0IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6OnBh aW50QnV0dG9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgU2Nyb2xsYmFyVGhlbWVDbGllCiAg ICAgICAgICAgICBmbGFncyB8PSBHVEtfU1RBVEVfRkxBR19QUkVMSUdIVDsKICAgICB9IGVsc2UK ICAgICAgICAgZmxhZ3MgfD0gR1RLX1NUQVRFX0ZMQUdfSU5TRU5TSVRJVkU7Ci0gICAgZ3RrX3N0 eWxlX2NvbnRleHRfc2V0X3N0YXRlKG1fY29udGV4dCwgc3RhdGljX2Nhc3Q8R3RrU3RhdGVGbGFn cz4oZmxhZ3MpKTsKKyAgICBndGtfc3R5bGVfY29udGV4dF9zZXRfc3RhdGUoc3R5bGVDb250ZXh0 LCBzdGF0aWNfY2FzdDxHdGtTdGF0ZUZsYWdzPihmbGFncykpOwogCi0gICAgZ3RrX3N0eWxlX2Nv bnRleHRfYWRkX2NsYXNzKG1fY29udGV4dCwgR1RLX1NUWUxFX0NMQVNTX0JVVFRPTik7Ci0gICAg Z3RrX3JlbmRlcl9iYWNrZ3JvdW5kKG1fY29udGV4dCwgY29udGV4dC0+cGxhdGZvcm1Db250ZXh0 KCktPmNyKCksIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgp KTsKLSAgICBndGtfcmVuZGVyX2ZyYW1lKG1fY29udGV4dCwgY29udGV4dC0+cGxhdGZvcm1Db250 ZXh0KCktPmNyKCksIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdo dCgpKTsKKyAgICBndGtfc3R5bGVfY29udGV4dF9hZGRfY2xhc3Moc3R5bGVDb250ZXh0LCBHVEtf U1RZTEVfQ0xBU1NfQlVUVE9OKTsKKyAgICBndGtfcmVuZGVyX2JhY2tncm91bmQoc3R5bGVDb250 ZXh0LCBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgcmVjdC54KCksIHJlY3QueSgp LCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGd0a19yZW5kZXJfZnJhbWUoc3R5 bGVDb250ZXh0LCBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSwgcmVjdC54KCksIHJl Y3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogCiAgICAgZ2Zsb2F0IGFycm93 U2NhbGluZzsKLSAgICBndGtfc3R5bGVfY29udGV4dF9nZXRfc3R5bGUobV9jb250ZXh0LCAiYXJy b3ctc2NhbGluZyIsICZhcnJvd1NjYWxpbmcsIG51bGxwdHIpOworICAgIGd0a19zdHlsZV9jb250 ZXh0X2dldF9zdHlsZShzdHlsZUNvbnRleHQsICJhcnJvdy1zY2FsaW5nIiwgJmFycm93U2NhbGlu ZywgbnVsbHB0cik7CiAKICAgICBkb3VibGUgYXJyb3dTaXplID0gc3RkOjptaW4ocmVjdC53aWR0 aCgpLCByZWN0LmhlaWdodCgpKSAqIGFycm93U2NhbGluZzsKICAgICBGbG9hdFBvaW50IGFycm93 UG9pbnQoCkBAIC0zMzYsNyArMzY4LDcgQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRC dXR0b24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWUKIAogICAg IGlmIChmbGFncyAmIEdUS19TVEFURV9GTEFHX0FDVElWRSkgewogICAgICAgICBnaW50IGFycm93 RGlzcGxhY2VtZW50WCwgYXJyb3dEaXNwbGFjZW1lbnRZOwotICAgICAgICBndGtfc3R5bGVfY29u dGV4dF9nZXRfc3R5bGUobV9jb250ZXh0LCAiYXJyb3ctZGlzcGxhY2VtZW50LXgiLCAmYXJyb3dE aXNwbGFjZW1lbnRYLCAiYXJyb3ctZGlzcGxhY2VtZW50LXkiLCAmYXJyb3dEaXNwbGFjZW1lbnRZ LCBudWxscHRyKTsKKyAgICAgICAgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0X3N0eWxlKHN0eWxlQ29u dGV4dCwgImFycm93LWRpc3BsYWNlbWVudC14IiwgJmFycm93RGlzcGxhY2VtZW50WCwgImFycm93 LWRpc3BsYWNlbWVudC15IiwgJmFycm93RGlzcGxhY2VtZW50WSwgbnVsbHB0cik7CiAgICAgICAg IGFycm93UG9pbnQubW92ZShhcnJvd0Rpc3BsYWNlbWVudFgsIGFycm93RGlzcGxhY2VtZW50WSk7 CiAgICAgfQogCkBAIC0zNDYsOSArMzc4LDkgQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUd0azo6cGFp bnRCdXR0b24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWUKICAg ICBlbHNlCiAgICAgICAgIGFuZ2xlID0gKHBhcnQgPT0gRm9yd2FyZEJ1dHRvbkVuZFBhcnQgfHwg cGFydCA9PSBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0KSA/IEdfUEkgLyAyIDogMyAqIChHX1BJIC8g Mik7CiAKLSAgICBndGtfcmVuZGVyX2Fycm93KG1fY29udGV4dCwgY29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCktPmNyKCksIGFuZ2xlLCBhcnJvd1BvaW50LngoKSwgYXJyb3dQb2ludC55KCksIGFy cm93U2l6ZSk7CisgICAgZ3RrX3JlbmRlcl9hcnJvdyhzdHlsZUNvbnRleHQsIGNvbnRleHQtPnBs YXRmb3JtQ29udGV4dCgpLT5jcigpLCBhbmdsZSwgYXJyb3dQb2ludC54KCksIGFycm93UG9pbnQu eSgpLCBhcnJvd1NpemUpOwogCi0gICAgZ3RrX3N0eWxlX2NvbnRleHRfcmVzdG9yZShtX2NvbnRl eHQpOworICAgIGd0a19zdHlsZV9jb250ZXh0X3Jlc3RvcmUoc3R5bGVDb250ZXh0KTsKIH0KIAog Ym9vbCBTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnQoU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9s bGJhciwgR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNvbnN0IEludFJlY3QmIGRh bWFnZVJlY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xs YmFyVGhlbWVHdGsuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVt ZUd0ay5oCmluZGV4IDc4OTFiMzkuLjhkODZhMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5oCkBAIC01OSwxMyArNTksMTMgQEAgcHVibGlj OgogICAgIC8vIFRPRE86IFRoZXNlIGFyZSB0aGUgZGVmYXVsdCBHVEsrIHZhbHVlcy4gQXQgc29t ZSBwb2ludCB3ZSBzaG91bGQgcHVsbCB0aGVzZSBmcm9tIHRoZSB0aGVtZSBpdHNlbGYuCiAgICAg dmlydHVhbCBkb3VibGUgaW5pdGlhbEF1dG9zY3JvbGxUaW1lckRlbGF5KCkgeyByZXR1cm4gMC4y MDsgfQogICAgIHZpcnR1YWwgZG91YmxlIGF1dG9zY3JvbGxUaW1lckRlbGF5KCkgeyByZXR1cm4g MC4wMjsgfQotICAgIHZvaWQgdXBkYXRlVGhlbWVQcm9wZXJ0aWVzKCk7CisgICAgdm9pZCB0aGVt ZUNoYW5nZWQoKTsKICAgICB2b2lkIHVwZGF0ZVNjcm9sbGJhcnNGcmFtZVRoaWNrbmVzcygpOwog ICAgIHZvaWQgcmVnaXN0ZXJTY3JvbGxiYXIoU2Nyb2xsYmFyVGhlbWVDbGllbnQqKTsKICAgICB2 b2lkIHVucmVnaXN0ZXJTY3JvbGxiYXIoU2Nyb2xsYmFyVGhlbWVDbGllbnQqKTsKIAogcHJvdGVj dGVkOgotICAgIEd0a1N0eWxlQ29udGV4dCogbV9jb250ZXh0OworICAgIHZvaWQgdXBkYXRlVGhl bWVQcm9wZXJ0aWVzKCk7CiAKICAgICBpbnQgbV90aHVtYkZhdG5lc3M7CiAgICAgaW50IG1fdHJv dWdoQm9yZGVyV2lkdGg7Cg==