186219 2018-06-01 19:22:42 -0700 [GTK] Correct behavior for dark themes 2020-01-29 11:15:04 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=126907 https://bugs.webkit.org/show_bug.cgi?id=165072 https://bugs.webkit.org/show_bug.cgi?id=197947 P2 Normal --- 126907 1 cadubentzen webkit-unassigned bugs-noreply calvaris cgarcia commit-queue mcatanzaro oldest_to_newest 1429473 0 cadubentzen 2018-06-01 19:22:42 -0700 Now that dark themes are working properly on text inputs after bug 126907, some issues that happen on Firefox can happen on WebKitGTK+ as well. E.g. Say some website sets input[type=text] { background-color: "white" } and leave the color property alone. In dark themes it'll render a light text on a white background. This issue can actually happen with any browser, just set input[type=text] { color: "white" } and you get white text on light background. However, as many developers won't test their design in WebKitGTK+ with dark themes, it can be frequent to have pages with partial styling and then trouble in dark themes. A few thoughts on this: - As discussed on matrix with mcatanzaro (quote): Ideally we would have some way to say: "do not use GTK theme colors at all if any parent element has been styled". That might be quite hard to implement, though. - Easy solution: stop using GTK for theming the web content or just stick to Adwaita light. Not so good for some distributions like Elementary that want to have their look and feel. - Another possibility: adding a property in public API (UIProcess) to select the theme. So users could pick their theme of choice for the webview elements. - Another: always switch to the light variant of the current theme. Not sure if this can be done reliably only with GTK calls or something would need to be hard-coded. It seems like in Firefox they use “gtk-application-prefer-dark-theme” but I get rendering issues with dark themes anyway. Opinions on this would be highly appreciated to decide which path to pursue. 1429560 1 mcatanzaro 2018-06-02 08:21:20 -0700 (In reply to Carlos Eduardo Ramalho from comment #0) > - As discussed on matrix with mcatanzaro (quote): Ideally we would have some > way to say: "do not use GTK theme colors at all if any parent element has > been styled". That might be quite hard to implement, though. This is the way to go. Carlos Garcia's comment in bug #118234 might be relevant: (In reply to Carlos Garcia Campos from comment #12) > I think we need to implement RenderTheme::isControlStyled() properly to > decide whether to apply native style or not. 1432965 2 342732 cadubentzen 2018-06-14 05:06:06 -0700 Created attachment 342732 Patch 1432966 3 cadubentzen 2018-06-14 05:14:00 -0700 (In reply to Michael Catanzaro from comment #1) > Carlos Garcia's comment in bug #118234 might be relevant: > > (In reply to Carlos Garcia Campos from comment #12) > > I think we need to implement RenderTheme::isControlStyled() properly to > > decide whether to apply native style or not. I've been doing a few tests on this and here some notes: The return of isControlStyled() impacts whether the adjustXyzStyle() methods are called AND paintXyz() (though it's not coded in RenderTheme, but in RenderBox checking for style.appearance()). The adjustXyzStyle() basically set theme styles for the foreground (which is always drawn by the engine) and the paintXyz() methods draw the background directly to the cairo context via GTK foreign drawing (meaning basically background-color and rounded borders from GTK) Checking if the color was modified in isControlStyled results in the background also not being drawn. This already happens if the background is changed via CSS as we don't the rounded border in some tests. The difference is that if one sets the color now, we don't customize the background either. This is expected, expect I don't like having the inputs not rounded when the color is set :( 1432968 4 cadubentzen 2018-06-14 05:22:06 -0700 Now I didn't include buttons in the patch because buttons already have some other logic coming from other classes. Basically the default color for the buttons is not RenderStyle::initialColor(), but RenderTheme::systemColor(): Color RenderThemeGtk::systemColor(CSSValueID cssValueId, OptionSet<StyleColor::Options> options) const { switch (cssValueId) { case CSSValueButtontext: return styleColor(Button, GTK_STATE_FLAG_ACTIVE, StyleColorForeground); case CSSValueCaptiontext: return styleColor(Entry, GTK_STATE_FLAG_ACTIVE, StyleColorForeground); default: return RenderTheme::systemColor(cssValueId, options); } } And checking for it in isControlStyled() would need to check the disabled color as well (which is also set before reaching isControlStyled() and hardcoded in RenderTheme::systemColor in the CSSGrayText clause)... anyway, a lot of logic outside the RenderTheme code and I was able to fix the regressions related to bug 126907 without having to change the button behavior here. 1432969 5 cadubentzen 2018-06-14 05:26:45 -0700 Lading this would open room for the patch in bug 126907 to be landed back with just some minor modifications. 1433005 6 342732 mcatanzaro 2018-06-14 09:51:44 -0700 Comment on attachment 342732 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342732&action=review Makes sense to me. I wonder if Carlos Garcia will want to review this, as well. > Source/WebCore/rendering/RenderThemeGtk.cpp:930 > + if ((style.appearance() == TextFieldPart || style.appearance() == TextAreaPart || style.appearance() == SearchFieldPart) && style.color() != RenderStyle::initialColor()) > + return true; This is confusing enough that it merits a comment in the code to explain what is going on, I think. > LayoutTests/platform/gtk/TestExpectations:3399 > +# When text input colors are set we do not style with GTK, so these reftests will fail > +webkit.org/b/186219 fast/forms/input-placeholder-text-indent.html [ ImageOnlyFailure ] > +webkit.org/b/186219 fast/forms/password-placeholder-text-security.html [ ImageOnlyFailure ] > +webkit.org/b/186219 fast/forms/placeholder-with-positioned-element.html [ ImageOnlyFailure ] > +webkit.org/b/186219 fast/forms/textarea-placeholder-wrapping.html [ ImageOnlyFailure ] Since these are desired failures, they should go at the top of the file under section two. 1433855 7 342732 cgarcia 2018-06-16 23:16:28 -0700 Comment on attachment 342732 Patch LGTM 1433863 8 342909 cadubentzen 2018-06-17 00:43:14 -0700 Created attachment 342909 Patch 1433871 9 342909 commit-queue 2018-06-17 08:47:45 -0700 Comment on attachment 342909 Patch Clearing flags on attachment: 342909 Committed r232913: <https://trac.webkit.org/changeset/232913> 1433872 10 commit-queue 2018-06-17 08:47:47 -0700 All reviewed patches have been landed. Closing bug. 1530315 11 cgarcia 2019-04-24 22:52:14 -0700 Reopening, this was reverted in r244635. We need to find a better solution for this. 1612565 12 mcatanzaro 2020-01-29 11:15:04 -0800 Obsoleted by bug #197947. 342732 2018-06-14 05:06:06 -0700 2018-06-17 00:43:08 -0700 Patch bug-186219-20180614140604.patch text/plain 4577 cadubentzen U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyODM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGI0ODQ1ZDg3Yjc1OWNm MjVmYzRkYmM5Y2NlMTdmMDZjMWNkY2M4Zi4uMmUwNjI1YThhZWNjNWEyMTcxMjMwNTA5MDdkZGM1 ZWM5YTFhYzE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA2LTEzICBDYXJs b3MgRWR1YXJkbyBSYW1hbGhvICA8Y2FkdWJlbnR6ZW5AZ21haWwuY29tPgorCisgICAgICAgIFtH VEtdIENvcnJlY3QgYmVoYXZpb3IgZm9yIGRhcmsgdGhlbWVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYyMTkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdmVycmlkZSBSZW5kZXJUaGVtZUd0azo6aXND b250cm9sU3R5bGVkKCkgdG8gbm90IHN0eWxlCisgICAgICAgIHRleHQgaW5wdXRzIGlmIGNvbG9y IGlzIHNldCBkaWZmZXJlbnQgdGhhbiBkZWZhdWx0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g TWFudWFsIHRoZW1lIHRlc3QgYW5kIGV4aXN0aW5nIGxheW91dCB0ZXN0cyBhbHJlYWR5IGNvdmVy IGl0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjppc0NvbnRyb2xTdHlsZWQgY29uc3QpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5oOgorCiAyMDE4LTA2LTEzICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggdW5kZXIgU1dTZXJ2ZXI6OnVu cmVnaXN0ZXJDb25uZWN0aW9uKENvbm5lY3Rpb24mKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZUd0ay5jcHAKaW5kZXggZjU0OTQ3MWQzMWYxZjc0NzE1MTczZWQzMjdjNDcz OTQ4NThlNDAyMy4uZDhlYjE2MzRmYjkxNzRkYjFiOTQ2OTdmMGI5YmYxZDc2YTkyMGU0NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC05MjQsNiAr OTI0LDE0IEBAIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50TWVudUxpc3RCdXR0b25EZWNvcmF0 aW9ucyhjb25zdCBSZW5kZXJCb3gmIG9iamVjdCwgY29uCiAgICAgcmV0dXJuIHBhaW50TWVudUxp c3Qob2JqZWN0LCBpbmZvLCByZWN0KTsKIH0KIAorYm9vbCBSZW5kZXJUaGVtZUd0azo6aXNDb250 cm9sU3R5bGVkKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgQm9yZGVyRGF0YSYgYm9y ZGVyLCBjb25zdCBGaWxsTGF5ZXImIGJhY2tncm91bmQsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5k Q29sb3IpIGNvbnN0Cit7CisgICAgaWYgKChzdHlsZS5hcHBlYXJhbmNlKCkgPT0gVGV4dEZpZWxk UGFydCB8fCBzdHlsZS5hcHBlYXJhbmNlKCkgPT0gVGV4dEFyZWFQYXJ0IHx8IHN0eWxlLmFwcGVh cmFuY2UoKSA9PSBTZWFyY2hGaWVsZFBhcnQpICYmIHN0eWxlLmNvbG9yKCkgIT0gUmVuZGVyU3R5 bGU6OmluaXRpYWxDb2xvcigpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBS ZW5kZXJUaGVtZTo6aXNDb250cm9sU3R5bGVkKHN0eWxlLCBib3JkZXIsIGJhY2tncm91bmQsIGJh Y2tncm91bmRDb2xvcik7Cit9CisKICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyMCwgMCkKIAog c3RhdGljIEludFNpemUgc3BpbkJ1dHRvblNpemUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVHdGsuaAppbmRleCAzMWVlN2I3YTMwMjY2MTZlY2JkZjQ5NDY0NTk1ZTE4YThk MTc2OTI0Li4wOTdmOTQxODQzMDg5M2VkZGMxNGY2NTM3MTRjNmFjYzU1MjliODNjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsuaApAQCAtMTY4LDYgKzE2OCw4IEBA IHByaXZhdGU6CiAjZW5kaWYKICNlbmRpZgogCisgICAgYm9vbCBpc0NvbnRyb2xTdHlsZWQoY29u c3QgUmVuZGVyU3R5bGUmLCBjb25zdCBCb3JkZXJEYXRhJiwgY29uc3QgRmlsbExheWVyJiwgY29u c3QgQ29sb3ImKSBjb25zdCBvdmVycmlkZTsKKwogICAgIFNlY29uZHMgYW5pbWF0aW9uUmVwZWF0 SW50ZXJ2YWxGb3JQcm9ncmVzc0JhcihSZW5kZXJQcm9ncmVzcyYpIGNvbnN0IG92ZXJyaWRlOwog ICAgIFNlY29uZHMgYW5pbWF0aW9uRHVyYXRpb25Gb3JQcm9ncmVzc0JhcihSZW5kZXJQcm9ncmVz cyYpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgYWRqdXN0UHJvZ3Jlc3NCYXJTdHlsZShTdHls ZVJlc29sdmVyJiwgUmVuZGVyU3R5bGUmLCBjb25zdCBFbGVtZW50KikgY29uc3Qgb3ZlcnJpZGU7 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggNGFjZGRkNWViMTI0MDc0MGZkOWM3ZTNmNWI2NzllZDMwMjA3MWRmNi4uMzJmMTk2 MDEwNTZkYmVlY2MwNzIxM2QyNmNiZWQ1NjUyMGYxYTU1NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDE4LTA2LTEzICBDYXJsb3MgRWR1YXJkbyBSYW1hbGhvICA8Y2FkdWJlbnR6ZW5AZ21haWwu Y29tPgorCisgICAgICAgIFtHVEtdIENvcnJlY3QgYmVoYXZpb3IgZm9yIGRhcmsgdGhlbWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYyMTkKKwor ICAgICAgICBVcGRhdGUgZXhwZWN0YXRpb25zIGluIHJlZnRlc3RzIGV4cGVjdGVkIHRvIGZhaWwg ZHVlIHRvIG5vdAorICAgICAgICBzdHlsaW5nIHRleHQgaW5wdXRzIHdpdGggR1RLIHdoZW4gY29s b3IgaXMgZGlmZmVyZW50IHRoYW4gZGVmYXVsdCBjb2xvci4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRp b25zOgorCiAyMDE4LTA2LTEzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW01haWxdIFVzZSB0aGUgTWFpbCBWaWV3ZXIgd2lkdGggYXMgdGhlIGJhc2UgZm9yIHJl c29sdmluZyBob3Jpem9udGFsIHZpZXdwb3J0IHVuaXRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDEwN2MwYmU0ODc4OTEzOWFkZjI1NTEwN2UyOWJkOGI2 NDIxMTY1ZTYuLjA1NjExMTI2MjVjYTY2Y2NmYzVlNTk4NDg1ZGEwNGEyZDYyZGRiODcgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCkBAIC0zMzkyLDYgKzMzOTIs MTIgQEAgd2Via2l0Lm9yZy9iLzE4NjI1MiBsZWdhY3ktYW5pbWF0aW9uLWVuZ2luZS9jc3MzL2Zp bHRlcnMvY29tcG9zaXRlZC1kdXJpbmctdHJhbnMKIAogd2Via2l0Lm9yZy9iLzE4NjM0MCB0cmFu c2l0aW9ucy96ZXJvLWR1cmF0aW9uLXdpdGgtbm9uLXplcm8tZGVsYXktc3RhcnQuaHRtbCBbIFRp bWVvdXQgRmFpbHVyZSBdCiAKKyMgV2hlbiB0ZXh0IGlucHV0IGNvbG9ycyBhcmUgc2V0IHdlIGRv IG5vdCBzdHlsZSB3aXRoIEdUSywgc28gdGhlc2UgcmVmdGVzdHMgd2lsbCBmYWlsCit3ZWJraXQu b3JnL2IvMTg2MjE5IGZhc3QvZm9ybXMvaW5wdXQtcGxhY2Vob2xkZXItdGV4dC1pbmRlbnQuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzE4NjIxOSBmYXN0L2Zvcm1zL3Bh c3N3b3JkLXBsYWNlaG9sZGVyLXRleHQtc2VjdXJpdHkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQord2Via2l0Lm9yZy9iLzE4NjIxOSBmYXN0L2Zvcm1zL3BsYWNlaG9sZGVyLXdpdGgtcG9zaXRp b25lZC1lbGVtZW50Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8xODYy MTkgZmFzdC9mb3Jtcy90ZXh0YXJlYS1wbGFjZWhvbGRlci13cmFwcGluZy5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCisKICMvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCiAjIEVuZCBv ZiBub24tY3Jhc2hpbmcsIG5vbi1mbGFreSB0ZXN0cyBmYWlsaW5nCiAjLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLwo= 342909 2018-06-17 00:43:14 -0700 2018-06-17 08:47:45 -0700 Patch bug-186219-20180617094312.patch text/plain 4583 cadubentzen U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyOTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjIxZWUyNWM4YTc2ZjE1 YzgxMWYzNDBjOTUwNTJmNDEwYmQxMjViMC4uYjk4ZDQ0MTg1YmFhOWFhYWNmMjAxYjZiZTMzYzE4 MTZiZjU1MGU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA2LTEzICBDYXJs b3MgRWR1YXJkbyBSYW1hbGhvICA8Y2FkdWJlbnR6ZW5AZ21haWwuY29tPgorCisgICAgICAgIFtH VEtdIENvcnJlY3QgYmVoYXZpb3IgZm9yIGRhcmsgdGhlbWVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYyMTkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdmVycmlkZSBSZW5kZXJUaGVtZUd0azo6aXND b250cm9sU3R5bGVkKCkgdG8gbm90IHN0eWxlCisgICAgICAgIHRleHQgaW5wdXRzIGlmIGNvbG9y IGlzIHNldCBkaWZmZXJlbnQgdGhhbiBkZWZhdWx0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g TWFudWFsIHRoZW1lIHRlc3QgYW5kIGV4aXN0aW5nIGxheW91dCB0ZXN0cyBhbHJlYWR5IGNvdmVy IGl0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjppc0NvbnRyb2xTdHlsZWQgY29uc3QpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5oOgorCiAyMDE4LTA2LTE2ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQmV0dGVyIHBhY2sgUmVzb3VyY2VSZXNw b25zZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3Rr LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5jcHAKaW5kZXgg ZjU0OTQ3MWQzMWYxZjc0NzE1MTczZWQzMjdjNDczOTQ4NThlNDAyMy4uZDA0YTY4NDVmMjZhM2Zk MGQ1NjA4ZjdhNjNiYmY1ZjMwZmY2ODg0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVHdGsuY3BwCkBAIC05MjQsNiArOTI0LDE1IEBAIGJvb2wgUmVuZGVyVGhlbWVH dGs6OnBhaW50TWVudUxpc3RCdXR0b25EZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJCb3gmIG9iamVj dCwgY29uCiAgICAgcmV0dXJuIHBhaW50TWVudUxpc3Qob2JqZWN0LCBpbmZvLCByZWN0KTsKIH0K IAorYm9vbCBSZW5kZXJUaGVtZUd0azo6aXNDb250cm9sU3R5bGVkKGNvbnN0IFJlbmRlclN0eWxl JiBzdHlsZSwgY29uc3QgQm9yZGVyRGF0YSYgYm9yZGVyLCBjb25zdCBGaWxsTGF5ZXImIGJhY2tn cm91bmQsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IpIGNvbnN0Cit7CisgICAgLy8gVG8g YXZvaWQgcmVuZGVyaW5nIGlzc3VlcyB3aXRoIGRhcmsgdGhlbWVzLCBpZiB0ZXh0IGlucHV0IGVs ZW1lbnRzIGhhdmUgY29sb3Igc3R5bGluZywgd2UgZG9uJ3Qgc3R5bGUgdGhlbSB3aXRoIEdUSy4K KyAgICBpZiAoKHN0eWxlLmFwcGVhcmFuY2UoKSA9PSBUZXh0RmllbGRQYXJ0IHx8IHN0eWxlLmFw cGVhcmFuY2UoKSA9PSBUZXh0QXJlYVBhcnQgfHwgc3R5bGUuYXBwZWFyYW5jZSgpID09IFNlYXJj aEZpZWxkUGFydCkgJiYgc3R5bGUuY29sb3IoKSAhPSBSZW5kZXJTdHlsZTo6aW5pdGlhbENvbG9y KCkpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgcmV0dXJuIFJlbmRlclRoZW1lOjppc0Nv bnRyb2xTdHlsZWQoc3R5bGUsIGJvcmRlciwgYmFja2dyb3VuZCwgYmFja2dyb3VuZENvbG9yKTsK K30KKwogI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDIwLCAwKQogCiBzdGF0aWMgSW50U2l6ZSBz cGluQnV0dG9uU2l6ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVHdGsuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5o CmluZGV4IDMxZWU3YjdhMzAyNjYxNmVjYmRmNDk0NjQ1OTVlMThhOGQxNzY5MjQuLjA5N2Y5NDE4 NDMwODkzZWRkYzE0ZjY1MzcxNGM2YWNjNTUyOWI4M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0ay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUd0ay5oCkBAIC0xNjgsNiArMTY4LDggQEAgcHJpdmF0ZToKICNlbmRp ZgogI2VuZGlmCiAKKyAgICBib29sIGlzQ29udHJvbFN0eWxlZChjb25zdCBSZW5kZXJTdHlsZSYs IGNvbnN0IEJvcmRlckRhdGEmLCBjb25zdCBGaWxsTGF5ZXImLCBjb25zdCBDb2xvciYpIGNvbnN0 IG92ZXJyaWRlOworCiAgICAgU2Vjb25kcyBhbmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclByb2dy ZXNzQmFyKFJlbmRlclByb2dyZXNzJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgU2Vjb25kcyBhbmlt YXRpb25EdXJhdGlvbkZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzJikgY29uc3Qgb3ZlcnJp ZGU7CiAgICAgdm9pZCBhZGp1c3RQcm9ncmVzc0JhclN0eWxlKFN0eWxlUmVzb2x2ZXImLCBSZW5k ZXJTdHlsZSYsIGNvbnN0IEVsZW1lbnQqKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhNDhlZmM3 MTJhYWM4YTkwY2M1YTY1M2I2NTRlYTYxOTViMWNlNzcyLi43MGZlMTBlNzk0MDk3MzE1MjQ3ODhk ODhlYTI4MjE0YjFmZjQwYWEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDYtMTMgIENh cmxvcyBFZHVhcmRvIFJhbWFsaG8gIDxjYWR1YmVudHplbkBnbWFpbC5jb20+CisKKyAgICAgICAg W0dUS10gQ29ycmVjdCBiZWhhdmlvciBmb3IgZGFyayB0aGVtZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjIxOQorCisgICAgICAgIFVwZGF0ZSBl eHBlY3RhdGlvbnMgaW4gcmVmdGVzdHMgZXhwZWN0ZWQgdG8gZmFpbCBkdWUgdG8gbm90CisgICAg ICAgIHN0eWxpbmcgdGV4dCBpbnB1dHMgd2l0aCBHVEsgd2hlbiBjb2xvciBpcyBkaWZmZXJlbnQg dGhhbiBkZWZhdWx0IGNvbG9yLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTgtMDYt MTYgIEJyZW5kYW4gTWNMb3VnaGxpbiAgPGJyZW5kYW5AYm9jb3VwLmNvbT4KIAogICAgICAgICBT eW5jIGFkZGl0aW9uYWwgd2ViLXBsYXRmb3JtLXRlc3RzIGRpcmVjdG9yaWVzIHVwIHRvIDE5N2Nk YWQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25z IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZDVkYWI3 NDY0NDU2MWRiYjY2M2ExYWE1ZTFhMTBjZjM4ZmE4YzY3ZS4uY2FjMjQ4OWE0NzViNTkzYTk2MTQ3 MThlNDVlNTU4NmMyNzBkOTg4MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBl Y3RhdGlvbnMKQEAgLTExNjcsNiArMTE2NywxMiBAQCB3ZWJraXQub3JnL2IvMTg2MDg2IGZhc3Qv dGV4dC9mb250LWNvbGxlY3Rpb24uaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogIyBUZXN0IGRv ZXMgbm90IG1ha2Ugc2Vuc2UgZm9yIG91ciBwbGF0Zm9ybQogd2Via2l0Lm9yZy9iLzE4MTY1OSBm YXN0L2NhbnZhcy93ZWJnbC9zaW11bGF0ZWQtdmVydGV4QXR0cmliMC1pbnZhbGlkLWluZGljaWVz Lmh0bWwgWyBTa2lwIF0KIAorIyBXaGVuIHRleHQgaW5wdXQgY29sb3JzIGFyZSBzZXQgd2UgZG8g bm90IHN0eWxlIHdpdGggR1RLLCBzbyB0aGVzZSByZWZ0ZXN0cyB3aWxsIGZhaWwKK3dlYmtpdC5v cmcvYi8xODYyMTkgZmFzdC9mb3Jtcy9pbnB1dC1wbGFjZWhvbGRlci10ZXh0LWluZGVudC5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMTg2MjE5IGZhc3QvZm9ybXMvcGFz c3dvcmQtcGxhY2Vob2xkZXItdGV4dC1zZWN1cml0eS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd Cit3ZWJraXQub3JnL2IvMTg2MjE5IGZhc3QvZm9ybXMvcGxhY2Vob2xkZXItd2l0aC1wb3NpdGlv bmVkLWVsZW1lbnQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzE4NjIx OSBmYXN0L2Zvcm1zL3RleHRhcmVhLXBsYWNlaG9sZGVyLXdyYXBwaW5nLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KKwogIy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KICMgRW5kIG9m IEV4cGVjdGVkIGZhaWx1cmVzLgogIwo=