118234 2013-07-01 03:33:37 -0700 [GTK] Menu list button doesn't use the text color from the theme 2019-05-16 06:56:04 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=165072 https://bugs.webkit.org/show_bug.cgi?id=185856 https://bugs.webkit.org/show_bug.cgi?id=197947 Gtk P2 Normal --- 1 cgarcia webkit-unassigned commit-queue csaavedra esprehn+autocc glenn gustavo kondapallykalyan mcatanzaro mrobinson xclaesse oldest_to_newest 904967 0 cgarcia 2013-07-01 03:33:37 -0700 GtkComboBox uses a cell area, so the text color is defined in the cell css class. 904968 1 205793 cgarcia 2013-07-01 03:40:31 -0700 Created attachment 205793 Patch 905010 2 205793 mrobinson 2013-07-01 06:49:18 -0700 Comment on attachment 205793 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205793&action=review > Source/WebCore/platform/gtk/RenderThemeGtk.cpp:220 > + style->setColor(menuListButtonTextColor(element)); Doesn't this prevent the CSS theme from adjusting the text color? 905015 3 cgarcia 2013-07-01 07:03:19 -0700 (In reply to comment #2) > (From update of attachment 205793 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=205793&action=review > > > Source/WebCore/platform/gtk/RenderThemeGtk.cpp:220 > > + style->setColor(menuListButtonTextColor(element)); > > Doesn't this prevent the CSS theme from adjusting the text color? I'm not sure, maybe the css color is overriden after this. Check RenderThemeMac::adjustMenuListStyle, mac also sets the color there. 905030 4 mrobinson 2013-07-01 08:05:15 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 205793 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=205793&action=review > > > > > Source/WebCore/platform/gtk/RenderThemeGtk.cpp:220 > > > + style->setColor(menuListButtonTextColor(element)); > > > > Doesn't this prevent the CSS theme from adjusting the text color? > > I'm not sure, maybe the css color is overriden after this. Check RenderThemeMac::adjustMenuListStyle, mac also sets the color there. It might be worth overriding it always, but it also should be possible to avoid it, I think, by only overriding it if it is set to the default color. 906097 5 xclaesse 2013-07-04 02:00:47 -0700 I confirm it fixes the bug in my case. Thanks! 923467 6 csaavedra 2013-09-01 07:56:17 -0700 I think the same bug is happening with input buttons. 923470 7 csaavedra 2013-09-01 08:05:19 -0700 (In reply to comment #6) > I think the same bug is happening with input buttons. Actually no; this seems to be a different bug. 957619 8 csaavedra 2013-12-08 07:31:10 -0800 Martin, do you object to this patch? It would be good to get it in. 957778 9 mrobinson 2013-12-09 00:23:09 -0800 (In reply to comment #8) > Martin, do you object to this patch? It would be good to get it in. This patch overrides the color even if the CSS changes it. I think it should either have RenderThemeGtk::systemColor the proper color or if that is impossible to check if the style specifies the default color and in that case to override it conditionally. 1151805 10 205793 mcatanzaro 2015-12-31 16:12:24 -0800 Comment on attachment 205793 Patch "This patch overrides the color even if the CSS changes it." <-- This is a problem. I guess it's probably a problem elsewhere in this file, though. Also, this code won't work now that the button style class was removed from GTK+. I think the cell style class might be due for removal as well.... 1184060 11 276473 cgarcia 2016-04-15 04:26:33 -0700 Created attachment 276473 Patch People using dark themes have suffered this for too long already. 1184063 12 cgarcia 2016-04-15 06:14:48 -0700 (In reply to comment #10) > Comment on attachment 205793 [details] > Patch > > "This patch overrides the color even if the CSS changes it." <-- This is a > problem. I guess it's probably a problem elsewhere in this file, though. > > Also, this code won't work now that the button style class was removed from > GTK+. I think the cell style class might be due for removal as well.... I think we need to implement RenderTheme::isControlStyled() properly to decide whether to apply native style or not. 1184139 13 276473 darin 2016-04-15 11:08:13 -0700 Comment on attachment 276473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276473&action=review > Source/WebCore/rendering/RenderThemeGtk.cpp:776 > +#if GTK_CHECK_VERSION(3, 20, 0) Seems slightly nicer to put the #if inside the function since there is no difference in the arguments type or usage. > Source/WebCore/rendering/RenderThemeGtk.cpp:779 > + RenderThemeGadget::Info info = { RenderThemeGadget::Type::Generic, "combobox", element->isDisabledFormControl() ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL, { } }; I believe there is no need for the "=" here. > Source/WebCore/rendering/RenderThemeGtk.cpp:781 > + Vector<RenderThemeGadget::Info> children = { I believe there is no need for the "=" here. > Source/WebCore/rendering/RenderThemeGtk.cpp:786 > + return std::make_unique<RenderThemeBoxGadget>(info, children, comboGadget.get())->child(0)->color(); Why does this need to be constructed on the heap with make_unique instead of just constructing it on the stack? return RenderThemeBoxGadget(info, children, comboGadget.get()).child(0)->color(); 1184609 14 cgarcia 2016-04-18 01:44:54 -0700 Committed r199659: <http://trac.webkit.org/changeset/199659> 1425993 15 mcatanzaro 2018-05-21 18:39:27 -0700 *** Bug 165072 has been marked as a duplicate of this bug. *** 205793 2013-07-01 03:40:31 -0700 2016-04-15 04:26:33 -0700 Patch wcore-gtk-combo-color.diff text/plain 4610 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzY2JhODgwLi4zMGE1ZWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMDctMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIE1lbnUgbGlzdCBidXR0b24gZG9lc24ndCB1c2UgdGhlIHRleHQg Y29sb3IgZnJvbSB0aGUgdGhlbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExODIzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEd0a0NvbWJvQm94IHVzZXMgYSBjZWxsIGFyZWEsIHNvIHRoZSB0ZXh0IGNv bG9yIGlzIGRlZmluZWQgaW4gdGhlCisgICAgICAgIGNlbGwgY3NzIGNsYXNzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lR3RrOjphZGp1c3RNZW51TGlzdFN0eWxlKTogU2V0IHRoZSBzdHlsZQorICAgICAg ICBjb2xvciBnaXZlbiBieSBtZW51TGlzdEJ1dHRvblRleHRDb2xvcigpLgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5oOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5k ZXJUaGVtZUd0azIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6Om1lbnVM aXN0QnV0dG9uVGV4dENvbG9yKTogR3RrMgorICAgICAgICBpbXBsZW1lbnRhdGlvbi4KKyAgICAg ICAgKiBwbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRoZW1lR3RrOjptZW51TGlzdEJ1dHRvblRleHRDb2xvcik6IEd0azMKKyAgICAgICAg aW1wbGVtZW50YXRpb24uCisKIDIwMTMtMDYtMjkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgQXZvaWQgY2FsbGluZyBpbnRvIE9iamVjdGl2ZS1DIGV2 ZXJ5IHRpbWUgd2UgZ2V0IHRoZSBzY3JvbGxiYXIgd2lkdGgKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCmluZGV4IGFhMjc1MTguLjMxNWE5ZjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAt MjA5LDEzICsyMDksMTUgQEAgdm9pZCBSZW5kZXJUaGVtZUd0azo6YWRqdXN0QnV0dG9uU3R5bGUo U3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiBzdHlsZSwgV2ViQ28KICAgICAgICAgc3R5bGUt PnNldExpbmVIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lSGVpZ2h0KCkpOwogfQogCi12 b2lkIFJlbmRlclRoZW1lR3RrOjphZGp1c3RNZW51TGlzdFN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBS ZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBjb25zdAordm9pZCBSZW5kZXJUaGVtZUd0azo6 YWRqdXN0TWVudUxpc3RTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqIHN0eWxlLCBF bGVtZW50KiBlbGVtZW50KSBjb25zdAogewogICAgIC8vIFRoZSB0ZXN0cyBjaGVjayBleHBsaWNp dGx5IHRoYXQgc2VsZWN0IG1lbnUgYnV0dG9ucyBpZ25vcmUgbGluZSBoZWlnaHQuCiAgICAgc3R5 bGUtPnNldExpbmVIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lSGVpZ2h0KCkpOwogCiAg ICAgLy8gV2UgY2Fubm90IGdpdmUgYSBwcm9wZXIgcmVuZGVyaW5nIHdoZW4gYm9yZGVyIHJhZGl1 cyBpcyBhY3RpdmUsIHVuZm9ydHVuYXRlbHkuCiAgICAgc3R5bGUtPnJlc2V0Qm9yZGVyUmFkaXVz KCk7CisKKyAgICBzdHlsZS0+c2V0Q29sb3IobWVudUxpc3RCdXR0b25UZXh0Q29sb3IoZWxlbWVu dCkpOwogfQogCiB2b2lkIFJlbmRlclRoZW1lR3RrOjphZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxl KFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIFJlbmRlclN0eWxlKiBzdHlsZSwgRWxlbWVu dCogZSkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5k ZXJUaGVtZUd0ay5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3Rr LmgKaW5kZXggYThjOTczNS4uM2ExYjU5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL1JlbmRlclRoZW1lR3RrLmgKQEAgLTIwMiw2ICsyMDIsOCBAQCBwcml2YXRlOgogICAgIHN0 YXRpYyBJbnRSZWN0IGNhbGN1bGF0ZVByb2dyZXNzUmVjdChSZW5kZXJPYmplY3QqLCBjb25zdCBJ bnRSZWN0Jik7CiAjZW5kaWYKIAorICAgIENvbG9yIG1lbnVMaXN0QnV0dG9uVGV4dENvbG9yKEVs ZW1lbnQqKSBjb25zdDsKKwogICAgIG11dGFibGUgQ29sb3IgbV9wYW5lbENvbG9yOwogICAgIG11 dGFibGUgQ29sb3IgbV9zbGlkZXJDb2xvcjsKICAgICBtdXRhYmxlIENvbG9yIG1fc2xpZGVyVGh1 bWJDb2xvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJU aGVtZUd0azIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3Rr Mi5jcHAKaW5kZXggOTkzZmU0NC4uNTg4YWExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMi5jcHAKQEAgLTQyMiw2ICs0MjIsMTEgQEAgYm9vbCBS ZW5kZXJUaGVtZUd0azo6cGFpbnRNZW51TGlzdChSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3Qg UGFpbnRJbmZvJiBpbmZvLAogICAgIHJldHVybiBmYWxzZTsKIH0KIAorQ29sb3IgUmVuZGVyVGhl bWVHdGs6Om1lbnVMaXN0QnV0dG9uVGV4dENvbG9yKEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0Cit7 CisgICAgcmV0dXJuIENvbG9yKGd0a193aWRnZXRfZ2V0X3N0eWxlKGd0a0J1dHRvbigpKS0+Zmdb ZWxlbWVudCAmJiAhZWxlbWVudC0+aXNEaXNhYmxlZEZvcm1Db250cm9sKCkgPyBHVEtfU1RBVEVf Tk9STUFMIDogR1RLX1NUQVRFX0lOU0VOU0lUSVZFXSk7Cit9CisKIGJvb2wgUmVuZGVyVGhlbWVH dGs6OnBhaW50VGV4dEZpZWxkKFJlbmRlck9iamVjdCogcmVuZGVyT2JqZWN0LCBjb25zdCBQYWlu dEluZm8mIGluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgR3RrV2lkZ2V0KiB3aWRn ZXQgPSBndGtFbnRyeSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrMy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGszLmNwcAppbmRleCA2ZDk1MTU4Li5iZWE1OTNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcApAQCAtNTkzLDYgKzU5MywyMSBA QCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludE1lbnVMaXN0KFJlbmRlck9iamVjdCogcmVuZGVy T2JqZWN0LCBjb25zdCBQYWludEluZm8mCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitDb2xvciBS ZW5kZXJUaGVtZUd0azo6bWVudUxpc3RCdXR0b25UZXh0Q29sb3IoRWxlbWVudCogZWxlbWVudCkg Y29uc3QKK3sKKyAgICBHdGtTdHlsZUNvbnRleHQqIGJ1dHRvblN0eWxlQ29udGV4dCA9IGdldFN0 eWxlQ29udGV4dChHVEtfVFlQRV9CVVRUT04pOworICAgIGd0a19zdHlsZV9jb250ZXh0X3NhdmUo YnV0dG9uU3R5bGVDb250ZXh0KTsKKworICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhi dXR0b25TdHlsZUNvbnRleHQsIEdUS19TVFlMRV9DTEFTU19CVVRUT04pOworICAgIGd0a19zdHls ZV9jb250ZXh0X2FkZF9jbGFzcyhidXR0b25TdHlsZUNvbnRleHQsIEdUS19TVFlMRV9DTEFTU19D RUxMKTsKKworICAgIEdka1JHQkEgY29sb3I7CisgICAgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0X2Nv bG9yKGJ1dHRvblN0eWxlQ29udGV4dCwgZWxlbWVudCAmJiAhZWxlbWVudC0+aXNEaXNhYmxlZEZv cm1Db250cm9sKCkgPyBHVEtfU1RBVEVfRkxBR19OT1JNQUwgOiBHVEtfU1RBVEVfRkxBR19JTlNF TlNJVElWRSwgJmNvbG9yKTsKKworICAgIGd0a19zdHlsZV9jb250ZXh0X3Jlc3RvcmUoYnV0dG9u U3R5bGVDb250ZXh0KTsKKyAgICByZXR1cm4gY29sb3I7Cit9CisKIGJvb2wgUmVuZGVyVGhlbWVH dGs6OnBhaW50VGV4dEZpZWxkKFJlbmRlck9iamVjdCogcmVuZGVyT2JqZWN0LCBjb25zdCBQYWlu dEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBHdGtTdHlsZUNv bnRleHQqIGNvbnRleHQgPSBnZXRTdHlsZUNvbnRleHQoR1RLX1RZUEVfRU5UUlkpOwo= 276473 2016-04-15 04:26:33 -0700 2016-04-15 11:08:13 -0700 Patch wcore-combos-dark.diff text/plain 4221 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBmNzMyNmQ1Li5hNTJhODQw IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTYtMDQtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIE1lbnUgbGlzdCBidXR0b24gZG9lc24ndCB1c2UgdGhlIHRleHQgY29s b3IgZnJvbSB0aGUgdGhlbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExODIzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogTWFudWFsVGVzdHMvZ3RrL3RoZW1lLmh0bWw6IEFkZCBhIGRpc2FibGVkIGNv bWJvIHRlc3QuCisKIDIwMTYtMDQtMTMgIEtvbnN0YW50aW4gVG9rYXJldiAgPGFubnVsZW5AeWFu ZGV4LnJ1PgogCiAgICAgICAgIEZpbmRXZWJQIHNob3VsZCBub3QgYmUgbWlzZ3VpZGVkIGJ5IHBr Zy1jb25maWcgd2hlbiBjcm9zcy1jb21waWxpbmcuCmRpZmYgLS1naXQgYS9NYW51YWxUZXN0cy9n dGsvdGhlbWUuaHRtbCBiL01hbnVhbFRlc3RzL2d0ay90aGVtZS5odG1sCmluZGV4IDBkYTVlNzku LmM3ZDMzMjMgMTAwNjQ0Ci0tLSBhL01hbnVhbFRlc3RzL2d0ay90aGVtZS5odG1sCisrKyBiL01h bnVhbFRlc3RzL2d0ay90aGVtZS5odG1sCkBAIC0zNyw2ICszNyw3IEBACiAgICAgPHRyPgogICAg ICAgPHRkPjxzZWxlY3Q+PG9wdGlvbj5BPC9vcHRpb24+PG9wdGlvbiBzZWxlY3RlZD5CPC9vcHRp b24+PG9wdGlvbj5DPC9vcHRpb24+PC90ZD4KICAgICAgIDx0ZD48c2VsZWN0PjxvcHRpb24+Q29t Ym8gb3B0aW9uIDE8L29wdGlvbj48b3B0aW9uPkNvbWJvIG9wdGlvbiAyPC9vcHRpb24+PG9wdGlv bj5Db21ibyBvcHRpb24gMzwvb3B0aW9uPjwvdGQ+CisgICAgICA8dGQ+PHNlbGVjdCBkaXNhYmxl ZD48b3B0aW9uPkRpc2FibGVkIG9wdGlvbiAxPC9vcHRpb24+PG9wdGlvbj5EaXNhYmxlZCBvcHRp b24gMjwvb3B0aW9uPjxvcHRpb24+RGlzYWJsZWQgb3B0aW9uIDM8L29wdGlvbj48L3RkPgogICAg IDwvdHI+CiAgIDwvdGFibGU+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwY2FjYjU1Li4yMmU2NGE1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTYtMDQtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIE1lbnUgbGlzdCBidXR0b24g ZG9lc24ndCB1c2UgdGhlIHRleHQgY29sb3IgZnJvbSB0aGUgdGhlbWUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODIzNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldCB0aGUgY29tYm8gYm94IGNvbG9y IGFjY3JvZGluZyB0byB0aGUgdGhlbWUgd2hlbiBhZGp1c3RpbmcgdGhlIG1lbnUgbGlzdCBzdHls ZSBsaWtlIE1hYyBwb3J0IGRvZXMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVH dGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bWVudUxpc3RDb2xvcik6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUaGVtZUd0azo6YWRqdXN0TWVudUxpc3RTdHlsZSk6CisKKzIwMTYtMDQtMTUg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFNl bGVjdGlvbi5kZWxldGVGcm9tRG9jdW1lbnQgc2hvdWxkIG5vdCBsZWF2ZSBhIHNlbGVjdGlvbiBj aGFyYWN0ZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1MTQ0MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWVHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcApp bmRleCA2NGU0OTQ1Li4wNjBkNzI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZUd0ay5jcHAKQEAgLTc3MywxMyArNzczLDQwIEBAIGJvb2wgUmVuZGVyVGhlbWVHdGs6 OnBhaW50QnV0dG9uKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyT2JqZWN0LCBjb25zdCBQYWlu dEluCiB9CiAjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMywgMjAsIDApCiAKLXZvaWQgUmVu ZGVyVGhlbWVHdGs6OmFkanVzdE1lbnVMaXN0U3R5bGUoU3R5bGVSZXNvbHZlciYsIFJlbmRlclN0 eWxlJiBzdHlsZSwgRWxlbWVudCopIGNvbnN0CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMjAs IDApCitzdGF0aWMgQ29sb3IgbWVudUxpc3RDb2xvcihFbGVtZW50KiBlbGVtZW50KQoreworICAg IFJlbmRlclRoZW1lR2FkZ2V0OjpJbmZvIGluZm8gPSB7IFJlbmRlclRoZW1lR2FkZ2V0OjpUeXBl OjpHZW5lcmljLCAiY29tYm9ib3giLCBlbGVtZW50LT5pc0Rpc2FibGVkRm9ybUNvbnRyb2woKSA/ IEdUS19TVEFURV9GTEFHX0lOU0VOU0lUSVZFIDogR1RLX1NUQVRFX0ZMQUdfTk9STUFMLCB7IH0g fTsKKyAgICBhdXRvIGNvbWJvR2FkZ2V0ID0gUmVuZGVyVGhlbWVHYWRnZXQ6OmNyZWF0ZShpbmZv KTsKKyAgICBWZWN0b3I8UmVuZGVyVGhlbWVHYWRnZXQ6OkluZm8+IGNoaWxkcmVuID0geworICAg ICAgICB7IFJlbmRlclRoZW1lR2FkZ2V0OjpUeXBlOjpHZW5lcmljLCAiYnV0dG9uIiwgaW5mby5z dGF0ZSwgeyAiY29tYm8iIH0gfQorICAgIH07CisgICAgaW5mby5uYW1lID0gImJveCI7CisgICAg aW5mby5jbGFzc0xpc3QgPSB7ICJob3Jpem9udGFsIiwgImxpbmtlZCIgfTsKKyAgICByZXR1cm4g c3RkOjptYWtlX3VuaXF1ZTxSZW5kZXJUaGVtZUJveEdhZGdldD4oaW5mbywgY2hpbGRyZW4sIGNv bWJvR2FkZ2V0LmdldCgpKS0+Y2hpbGQoMCktPmNvbG9yKCk7Cit9CisjZWxzZQorc3RhdGljIENv bG9yIG1lbnVMaXN0Q29sb3IoRWxlbWVudCogZWxlbWVudCkKK3sKKyAgICBHUmVmUHRyPEd0a1N0 eWxlQ29udGV4dD4gcGFyZW50U3R5bGVDb250ZXh0ID0gY3JlYXRlU3R5bGVDb250ZXh0KENvbWJv Qm94KTsKKyAgICBHUmVmUHRyPEd0a1N0eWxlQ29udGV4dD4gYnV0dG9uU3R5bGVDb250ZXh0ID0g Y3JlYXRlU3R5bGVDb250ZXh0KENvbWJvQm94QnV0dG9uLCBwYXJlbnRTdHlsZUNvbnRleHQuZ2V0 KCkpOworICAgIGd0a19zdHlsZV9jb250ZXh0X3NldF9zdGF0ZShidXR0b25TdHlsZUNvbnRleHQu Z2V0KCksIGVsZW1lbnQtPmlzRGlzYWJsZWRGb3JtQ29udHJvbCgpID8gR1RLX1NUQVRFX0ZMQUdf SU5TRU5TSVRJVkUgOiBHVEtfU1RBVEVfRkxBR19OT1JNQUwpOworCisgICAgR2RrUkdCQSBnZGtS R0JBQ29sb3I7CisgICAgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0X2NvbG9yKGJ1dHRvblN0eWxlQ29u dGV4dC5nZXQoKSwgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0X3N0YXRlKGJ1dHRvblN0eWxlQ29udGV4 dC5nZXQoKSksICZnZGtSR0JBQ29sb3IpOworICAgIHJldHVybiBnZGtSR0JBQ29sb3I7Cit9Cisj ZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMywgMjAsIDApCisKK3ZvaWQgUmVuZGVyVGhlbWVH dGs6OmFkanVzdE1lbnVMaXN0U3R5bGUoU3R5bGVSZXNvbHZlciYsIFJlbmRlclN0eWxlJiBzdHls ZSwgRWxlbWVudCogZWxlbWVudCkgY29uc3QKIHsKICAgICAvLyBUaGUgdGVzdHMgY2hlY2sgZXhw bGljaXRseSB0aGF0IHNlbGVjdCBtZW51IGJ1dHRvbnMgaWdub3JlIGxpbmUgaGVpZ2h0LgogICAg IHN0eWxlLnNldExpbmVIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lSGVpZ2h0KCkpOwog CiAgICAgLy8gV2UgY2Fubm90IGdpdmUgYSBwcm9wZXIgcmVuZGVyaW5nIHdoZW4gYm9yZGVyIHJh ZGl1cyBpcyBhY3RpdmUsIHVuZm9ydHVuYXRlbHkuCiAgICAgc3R5bGUucmVzZXRCb3JkZXJSYWRp dXMoKTsKKworICAgIHN0eWxlLnNldENvbG9yKG1lbnVMaXN0Q29sb3IoZWxlbWVudCkpOwogfQog CiB2b2lkIFJlbmRlclRoZW1lR3RrOjphZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxlKFN0eWxlUmVz b2x2ZXImIHN0eWxlUmVzb2x2ZXIsIFJlbmRlclN0eWxlJiBzdHlsZSwgRWxlbWVudCogZSkgY29u c3QK