165072 2016-11-25 09:28:48 -0800 [GTK] Difficult to read combo box text in dark theme 2020-01-29 11:14:51 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugzilla.redhat.com/show_bug.cgi?id=1317542 https://bugs.webkit.org/show_bug.cgi?id=126907 https://bugs.webkit.org/show_bug.cgi?id=118234 https://bugs.webkit.org/show_bug.cgi?id=185856 https://bugs.webkit.org/show_bug.cgi?id=186146 https://bugs.webkit.org/show_bug.cgi?id=197947 P2 Normal --- 1 mcatanzaro webkit-unassigned agomez bugs-noreply cadubentzen cgarcia commit-queue mcatanzaro oldest_to_newest 1253655 0 mcatanzaro 2016-11-25 09:28:48 -0800 Moving this bug from downstream: """ When <select> item is styled, the dropdown does not respect that style for background and it can be hard to read selected value, since text color is respected. See the example code: <style> select {color:#F8F8F8; background:#000000;} </style> <select> <option>Foo</option> <option>Bar</option> </select> In epiphany it is very hard to see what exactly is selected since it shows light gray (F8F8F8) text on gray background (default for form controls). Also when the drop down is opened, it is not styled at all. """ 1424227 1 cadubentzen 2018-05-15 20:10:19 -0700 I just tested it here and it seems like now neither the text color nor background color are respected.. The combobox just sticks with the default theme style. So it's readable but not with the correct behaviour. 1424230 2 cadubentzen 2018-05-15 20:39:45 -0700 bug 118234 made WebKitGTK+ override CSS color with theme color. 1424231 3 cadubentzen 2018-05-15 20:43:53 -0700 Also from bug 118234: > I think we need to implement RenderTheme::isControlStyled() properly to decide whether to apply native style or not. 1425992 4 mcatanzaro 2018-05-21 18:39:27 -0700 Carlos Eduardo says the dark theme readability issue was fixed in bug #118234, closing. *** This bug has been marked as a duplicate of bug 118234 *** 1426001 5 mcatanzaro 2018-05-21 19:03:49 -0700 (In reply to Carlos Eduardo Ramalho from comment #3) > Also from bug 118234: > > > I think we need to implement RenderTheme::isControlStyled() properly to decide whether to apply native style or not. Bug #185856 1426166 6 cadubentzen 2018-05-22 08:49:16 -0700 The example given works ok but if one sets size=2 in the select then it gets difficult to read again. 1426167 7 mcatanzaro 2018-05-22 08:52:16 -0700 Reopening. 1428850 8 mcatanzaro 2018-05-31 08:58:18 -0700 Carlos Eduardo, is this a bug you'd be interested in working on, now that https://bugs.webkit.org/show_bug.cgi?id=126907 is solved? 1429023 9 cadubentzen 2018-05-31 15:23:50 -0700 (In reply to Michael Catanzaro from comment #8) > Carlos Eduardo, is this a bug you'd be interested in working on, now that > https://bugs.webkit.org/show_bug.cgi?id=126907 is solved? Yes :) I'll look into this one. 1429067 10 mcatanzaro 2018-05-31 17:04:38 -0700 OK. Please pay attention to https://bugs.webkit.org/show_bug.cgi?id=186146 which is likely going to affect your work here. 1429091 11 341720 cadubentzen 2018-05-31 18:04:51 -0700 Created attachment 341720 Patch 1429092 12 cadubentzen 2018-05-31 18:09:42 -0700 (In reply to Michael Catanzaro from comment #10) > OK. Please pay attention to https://bugs.webkit.org/show_bug.cgi?id=186146 > which is likely going to affect your work here. Actually my change was is another code path. As mentioned here (In reply to Carlos Eduardo Ramalho from comment #6) > The example given works ok but if one sets size=2 in the select then it gets > difficult to read again. The bug is still happening only when the "size" attribute is >1. In this case, adjustStyle in RenderTheme.cpp arrives with part = ListboxPart, while with size=1 it arrives with part = MenuListPart, which is the case bug 186146 is solving, if I understand correctly. I believe s/combo box/option lists/g in the bug title would clarify this. 1429156 13 341720 cgarcia 2018-05-31 23:56:46 -0700 Comment on attachment 341720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341720&action=review > Source/WebCore/rendering/RenderTheme.cpp:219 > +#if PLATFORM(GTK) > + case ListboxPart: > + return adjustListboxStyle(styleResolver, style, element); > +#endif Do not use platform ifdefs here. > Source/WebCore/rendering/RenderTheme.cpp:952 > +#if PLATFORM(GTK) > +void RenderTheme::adjustListboxStyle(StyleResolver&, RenderStyle&, const Element*) const > +{ > +} > +#endif We could have a default empty implementation in the header for ports not implementing this. > Source/WebCore/rendering/RenderTheme.h:310 > +#if PLATFORM(GTK) > + virtual void adjustListboxStyle(StyleResolver&, RenderStyle&, const Element*) const; > +#endif Remove the platform ifdefs here and simply use an empty implementation here like other virtual methods do. I wouldn't make it const, even if it's true that the gtk implementation is const. 1429190 14 cadubentzen 2018-06-01 04:58:19 -0700 (In reply to Carlos Garcia Campos from comment #13) Thanks for the review! > Comment on attachment 341720 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=341720&action=review > > > Source/WebCore/rendering/RenderTheme.cpp:219 > > +#if PLATFORM(GTK) > > + case ListboxPart: > > + return adjustListboxStyle(styleResolver, style, element); > > +#endif > > Do not use platform ifdefs here. OK > > > Source/WebCore/rendering/RenderTheme.cpp:952 > > +#if PLATFORM(GTK) > > +void RenderTheme::adjustListboxStyle(StyleResolver&, RenderStyle&, const Element*) const > > +{ > > +} > > +#endif > > We could have a default empty implementation in the header for ports not > implementing this. OK > > > Source/WebCore/rendering/RenderTheme.h:310 > > +#if PLATFORM(GTK) > > + virtual void adjustListboxStyle(StyleResolver&, RenderStyle&, const Element*) const; > > +#endif > > Remove the platform ifdefs here and simply use an empty implementation here > like other virtual methods do. I wouldn't make it const, even if it's true > that the gtk implementation is const. All the others adjustFooStyle() methods are const, so I just did the same. Those adjustFooStyle methods are supposed to operate on the RenderStyle reference passed as parameter anyway, and do not change any member data. I think it's better to leave it as const for consistency. 1429191 15 341751 cadubentzen 2018-06-01 05:00:04 -0700 Created attachment 341751 Patch 1429196 16 341751 cgarcia 2018-06-01 05:35:48 -0700 Comment on attachment 341751 Patch Thanks! 1429200 17 341751 commit-queue 2018-06-01 06:02:44 -0700 Comment on attachment 341751 Patch Clearing flags on attachment: 341751 Committed r232392: <https://trac.webkit.org/changeset/232392> 1429201 18 commit-queue 2018-06-01 06:02:46 -0700 All reviewed patches have been landed. Closing bug. 1429708 19 mcatanzaro 2018-06-03 15:33:53 -0700 Reopening due to https://bugs.webkit.org/show_bug.cgi?id=186244 1612564 20 mcatanzaro 2020-01-29 11:14:51 -0800 Obsoleted by bug #197947. 341720 2018-05-31 18:04:51 -0700 2018-06-01 04:59:59 -0700 Patch bug-165072-20180531220647.patch text/plain 5289 cadubentzen U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQwNTBmYWJlMjkzNzE4 Nzg2ZTk4ZTYzYWFjOGFiYzc0YmExODFiOC4uNDcxZGM0ZWMxN2EzMmQ4NDZhMmZlZGU5NGJlYTNh YzI2MGE5NDQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA1LTMxICBDYXJs b3MgRWR1YXJkbyBSYW1hbGhvICA8Y2FkdWJlbnR6ZW5AZ21haWwuY29tPgorCisgICAgICAgIFtH VEtdIERpZmZpY3VsdCB0byByZWFkIGNvbWJvIGJveCB0ZXh0IGluIGRhcmsgdGhlbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTA3MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldCBsaXN0Ym94IGZv cmVncm91bmQgY29sb3IgdG8gdGhlbWUgY29sb3IgdG8gZml4IGhhcmQtdG8tcmVhZAorICAgICAg ICB0ZXh0IGNvbG9yIGluIGNvbWJvIGJveCB3aGlsZSB1c2luZyBkYXJrIHRoZW1lLiBCZWNhdXNl IHRoZSBwcm9ibGVtCisgICAgICAgIG9ubHkgaGFwcGVucyB3aXRoIEdUSywgdGhlIG5ldyBjb2Rl IHdhcyBhZGRlZCBpbnNpZGUgI2lmIFBMQVRGT1JNKEdUSykuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIHJlcXVpcmVkLiBNYW51YWxUZXN0cy9ndGsvdGhlbWUuaHRtbCBhbHJlYWR5IGNvdmVycyBp dC4KKyAgICAgICAgU2VlIHRoZSAiT3B0aW9uIExpc3RzIiBzZWN0aW9uLgorCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l OjphZGp1c3RTdHlsZSk6CisgICAgICAgIEFkanVzdCBzdHlsZSBmb3IgTGlzdGJveFBhcnQgYXMg d2VsbC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjphZGp1c3RMaXN0Ym94U3R5bGUg Y29uc3QpOiBBZGRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWUuaDogQWRkIGFk anVzdExpc3Rib3hTdHlsZSgpCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjphZGp1c3RMaXN0Ym94U3R5bGUg Y29uc3QpOgorICAgICAgICBTZXQgY29sb3IgdG8gdGhlIHRoZW1lIGZvcmVncm91bmQgY29sb3Iu CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmg6IGFkanVzdExpc3Rib3hTdHls ZSgpIG92ZXJyaWRlbi4KKwogMjAxOC0wNS0zMCAgQ2FybG9zIEVkdWFyZG8gUmFtYWxobyAgPGNh ZHViZW50emVuQGdtYWlsLmNvbT4KIAogICAgICAgICBbR1RLXSBIYXJkY29kZWQgdGV4dCBjb2xv ciBpbiBpbnB1dCBmaWVsZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3Bw CmluZGV4IGQ2N2UyN2EzNDIwOWM1NTNlNGM0MWYwZmYxMGExZDNmOWQwZWRiNDcuLjVjNWU5NDk2 OGQ1ODE2NTIzMjU4ZGFkYTBkMjRiNTRlNzg4Y2RiNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lLmNwcApAQCAtMjEzLDYgKzIxMywxMCBAQCB2b2lkIFJlbmRlclRoZW1l OjphZGp1c3RTdHlsZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBSZW5kZXJTdHlsZSYg c3R5bGUsCiAgICAgICAgIHJldHVybiBhZGp1c3RNZW51TGlzdFN0eWxlKHN0eWxlUmVzb2x2ZXIs IHN0eWxlLCBlbGVtZW50KTsKICAgICBjYXNlIE1lbnVsaXN0QnV0dG9uUGFydDoKICAgICAgICAg cmV0dXJuIGFkanVzdE1lbnVMaXN0QnV0dG9uU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGVs ZW1lbnQpOworI2lmIFBMQVRGT1JNKEdUSykKKyAgICBjYXNlIExpc3Rib3hQYXJ0OgorICAgICAg ICByZXR1cm4gYWRqdXN0TGlzdGJveFN0eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBlbGVtZW50 KTsKKyNlbmRpZgogICAgIGNhc2UgTWVkaWFQbGF5QnV0dG9uUGFydDoKICAgICBjYXNlIE1lZGlh Q3VycmVudFRpbWVQYXJ0OgogICAgIGNhc2UgTWVkaWFUaW1lUmVtYWluaW5nUGFydDoKQEAgLTk0 MSw2ICs5NDUsMTIgQEAgdm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0TWVudUxpc3RTdHlsZShTdHls ZVJlc29sdmVyJiwgUmVuZGVyU3R5bGUmLCBjb25zdCBFbGVtZW4KIHsKIH0KIAorI2lmIFBMQVRG T1JNKEdUSykKK3ZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdExpc3Rib3hTdHlsZShTdHlsZVJlc29s dmVyJiwgUmVuZGVyU3R5bGUmLCBjb25zdCBFbGVtZW50KikgY29uc3QKK3sKK30KKyNlbmRpZgor CiAjaWYgRU5BQkxFKE1FVEVSX0VMRU1FTlQpCiAKIHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdE1l dGVyU3R5bGUoU3R5bGVSZXNvbHZlciYsIFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRWxlbWVu dCopIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCmluZGV4IDdkYWFl Y2M2NDZhOWNjYjU3YmRiZDA2NWUwZWMyMWI2ODUzOTI1YWUuLjljZDc4YTVkYzk5YjVlMDdlZDI5 MjE0MDBjZTRmYTg5YWYxN2I5NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZS5oCkBAIC0zMDUsNiArMzA1LDEwIEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgYWRq dXN0TWVudUxpc3RCdXR0b25TdHlsZShTdHlsZVJlc29sdmVyJiwgUmVuZGVyU3R5bGUmLCBjb25z dCBFbGVtZW50KikgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHBhaW50TWVudUxpc3RCdXR0b25E ZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJCb3gmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBGbG9h dFJlY3QmKSB7IHJldHVybiB0cnVlOyB9CiAKKyNpZiBQTEFURk9STShHVEspCisgICAgdmlydHVh bCB2b2lkIGFkanVzdExpc3Rib3hTdHlsZShTdHlsZVJlc29sdmVyJiwgUmVuZGVyU3R5bGUmLCBj b25zdCBFbGVtZW50KikgY29uc3Q7CisjZW5kaWYKKwogICAgIHZpcnR1YWwgYm9vbCBwYWludFB1 c2hCdXR0b25EZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8m LCBjb25zdCBJbnRSZWN0JikgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgYm9vbCBwYWlu dFNxdWFyZUJ1dHRvbkRlY29yYXRpb25zKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50 SW5mbyYsIGNvbnN0IEludFJlY3QmKSB7IHJldHVybiB0cnVlOyB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsuY3BwCmluZGV4IDZmMzUxOWQwN2Q1ZDExNTg4ZGI1 MDgwNTI3NWY2NGUyNjUxZWM4MWIuLjI4ZTYyYjI5OGI3OTk3Nzk4YjUwMjhkOWM2MDE4MGZkNGQ5 ZjAxZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0 ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcApA QCAtMTEzNSw2ICsxMTM1LDEyIEBAIHZvaWQgUmVuZGVyVGhlbWVHdGs6OmFkanVzdFRleHRBcmVh U3R5bGUoU3R5bGVSZXNvbHZlciYsIFJlbmRlclN0eWxlJiBzdHlsZSwgY29uCiAgICAgICAgIHN0 eWxlLnNldENvbG9yKHN0eWxlQ29sb3IoRW50cnksIGVsZW1lbnQtPmlzRGlzYWJsZWRGb3JtQ29u dHJvbCgpID8gR1RLX1NUQVRFX0ZMQUdfSU5TRU5TSVRJVkUgOiBHVEtfU1RBVEVfRkxBR19OT1JN QUwsIFN0eWxlQ29sb3JGb3JlZ3JvdW5kKSk7CiB9CiAKK3ZvaWQgUmVuZGVyVGhlbWVHdGs6OmFk anVzdExpc3Rib3hTdHlsZShTdHlsZVJlc29sdmVyJiwgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25z dCBFbGVtZW50KiBlbGVtZW50KSBjb25zdAoreworICAgIGlmIChlbGVtZW50KQorICAgICAgICBz dHlsZS5zZXRDb2xvcihzdHlsZUNvbG9yKExpc3RCb3gsIGVsZW1lbnQtPmlzRGlzYWJsZWRGb3Jt Q29udHJvbCgpID8gR1RLX1NUQVRFX0ZMQUdfSU5TRU5TSVRJVkUgOiBHVEtfU1RBVEVfRkxBR19O T1JNQUwsIFN0eWxlQ29sb3JGb3JlZ3JvdW5kKSk7Cit9CisKIGJvb2wgUmVuZGVyVGhlbWVHdGs6 OnBhaW50VGV4dEFyZWEoY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBjb25zdCBQYWludEluZm8mIGks IGNvbnN0IEZsb2F0UmVjdCYgcikKIHsKICAgICByZXR1cm4gcGFpbnRUZXh0RmllbGQobywgaSwg cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5oCmluZGV4IGFlZjhm ZWQ3MjY0NzQzMTc2MWFiNTNhMjkxYWEwMzU2OWI1ZDkwOWIuLjRlZGRhYzAzNGNjYmQxODI0YzRl ZWE4NzM1YzVhYWQ3NDQzNjg2ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZUd0ay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUd0ay5oCkBAIC0xMzMsNiArMTMzLDggQEAgcHJpdmF0ZToKICAgICBib29sIHBhaW50TWVu dUxpc3QoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgRmxvYXRS ZWN0Jikgb3ZlcnJpZGU7CiAgICAgYm9vbCBwYWludE1lbnVMaXN0QnV0dG9uRGVjb3JhdGlvbnMo Y29uc3QgUmVuZGVyQm94JiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgRmxvYXRSZWN0Jikgb3Zl cnJpZGU7CiAKKyAgICB2b2lkIGFkanVzdExpc3Rib3hTdHlsZShTdHlsZVJlc29sdmVyJiwgUmVu ZGVyU3R5bGUmLCBjb25zdCBFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7CisKICAgICB2b2lkIGFk anVzdFNlYXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0U3R5bGUoU3R5bGVSZXNvbHZlciYs IFJlbmRlclN0eWxlJiwgY29uc3QgRWxlbWVudCopIGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wg cGFpbnRTZWFyY2hGaWVsZFJlc3VsdHNEZWNvcmF0aW9uUGFydChjb25zdCBSZW5kZXJCb3gmLCBj b25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jikgb3ZlcnJpZGU7CiAK 341751 2018-06-01 05:00:04 -0700 2018-06-01 06:02:44 -0700 Patch bug-165072-20180601090201.patch text/plain 4712 cadubentzen U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQwNTBmYWJlMjkzNzE4 Nzg2ZTk4ZTYzYWFjOGFiYzc0YmExODFiOC4uMjY3NDk5MTM1ZTlmMTM2YmVkMzZmYzRhYTUxNWY0 M2MyNTQwYzMzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA1LTMxICBDYXJs b3MgRWR1YXJkbyBSYW1hbGhvICA8Y2FkdWJlbnR6ZW5AZ21haWwuY29tPgorCisgICAgICAgIFtH VEtdIERpZmZpY3VsdCB0byByZWFkIGNvbWJvIGJveCB0ZXh0IGluIGRhcmsgdGhlbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTA3MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldCBsaXN0Ym94IGZv cmVncm91bmQgY29sb3IgdG8gdGhlbWUgY29sb3IgdG8gZml4IGhhcmQtdG8tcmVhZAorICAgICAg ICB0ZXh0IGNvbG9yIGluIGNvbWJvIGJveCB3aGlsZSB1c2luZyBkYXJrIHRoZW1lLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyByZXF1aXJlZC4gTWFudWFsVGVzdHMvZ3RrL3RoZW1lLmh0bWwgYWxy ZWFkeSBjb3ZlcnMgaXQuCisgICAgICAgIFNlZSB0aGUgIk9wdGlvbiBMaXN0cyIgc2VjdGlvbi4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUpOgorICAgICAgICBBZGp1c3Qgc3R5bGUgZm9yIExp c3Rib3hQYXJ0IGFzIHdlbGwuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6IEFk ZCBhZGp1c3RMaXN0Ym94U3R5bGUoKQorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUd0 ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6YWRqdXN0TGlzdGJveFN0 eWxlIGNvbnN0KToKKyAgICAgICAgU2V0IGNvbG9yIHRvIHRoZSB0aGVtZSBmb3JlZ3JvdW5kIGNv bG9yLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5oOiBhZGp1c3RMaXN0Ym94 U3R5bGUoKSBvdmVycmlkZW4uCisKIDIwMTgtMDUtMzAgIENhcmxvcyBFZHVhcmRvIFJhbWFsaG8g IDxjYWR1YmVudHplbkBnbWFpbC5jb20+CiAKICAgICAgICAgW0dUS10gSGFyZGNvZGVkIHRleHQg Y29sb3IgaW4gaW5wdXQgZmllbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l LmNwcAppbmRleCBkNjdlMjdhMzQyMDljNTUzZTRjNDFmMGZmMTBhMWQzZjlkMGVkYjQ3Li4xNTk2 MzIwMTViMzc3NGFhZGQyNmJkYmZlMWYxZDM5NmU4MGQ3YTQwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKQEAgLTIxMyw2ICsyMTMsOCBAQCB2b2lkIFJlbmRlclRo ZW1lOjphZGp1c3RTdHlsZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBSZW5kZXJTdHls ZSYgc3R5bGUsCiAgICAgICAgIHJldHVybiBhZGp1c3RNZW51TGlzdFN0eWxlKHN0eWxlUmVzb2x2 ZXIsIHN0eWxlLCBlbGVtZW50KTsKICAgICBjYXNlIE1lbnVsaXN0QnV0dG9uUGFydDoKICAgICAg ICAgcmV0dXJuIGFkanVzdE1lbnVMaXN0QnV0dG9uU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUs IGVsZW1lbnQpOworICAgIGNhc2UgTGlzdGJveFBhcnQ6CisgICAgICAgIHJldHVybiBhZGp1c3RM aXN0Ym94U3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGVsZW1lbnQpOwogICAgIGNhc2UgTWVk aWFQbGF5QnV0dG9uUGFydDoKICAgICBjYXNlIE1lZGlhQ3VycmVudFRpbWVQYXJ0OgogICAgIGNh c2UgTWVkaWFUaW1lUmVtYWluaW5nUGFydDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lLmgKaW5kZXggN2RhYWVjYzY0NmE5Y2NiNTdiZGJkMDY1ZTBlYzIxYjY4NTM5MjVhZS4uYzVl YTMxYThmZTYwMDMwNTZkM2E2MTc5MzliMzkzMTUyMzk5ZWE0MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lLmgKQEAgLTMwNSw2ICszMDUsOCBAQCBwcm90ZWN0ZWQ6CiAgICAg dmlydHVhbCB2b2lkIGFkanVzdE1lbnVMaXN0QnV0dG9uU3R5bGUoU3R5bGVSZXNvbHZlciYsIFJl bmRlclN0eWxlJiwgY29uc3QgRWxlbWVudCopIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBwYWlu dE1lbnVMaXN0QnV0dG9uRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgUGFpbnRJ bmZvJiwgY29uc3QgRmxvYXRSZWN0JikgeyByZXR1cm4gdHJ1ZTsgfQogCisgICAgdmlydHVhbCB2 b2lkIGFkanVzdExpc3Rib3hTdHlsZShTdHlsZVJlc29sdmVyJiwgUmVuZGVyU3R5bGUmLCBjb25z dCBFbGVtZW50KikgY29uc3QgeyB9OworCiAgICAgdmlydHVhbCBib29sIHBhaW50UHVzaEJ1dHRv bkRlY29yYXRpb25zKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0 IEludFJlY3QmKSB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBib29sIHBhaW50U3F1YXJl QnV0dG9uRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJbmZvJiwg Y29uc3QgSW50UmVjdCYpIHsgcmV0dXJuIHRydWU7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUd0ay5jcHAKaW5kZXggNmYzNTE5ZDA3ZDVkMTE1ODhkYjUwODA1Mjc1 ZjY0ZTI2NTFlYzgxYi4uMjhlNjJiMjk4Yjc5OTc3OThiNTAyOGQ5YzYwMTgwZmQ0ZDlmMDFkZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC0xMTM1 LDYgKzExMzUsMTIgQEAgdm9pZCBSZW5kZXJUaGVtZUd0azo6YWRqdXN0VGV4dEFyZWFTdHlsZShT dHlsZVJlc29sdmVyJiwgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb24KICAgICAgICAgc3R5bGUuc2V0 Q29sb3Ioc3R5bGVDb2xvcihFbnRyeSwgZWxlbWVudC0+aXNEaXNhYmxlZEZvcm1Db250cm9sKCkg PyBHVEtfU1RBVEVfRkxBR19JTlNFTlNJVElWRSA6IEdUS19TVEFURV9GTEFHX05PUk1BTCwgU3R5 bGVDb2xvckZvcmVncm91bmQpKTsKIH0KIAordm9pZCBSZW5kZXJUaGVtZUd0azo6YWRqdXN0TGlz dGJveFN0eWxlKFN0eWxlUmVzb2x2ZXImLCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEVsZW1l bnQqIGVsZW1lbnQpIGNvbnN0Cit7CisgICAgaWYgKGVsZW1lbnQpCisgICAgICAgIHN0eWxlLnNl dENvbG9yKHN0eWxlQ29sb3IoTGlzdEJveCwgZWxlbWVudC0+aXNEaXNhYmxlZEZvcm1Db250cm9s KCkgPyBHVEtfU1RBVEVfRkxBR19JTlNFTlNJVElWRSA6IEdUS19TVEFURV9GTEFHX05PUk1BTCwg U3R5bGVDb2xvckZvcmVncm91bmQpKTsKK30KKwogYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRU ZXh0QXJlYShjb25zdCBSZW5kZXJPYmplY3QmIG8sIGNvbnN0IFBhaW50SW5mbyYgaSwgY29uc3Qg RmxvYXRSZWN0JiByKQogewogICAgIHJldHVybiBwYWludFRleHRGaWVsZChvLCBpLCByKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmgKaW5kZXggYWVmOGZlZDcyNjQ3 NDMxNzYxYWI1M2EyOTFhYTAzNTY5YjVkOTA5Yi4uNGVkZGFjMDM0Y2NiZDE4MjRjNGVlYTg3MzVj NWFhZDc0NDM2ODZmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lR3RrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3Rr LmgKQEAgLTEzMyw2ICsxMzMsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgcGFpbnRNZW51TGlzdChj b25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBGbG9hdFJlY3QmKSBv dmVycmlkZTsKICAgICBib29sIHBhaW50TWVudUxpc3RCdXR0b25EZWNvcmF0aW9ucyhjb25zdCBS ZW5kZXJCb3gmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlkZTsK IAorICAgIHZvaWQgYWRqdXN0TGlzdGJveFN0eWxlKFN0eWxlUmVzb2x2ZXImLCBSZW5kZXJTdHls ZSYsIGNvbnN0IEVsZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKKwogICAgIHZvaWQgYWRqdXN0U2Vh cmNoRmllbGRSZXN1bHRzRGVjb3JhdGlvblBhcnRTdHlsZShTdHlsZVJlc29sdmVyJiwgUmVuZGVy U3R5bGUmLCBjb25zdCBFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgYm9vbCBwYWludFNl YXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0KGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFBh aW50SW5mbyYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlkZTsKIAo=