207379 2020-02-07 02:20:41 -0800 [WPE] Use custom theme style to render text fields 2020-02-17 01:08:00 -0800 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=207328 P2 Normal --- 207471 1 cgarcia webkit-unassigned annulen aperez bugs-noreply esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard ryuan.choi sergio oldest_to_newest 1616098 0 cgarcia 2020-02-07 02:20:41 -0800 This includes text entries, text areas and search fields. 1616099 1 390069 cgarcia 2020-02-07 02:25:40 -0800 Created attachment 390069 Patch 1618948 2 390069 aperez 2020-02-14 06:18:09 -0800 Comment on attachment 390069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390069&action=review Patch LGTM with a small unimportant nit :] > Source/WebCore/platform/wpe/RenderThemeWPE.cpp:43 > +static const int textFieldBorderSize = 1; Nit: I would use “unsigned” here, as it does not make sense to allow negative values for a border. 1618951 3 390069 cgarcia 2020-02-14 06:27:29 -0800 Comment on attachment 390069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390069&action=review >> Source/WebCore/platform/wpe/RenderThemeWPE.cpp:43 >> +static const int textFieldBorderSize = 1; > > Nit: I would use “unsigned” here, as it does not make sense to allow > negative values for a border. It's used with negative value for .inflate(), that's why I changed it to int. > Source/WebCore/platform/wpe/RenderThemeWPE.cpp:128 > + fieldRect.inflate(-borderSize); Here. 1619599 4 cgarcia 2020-02-17 01:08:00 -0800 Committed r256724: <https://trac.webkit.org/changeset/256724> 390069 2020-02-07 02:25:40 -0800 2020-02-14 06:18:09 -0800 Patch wpe-text-fields.diff text/plain 10862 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZmRiMTcwNWM4MS4uZDhkMzVlMGQ0MWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAyMC0wMi0wNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gVXNlIGN1c3RvbSB0aGVtZSBzdHlsZSB0byByZW5k ZXIgdGV4dCBmaWVsZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNzM3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgaW5jbHVkZXMgdGV4dCBlbnRyaWVzLCB0ZXh0IGFyZWFzIGFuZCBzZWFyY2gg ZmllbGRzLiBUaGUgc2VhcmNoIGZpZWxkIGljb25zIGFyZSByZW5kZXJlZCB1c2luZyBhbiBleHRy YQorICAgICAgICBkZWZhdWx0IHN0eWxlIHNoZWV0IGZvciB0aGUgdGhlbWUsIHVzaW5nIEFkd2Fp dGEgc3ZnIGljb25zIGluIHRoZSBDU1MuCisKKyAgICAgICAgKiBQbGF0Zm9ybVdQRS5jbWFrZToK KyAgICAgICAgKiBjc3MvdGhlbWVBZHdhaXRhLmNzczogQWRkZWQuCisgICAgICAgIChpbnB1dFt0 eXBlPSJzZWFyY2giXTo6LXdlYmtpdC1zZWFyY2gtcmVzdWx0cy1idXR0b24sKToKKyAgICAgICAg KGlucHV0W3R5cGU9InNlYXJjaCJdOjotd2Via2l0LXNlYXJjaC1yZXN1bHRzLWJ1dHRvbjpob3Zl ciwpOgorICAgICAgICAoaW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13ZWJraXQtc2VhcmNoLWNhbmNl bC1idXR0b24pOgorICAgICAgICAoYm9keVtkaXI9InJ0bCJdIGlucHV0W3R5cGU9InNlYXJjaCJd Ojotd2Via2l0LXNlYXJjaC1jYW5jZWwtYnV0dG9uKToKKyAgICAgICAgKGlucHV0W3R5cGU9InNl YXJjaCJdOjotd2Via2l0LXNlYXJjaC1jYW5jZWwtYnV0dG9uOmhvdmVyKToKKyAgICAgICAgKiBw bGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVXUEU6OnN1cHBvcnRzRm9jdXNSaW5nIGNvbnN0KTogUmV0dXJuIHRydWUgZm9yIFRleHRG aWVsZFBhcnQsIFRleHRBcmVhUGFydCBhbmQgU2VhcmNoRmllbGRQYXJ0LgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVXUEU6OmV4dHJhRGVmYXVsdFN0eWxlU2hlZXQpOiBSZXR1cm4gdGhl bWVBZHdhaXRhLmNzcy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV1BFOjpwYWludFRl eHRGaWVsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdQRTo6cGFpbnRUZXh0QXJl YSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdQRTo6cGFpbnRTZWFyY2hGaWVsZCk6 CisgICAgICAgICogcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmg6CisKIDIwMjAtMDItMDQg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtX UEVdIEFkZCBzdXBwb3J0IGZvciByZW5kZXJpbmcgbWVudSBsaXN0IGJ1dHRvbnMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtV1BFLmNtYWtlIGIvU291cmNlL1dlYkNvcmUvUGxh dGZvcm1XUEUuY21ha2UKaW5kZXggMzZlNzBjMTYyYzguLmQ4Mzk3YzA3ZmY2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybVdQRS5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9Q bGF0Zm9ybVdQRS5jbWFrZQpAQCAtMzgsNiArMzgsNyBAQCBsaXN0KEFQUEVORCBXZWJDb3JlX1BS SVZBVEVfRlJBTUVXT1JLX0hFQURFUlMKICkKIAogbGlzdChBUFBFTkQgV2ViQ29yZV9VU0VSX0FH RU5UX1NUWUxFX1NIRUVUUworICAgICR7V0VCQ09SRV9ESVJ9L2Nzcy90aGVtZUFkd2FpdGEuY3Nz CiAgICAgJHtXRUJDT1JFX0RJUn0vTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNC YXNlLmNzcwogKQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvdGhlbWVBZHdhaXRh LmNzcyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy90aGVtZUFkd2FpdGEuY3NzCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi41YjJhMzcwNDRkNQotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy90aGVtZUFkd2FpdGEuY3NzCkBAIC0wLDAgKzEsNjIgQEAKKy8q CisgKiBBZHdhaXRhIGljb25zIGZvciBzdHlsaW5nIEhUTUwgZWxlbWVudHMKKyAqCisgKiBDb3B5 cmlnaHQgKEMpIDIwMjAgSWdhbGlhIFMuTC4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBz b2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICogTGljZW5z ZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisg KiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVy IHZlcnNpb24uCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3Bl IHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdp dGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9y IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExpYnJh cnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBz aG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVi bGljIExpY2Vuc2UKKyAqIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09Q WUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRvCisgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0 aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogQm9zdG9uLCBN QSAwMjExMC0xMzAxLCBVU0EuCisgKgorICovCisKK2lucHV0W3R5cGU9InNlYXJjaCJdOjotd2Vi a2l0LXNlYXJjaC1yZXN1bHRzLWJ1dHRvbiwKK2lucHV0W3R5cGU9InNlYXJjaCJdOjotd2Via2l0 LXNlYXJjaC1yZXN1bHRzLWRlY29yYXRpb24geworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbm9u ZTsKKyAgICB3aWR0aDogMWVtOworICAgIGhlaWdodDogMWVtOworICAgIGNvbnRlbnQ6IHVybCgi ZGF0YTppbWFnZS9zdmcreG1sO3V0Zi04LCBcCisgICAgICAgIDxzdmcgeG1sbnM9J2h0dHA6Ly93 d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTYnIGhlaWdodD0nMTYnPiBcCisgICAgICAgICAg PGcgY29sb3I9JyMwMDAnIGZvbnQtd2VpZ2h0PSc0MDAnIGZvbnQtZmFtaWx5PSdzYW5zLXNlcmlm JyB3aGl0ZS1zcGFjZT0nbm9ybWFsJyBmaWxsPScjNDc0NzQ3Jz4gXAorICAgICAgICAgICAgPHBh dGggZD0nTTYuNTA4IDFDMy40OCAxIDEuMDAyIDMuNDczIDEuMDAyIDYuNWMwIDMuMDI2IDIuNDc4 IDUuNSA1LjUwNiA1LjVzNS41MDQtMi40NzQgNS41MDQtNS41YzAtMy4wMjctMi40NzYtNS41LTUu NTA0LTUuNXptMCAyYTMuNDg2IDMuNDg2IDAgMCAxIDMuNTA0IDMuNWMwIDEuOTQ0LTEuNTU2IDMu NS0zLjUwNCAzLjVhMy40ODggMy40ODggMCAwIDEtMy41MDYtMy41QzMuMDAyIDQuNTU1IDQuNTYg MyA2LjUwOCAzeicgc3R5bGU9J2xpbmUtaGVpZ2h0Om5vcm1hbDtmb250LXZhcmlhbnQtbGlnYXR1 cmVzOm5vcm1hbDtmb250LXZhcmlhbnQtcG9zaXRpb246bm9ybWFsO2ZvbnQtdmFyaWFudC1jYXBz Om5vcm1hbDtmb250LXZhcmlhbnQtbnVtZXJpYzpub3JtYWw7Zm9udC12YXJpYW50LWFsdGVybmF0 ZXM6bm9ybWFsO2ZvbnQtZmVhdHVyZS1zZXR0aW5nczpub3JtYWw7dGV4dC1pbmRlbnQ6MDt0ZXh0 LWFsaWduOnN0YXJ0O3RleHQtZGVjb3JhdGlvbi1saW5lOm5vbmU7dGV4dC1kZWNvcmF0aW9uLXN0 eWxlOnNvbGlkO3RleHQtZGVjb3JhdGlvbi1jb2xvcjojMDAwO3RleHQtdHJhbnNmb3JtOm5vbmU7 dGV4dC1vcmllbnRhdGlvbjptaXhlZDtzaGFwZS1wYWRkaW5nOjA7aXNvbGF0aW9uOmF1dG87bWl4 LWJsZW5kLW1vZGU6bm9ybWFsO21hcmtlcjpub25lJyBvdmVyZmxvdz0ndmlzaWJsZScvPiBcCisg ICAgICAgICAgICA8cGF0aCBkPSdNMTAgOC45OWExIDEgMCAwIDAtLjY5NSAxLjcxN2w0LjAwNCA0 YTEgMSAwIDEgMCAxLjQxNC0xLjQxNGwtNC4wMDQtNEExIDEgMCAwIDAgMTAgOC45OXonIHN0eWxl PSdsaW5lLWhlaWdodDpub3JtYWw7Zm9udC12YXJpYW50LWxpZ2F0dXJlczpub3JtYWw7Zm9udC12 YXJpYW50LXBvc2l0aW9uOm5vcm1hbDtmb250LXZhcmlhbnQtY2Fwczpub3JtYWw7Zm9udC12YXJp YW50LW51bWVyaWM6bm9ybWFsO2ZvbnQtdmFyaWFudC1hbHRlcm5hdGVzOm5vcm1hbDtmb250LWZl YXR1cmUtc2V0dGluZ3M6bm9ybWFsO3RleHQtaW5kZW50OjA7dGV4dC1hbGlnbjpzdGFydDt0ZXh0 LWRlY29yYXRpb24tbGluZTpub25lO3RleHQtZGVjb3JhdGlvbi1zdHlsZTpzb2xpZDt0ZXh0LWRl Y29yYXRpb24tY29sb3I6IzAwMDt0ZXh0LXRyYW5zZm9ybTpub25lO3RleHQtb3JpZW50YXRpb246 bWl4ZWQ7c2hhcGUtcGFkZGluZzowO2lzb2xhdGlvbjphdXRvO21peC1ibGVuZC1tb2RlOm5vcm1h bDttYXJrZXI6bm9uZScgb3ZlcmZsb3c9J3Zpc2libGUnLz4gXAorICAgICAgICAgIDwvZz4gXAor ICAgICAgICA8L3N2Zz4iKTsKK30KKworaW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13ZWJraXQtc2Vh cmNoLXJlc3VsdHMtYnV0dG9uOmhvdmVyLAoraW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13ZWJraXQt c2VhcmNoLXJlc3VsdHMtZGVjb3JhdGlvbjpob3ZlciB7CisgICAgZmlsdGVyOiBicmlnaHRuZXNz KDEwJSk7Cit9CisKK2lucHV0W3R5cGU9InNlYXJjaCJdOjotd2Via2l0LXNlYXJjaC1jYW5jZWwt YnV0dG9uIHsKKyAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG5vbmU7CisgICAgd2lkdGg6IDFlbTsK KyAgICBoZWlnaHQ6IDFlbTsKKyAgICBjb250ZW50OiB1cmwoImRhdGE6aW1hZ2Uvc3ZnK3htbDt1 dGYtOCwgXAorICAgICAgICA8c3ZnIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zycg d2lkdGg9JzE2JyBoZWlnaHQ9JzE2Jz4gXAorICAgICAgICAgIDxwYXRoIGQ9J002IDJMMCA4bDYg Nmg5LjAzNUExLjAzIDEuMDMgMCAwIDAgMTYgMTNWM2MwLS41My0uMzQ2LTEtMS4wMDktMXptMSAz aDEuMDMxYy4yNTUuMDExLjUxLjEyOS42ODguMzEzTDEwIDYuNTkzbDEuMzEzLTEuMjhjLjI2NS0u MjMxLjQ0Ni0uMzA2LjY4Ny0uMzEzaDF2MWMwIC4yODYtLjAzNC41NS0uMjUuNzVsLTEuMjgxIDEu MjgxIDEuMjUgMS4yNWMuMTg4LjE4OC4yODEuNDU0LjI4MS43MTl2MWgtMWMtLjI2NSAwLS41My0u MDkzLS43MTktLjI4MUwxMCA5LjQzOGwtMS4yODEgMS4yOEExLjAxNSAxLjAxNSAwIDAgMSA4IDEx SDd2LTFjMC0uMjY1LjA5My0uNTMuMjgxLS43MTlsMS4yODItMS4yNUw3LjI4IDYuNzVBLjkwOS45 MDkgMCAwIDEgNyA2eicgc3R5bGU9J21hcmtlcjpub25lJyBjb2xvcj0nIzAwMCcgb3ZlcmZsb3c9 J3Zpc2libGUnIGZpbGw9JyM0NzQ3NDcnLz4gXAorICAgICAgICA8L3N2Zz4iKTsKK30KKworYm9k eVtkaXI9InJ0bCJdIGlucHV0W3R5cGU9InNlYXJjaCJdOjotd2Via2l0LXNlYXJjaC1jYW5jZWwt YnV0dG9uIHsKKyAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG5vbmU7CisgICAgY29udGVudDogdXJs KCJkYXRhOmltYWdlL3N2Zyt4bWw7dXRmLTgsIFwKKyAgICAgICAgPHN2ZyB4bWxucz0naHR0cDov L3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxNicgaGVpZ2h0PScxNic+IFwKKyAgICAgICAg ICA8cGF0aCBkPSdNMTAgMmw2IDYtNiA2SC45NjVBMS4wMyAxLjAzIDAgMCAxIDAgMTNWM2MwLS41 My4zNDYtMSAxLjAwOS0xek05IDVINy45NjlhMS4wNCAxLjA0IDAgMCAwLS42ODguMzEzTDYgNi41 OTNsLTEuMzEzLTEuMjhDNC40MjMgNS4wODIgNC4yNDIgNS4wMDYgNCA1SDN2MWMwIC4yODYuMDM0 LjU1LjI1Ljc1bDEuMjgxIDEuMjgxLTEuMjUgMS4yNUExLjAxNSAxLjAxNSAwIDAgMCAzIDEwdjFo MWMuMjY1IDAgLjUzLS4wOTMuNzE5LS4yODFMNiA5LjQzOGwxLjI4MSAxLjI4Yy4xODguMTg5LjQ1 NC4yODIuNzE5LjI4Mmgxdi0xYzAtLjI2NS0uMDkzLS41My0uMjgxLS43MTlsLTEuMjgxLTEuMjUg MS4yOC0xLjI4MUEuOTA5LjkwOSAwIDAgMCA5IDZ6JyBzdHlsZT0nbWFya2VyOm5vbmUnIGNvbG9y PScjMDAwJyBvdmVyZmxvdz0ndmlzaWJsZScgZmlsbD0nIzQ3NDc0NycvPiBcCisgICAgICAgIDwv c3ZnPiIpOworfQorCitpbnB1dFt0eXBlPSJzZWFyY2giXTo6LXdlYmtpdC1zZWFyY2gtY2FuY2Vs LWJ1dHRvbjpob3ZlciB7CisgICAgZmlsdGVyOiBicmlnaHRuZXNzKDEwJSk7Cit9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmNwcAppbmRleCA0ZDhhMTQ1 MTEwMy4uMDc3Mjg0ZDZjOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dw ZS9SZW5kZXJUaGVtZVdQRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1Jl bmRlclRoZW1lV1BFLmNwcApAQCAtNDAsNiArNDAsMTIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCitzdGF0aWMgY29uc3QgaW50IHRleHRGaWVsZEJvcmRlclNpemUgPSAxOworc3RhdGljIGNv bnN0IENvbG9yIHRleHRGaWVsZEJvcmRlckNvbG9yID0gbWFrZVJHQigyMDUsIDE5OSwgMTk0KTsK K3N0YXRpYyBjb25zdCBDb2xvciB0ZXh0RmllbGRCb3JkZXJBY3RpdmVDb2xvciA9IG1ha2VSR0Io NTIsIDEzMiwgMjI4KTsKK3N0YXRpYyBjb25zdCBDb2xvciB0ZXh0RmllbGRCb3JkZXJEaXNhYmxl ZENvbG9yID0gbWFrZVJHQigyMTMsIDIwOCwgMjA0KTsKK3N0YXRpYyBjb25zdCBDb2xvciB0ZXh0 RmllbGRCYWNrZ3JvdW5kQ29sb3IgPSBtYWtlUkdCKDI1NSwgMjU1LCAyNTUpOworc3RhdGljIGNv bnN0IENvbG9yIHRleHRGaWVsZEJhY2tncm91bmREaXNhYmxlZENvbG9yID0gbWFrZVJHQigyNTIs IDI1MiwgMjUyKTsKIHN0YXRpYyBjb25zdCBpbnQgZm9jdXNPZmZzZXQgPSAzOwogc3RhdGljIGNv bnN0IHVuc2lnbmVkIGZvY3VzTGluZVdpZHRoID0gMTsKIHN0YXRpYyBjb25zdCBDb2xvciBmb2N1 c0NvbG9yID0gbWFrZVJHQkEoNDYsIDUyLCA1NCwgMTUwKTsKQEAgLTYzLDEwICs2OSwxMCBAQCBi b29sIFJlbmRlclRoZW1lV1BFOjpzdXBwb3J0c0ZvY3VzUmluZyhjb25zdCBSZW5kZXJTdHlsZSYg c3R5bGUpIGNvbnN0CiAgICAgc3dpdGNoIChzdHlsZS5hcHBlYXJhbmNlKCkpIHsKICAgICBjYXNl IFB1c2hCdXR0b25QYXJ0OgogICAgIGNhc2UgQnV0dG9uUGFydDoKKyAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIGNhc2UgVGV4dEZpZWxkUGFydDoKICAgICBjYXNlIFRleHRBcmVhUGFydDoKICAg ICBjYXNlIFNlYXJjaEZpZWxkUGFydDoKLSAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGNhc2Ug TWVudWxpc3RQYXJ0OgogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBjYXNlIFJhZGlvUGFydDoK QEAgLTg4LDcgKzk0LDcgQEAgdm9pZCBSZW5kZXJUaGVtZVdQRTo6dXBkYXRlQ2FjaGVkU3lzdGVt Rm9udERlc2NyaXB0aW9uKENTU1ZhbHVlSUQsIEZvbnRDYXNjYWRlRGUKIAogU3RyaW5nIFJlbmRl clRoZW1lV1BFOjpleHRyYURlZmF1bHRTdHlsZVNoZWV0KCkKIHsKLSAgICByZXR1cm4gU3RyaW5n KCk7CisgICAgcmV0dXJuIFN0cmluZyh0aGVtZUFkd2FpdGFVc2VyQWdlbnRTdHlsZVNoZWV0LCBz aXplb2YodGhlbWVBZHdhaXRhVXNlckFnZW50U3R5bGVTaGVldCkpOwogfQogCiAjaWYgRU5BQkxF KFZJREVPKQpAQCAtMTA2LDYgKzExMiw1MiBAQCBTdHJpbmcgUmVuZGVyVGhlbWVXUEU6Om1lZGlh Q29udHJvbHNTY3JpcHQoKQogfQogI2VuZGlmCiAKK2Jvb2wgUmVuZGVyVGhlbWVXUEU6OnBhaW50 VGV4dEZpZWxkKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyT2JqZWN0LCBjb25zdCBQYWludElu Zm8mIHBhaW50SW5mbywgY29uc3QgRmxvYXRSZWN0JiByZWN0KQoreworICAgIGF1dG8mIGdyYXBo aWNzQ29udGV4dCA9IHBhaW50SW5mby5jb250ZXh0KCk7CisgICAgR3JhcGhpY3NDb250ZXh0U3Rh dGVTYXZlciBzdGF0ZVNhdmVyKGdyYXBoaWNzQ29udGV4dCk7CisKKyAgICBpbnQgYm9yZGVyU2l6 ZSA9IHRleHRGaWVsZEJvcmRlclNpemU7CisgICAgaWYgKGlzRW5hYmxlZChyZW5kZXJPYmplY3Qp ICYmICFpc1JlYWRPbmx5Q29udHJvbChyZW5kZXJPYmplY3QpICYmIGlzRm9jdXNlZChyZW5kZXJP YmplY3QpKQorICAgICAgICBib3JkZXJTaXplICo9IDI7CisKKyAgICBGbG9hdFJlY3QgZmllbGRS ZWN0ID0gcmVjdDsKKyAgICBGbG9hdFNpemUgY29ybmVyKDUsIDUpOworICAgIFBhdGggcGF0aDsK KyAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KGZpZWxkUmVjdCwgY29ybmVyKTsKKyAgICBmaWVsZFJl Y3QuaW5mbGF0ZSgtYm9yZGVyU2l6ZSk7CisgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChmaWVsZFJl Y3QsIGNvcm5lcik7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxSdWxlKFdpbmRSdWxlOjpF dmVuT2RkKTsKKyAgICBpZiAoIWlzRW5hYmxlZChyZW5kZXJPYmplY3QpIHx8IGlzUmVhZE9ubHlD b250cm9sKHJlbmRlck9iamVjdCkpCisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsQ29s b3IodGV4dEZpZWxkQm9yZGVyRGlzYWJsZWRDb2xvcik7CisgICAgZWxzZSBpZiAoaXNGb2N1c2Vk KHJlbmRlck9iamVjdCkpCisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsQ29sb3IodGV4 dEZpZWxkQm9yZGVyQWN0aXZlQ29sb3IpOworICAgIGVsc2UKKyAgICAgICAgZ3JhcGhpY3NDb250 ZXh0LnNldEZpbGxDb2xvcih0ZXh0RmllbGRCb3JkZXJDb2xvcik7CisgICAgZ3JhcGhpY3NDb250 ZXh0LmZpbGxQYXRoKHBhdGgpOworICAgIHBhdGguY2xlYXIoKTsKKworICAgIHBhdGguYWRkUm91 bmRlZFJlY3QoZmllbGRSZWN0LCBjb3JuZXIpOworICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxs UnVsZShXaW5kUnVsZTo6Tm9uWmVybyk7CisgICAgaWYgKCFpc0VuYWJsZWQocmVuZGVyT2JqZWN0 KSB8fCBpc1JlYWRPbmx5Q29udHJvbChyZW5kZXJPYmplY3QpKQorICAgICAgICBncmFwaGljc0Nv bnRleHQuc2V0RmlsbENvbG9yKHRleHRGaWVsZEJhY2tncm91bmREaXNhYmxlZENvbG9yKTsKKyAg ICBlbHNlCisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsQ29sb3IodGV4dEZpZWxkQmFj a2dyb3VuZENvbG9yKTsKKyAgICBncmFwaGljc0NvbnRleHQuZmlsbFBhdGgocGF0aCk7CisKKyAg ICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgUmVuZGVyVGhlbWVXUEU6OnBhaW50VGV4dEFyZWEo Y29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJPYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJ bmZvLCBjb25zdCBGbG9hdFJlY3QmIHJlY3QpCit7CisgICAgcmV0dXJuIHBhaW50VGV4dEZpZWxk KHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLCByZWN0KTsKK30KKworYm9vbCBSZW5kZXJUaGVtZVdQ RTo6cGFpbnRTZWFyY2hGaWVsZChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlck9iamVjdCwgY29u c3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCit7CisgICAgcmV0 dXJuIHBhaW50VGV4dEZpZWxkKHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLCByZWN0KTsKK30KKwog c3RhdGljIHZvaWQgcGFpbnRGb2N1cyhHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwg Y29uc3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIEZsb2F0UmVjdCBmb2N1c1JlY3QgPSByZWN0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BF LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuaAppbmRleCBi MWNiYTVlNDFkMi4uOTdkODAxNTNhZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dw ZS9SZW5kZXJUaGVtZVdQRS5oCkBAIC00OCw2ICs0OCwxMCBAQCBwcml2YXRlOgogCiAgICAgdm9p ZCB1cGRhdGVDYWNoZWRTeXN0ZW1Gb250RGVzY3JpcHRpb24oQ1NTVmFsdWVJRCwgRm9udENhc2Nh ZGVEZXNjcmlwdGlvbiYpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgYm9vbCBwYWludFRleHRGaWVs ZChjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBGbG9hdFJlY3Qm KSBvdmVycmlkZTsKKyAgICBib29sIHBhaW50VGV4dEFyZWEoY29uc3QgUmVuZGVyT2JqZWN0Jiwg Y29uc3QgUGFpbnRJbmZvJiwgY29uc3QgRmxvYXRSZWN0Jikgb3ZlcnJpZGU7CisgICAgYm9vbCBw YWludFNlYXJjaEZpZWxkKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNv bnN0IEludFJlY3QmKSBvdmVycmlkZTsKKwogICAgIGJvb2wgcG9wc01lbnVCeVNwYWNlT3JSZXR1 cm4oKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAgICAgTGVuZ3RoQm94IHBvcHVw SW50ZXJuYWxQYWRkaW5nQm94KGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3Qgb3ZlcnJpZGU7CiAg ICAgYm9vbCBwYWludE1lbnVMaXN0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5m byYsIGNvbnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRlOwo=