82131 2012-03-24 12:03:15 -0700 [Mac] REGRESSION (r110480): Text field that specifies background-color (or is auto-filled) gets un-themed border 2012-05-10 15:58:01 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac Unspecified RESOLVED FIXED data:text/html,%3Cinput%20style=%22background-color:%20lightyellow;%22%3E InRadar, Regression P1 Normal --- 1 mitz bdakin bdakin eric phiw2 webkit.review.bot oldest_to_newest 587154 0 mitz 2012-03-24 12:03:15 -0700 After <http://trac.webkit.org/r110480> (the fix for bug 80888), text fields lose their Mac look if they specify a background color. 587156 1 mitz 2012-03-24 12:03:49 -0700 <rdar://problem/11115221> 587157 2 mitz 2012-03-24 12:06:12 -0700 The change made us consider the text field to be “styled”. 620771 3 141208 bdakin 2012-05-10 11:32:31 -0700 Created attachment 141208 Patch 620791 4 141208 bdakin 2012-05-10 11:40:08 -0700 Comment on attachment 141208 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141208&action=review > Source/WebCore/rendering/RenderThemeMac.mm:127 > + NSLog(@"here"); Oops! I removed this. 621024 5 141208 mjs 2012-05-10 14:48:24 -0700 Comment on attachment 141208 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141208&action=review r=me, but consider the style comments above and don't forget to take out the NSLog. > Source/WebCore/rendering/RenderThemeMac.mm:124 > + // FIXME: This is a post-Lion workaround for <rdar://problem/11385461>. When that bug is resolved, we should remove > + // this code. In the meantime, this allows up to opt into a version of [NSTextField drawWithFrame:] that will only > + // draw the frame of the text field; without this, it will draw the frame and the background, which creates a number of > + // problems with styled text fields and text fields in HiDPI. There is a less comprehesive workaround for Lion and > + // SnowLeopard in place in RenderThemeMac::textField(). This comment is a bit long, any way to get the point across more succinctly? I think the key point is that this is a temporary workaround and in principle should not be required to turn off background drawing. > Source/WebCore/rendering/RenderThemeMac.mm:748 > + // See comment in RenderThemeMac::textField() for a complete explanation of this. In short, > + // on Lion and SnowLeopard, we only want to use the new style gradient for completely unstyled > + // text fields in HiDPI. isControledStyle(), however, treats all text fields that do not have > + // custom borders as "unstyled" to avoid using the CSS border in that case, so we have to sniff > + // around for other types of styling. This also seems a bit verbose, and I'm still not clear just from this comment why we special case based on scale factor. I would suggest just pointing to the other comment. > Source/WebCore/rendering/RenderThemeMac.mm:2183 > +#if !defined(BUILDING_ON_LION) && !defined(BUILDING_ON_SNOW_LEOPARD) I would suggest reversing the polarity of the #if to match the others in this patch. > Source/WebCore/rendering/RenderThemeMac.mm:2199 > + // This is a workaround for <rdar://problem/11385461> on Lion and SnowLeopard. Newer versions of the > + // OS can always use the newer version of the text field with the workaround above in > + // _coreUIDrawOptionsWithFrame. With this workaround for older OS's, when the deviceScaleFactor is 1, > + // we have an old-school gradient bezel in text fields whether they are styled or not. This is fine and > + // matches shipping Safari. When the deviceScaleFactor is greater than 1, text fields will have newer, > + // AppKit-matching gradients that look much more appropriate at the higher resolutions. However, if the > + // text field is styled in any way, we'll revert to the old-school bezel, which doesn't look great in > + // HiDPI, but it looks better than the CSS border, which is the only alternative until 11385461 is resolved. I would suggest summarizing a bit more here. Maybe more of the explanation can be in the ChangeLog, since the full context isn't clear anyway in the three separate large-ish comments. 621088 6 bdakin 2012-05-10 15:58:01 -0700 Thanks Maciej! I addressed all of your comments. http://trac.webkit.org/changeset/116697 141208 2012-05-10 11:32:31 -0700 2012-05-10 14:48:24 -0700 Patch for-review.txt text/plain 8245 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjY2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDEyLTA1LTEwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODIxMzEKKyAgICAgICAgW01hY10gUkVHUkVTU0lPTiAocjExMDQ4 MCk6IFRleHQgZmllbGQgdGhhdCBzcGVjaWZpZXMgYmFja2dyb3VuZC1jb2xvciAKKyAgICAgICAg KG9yIGlzIGF1dG8tZmlsbGVkKSBnZXRzIHVuLXRoZW1lZCBib3JkZXIKKyAgICAgICAgLWFuZCBj b3JyZXNwb25kaW5nLQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTExMTUyMjE+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2Ugcm9s bHMgb3V0IHIxMTA0ODAgd2hpY2ggaXMgd2hhdCBjYXVzZWQgc3R5bGVkIHRleHQgZmllbGRzIAor ICAgICAgICB0byBnZXQgdGhlIHVuLXRoZW1lZCBib3JkZXIsIGFuZCBpdCBkb2VzIGEgYnVuY2gg b2Ygd29yayB0byBtYWtlIHN1cmUgCisgICAgICAgIHdlIGdldCB0aGUgcHJldHR5LCBuZXcgdmVy c2lvbiBvZiB0aGUgTlNUZXh0RmllbGQgYXJ0IHdoZW5ldmVyIAorICAgICAgICBwb3NzaWJsZS4g V2UgZG8gdGhpcyBkaWZmZXJlbnRseSBmb3IgcG9zdC1MaW9uIE9TJ3Mgc2luY2UgdGhlcmUgaXMg bm93IAorICAgICAgICBhIHdheSB0byBvcHQgaW50byBpdCBhbGwgdGhlIHRpbWUuIExpb24gYW5k IFNub3dMZW9wYXJkIGNhbiBvbmx5IHVzZSAKKyAgICAgICAgdGhlIG5ldyBhcnQgaW4gSGlEUEkg bW9kZSB3aGVuIHRoZSBiYWNrZ3JvdW5kIGNvbG9yIG9mIHRoZSB0ZXh0IGZpZWxkIAorICAgICAg ICBpcyBqdXN0IHdoaXRlLgorCisgICAgICAgIFJlbmRlclRoZW1lTWFjOjp0ZXh0RmllbGQoKSB0 YWtlcyBhIGJvb2xlYW4gcGFyYW10ZXIgdXNlZCB0byBkZXRlcm1pbmUgCisgICAgICAgIGlmIHRo ZSBuZXcgZ3JhZGllbnQgd2lsbCBiZSB1c2VkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5oOgorICAgICAgICAoUmVuZGVyVGhlbWVNYWMpOgorICAgICAgICAKKyAgICAgICAg VGhpcyBpcyB0aGUgcG9zdC1MaW9uIHdvcmthcm91bmQuIFRoaXMgY29kZSBoYXMgbm8gZWZmZWN0 IG9uIExpb24gYW5kIAorICAgICAgICBTbm93TGVvcGFyZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGhlbWVNYWMubW06CisgICAgICAgICgtW1dlYkNvcmVUZXh0RmllbGRDZWxsIF9jb3Jl VUlEcmF3T3B0aW9uc1dpdGhGcmFtZTppblZpZXc6aW5jbHVkZUZvY3VzOl0pOgorICAgICAgICAK KyAgICAgICAgVGhpcyBpcyB0aGUgcm9sbC1vdXQgb2YgcjExMDQ4MC4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lTWFjOjppc0NvbnRyb2xTdHlsZWQpOgorICAgICAgICAKKyAgICAgICAg U2VlIHRoZSBjb21tZW50cyBmb3IgYSBmdWxsIGV4cGxhbmF0aW9uLCBidXQgdGhpcyBpcyBtb3N0 bHkgY29kZSBmb3IgCisgICAgICAgIExpb24gYW5kIFNub3dMZW9wYXJkIHRvIGRldGVybWluZSBp ZiB3ZSBjYW4gb3B0IGludG8gdGhlIG5ldyBhcnR3b3JrLgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGhlbWVNYWM6OnBhaW50VGV4dEZpZWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRo ZW1lTWFjOjp0ZXh0RmllbGQpOgorCiAyMDEyLTA1LTEwICBFcmlrIEFydmlkc3NvbiAgPGFydkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmViYXNlbGluZWQgcnVuLWJpbmRp bmdzLXRlc3RzIHJlc3VsdHMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVNYWMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVNYWMuaAkocmV2aXNpb24gMTE2NTY5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lTWFjLmgJKHdvcmtpbmcgY29weSkKQEAgLTIxOSw3ICsyMTksNyBAQCBwcml2 YXRlOgogICAgIE5TTWVudSogc2VhcmNoTWVudVRlbXBsYXRlKCkgY29uc3Q7CiAgICAgTlNTbGlk ZXJDZWxsKiBzbGlkZXJUaHVtYkhvcml6b250YWwoKSBjb25zdDsKICAgICBOU1NsaWRlckNlbGwq IHNsaWRlclRodW1iVmVydGljYWwoKSBjb25zdDsKLSAgICBOU1RleHRGaWVsZENlbGwqIHRleHRG aWVsZCgpIGNvbnN0OworICAgIE5TVGV4dEZpZWxkQ2VsbCogdGV4dEZpZWxkKGJvb2wgdXNlTmV3 R3JhZGllbnQpIGNvbnN0OwogCiAjaWYgRU5BQkxFKE1FVEVSX1RBRykKICAgICBOU0xldmVsSW5k aWNhdG9yU3R5bGUgbGV2ZWxJbmRpY2F0b3JTdHlsZUZvcihDb250cm9sUGFydCkgY29uc3Q7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCShyZXZpc2lv biAxMTY1NjkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTEwNSw2ICsxMDUsMzAgQEAgLSAodm9pZClzeXN0ZW1Db2xvcnNE aWRDaGFuZ2U6KE5TTm90aWZpYwogCiBAZW5kCiAKK0BpbnRlcmZhY2UgTlNUZXh0RmllbGRDZWxs IChXS0RldGFpbHMpCistIChDRkRpY3Rpb25hcnlSZWYpX2NvcmVVSURyYXdPcHRpb25zV2l0aEZy YW1lOihOU1JlY3QpY2VsbEZyYW1lIGluVmlldzooTlNWaWV3ICopY29udHJvbFZpZXcgaW5jbHVk ZUZvY3VzOihCT09MKWluY2x1ZGVGb2N1czsKK0BlbmQKKworCitAaW50ZXJmYWNlIFdlYkNvcmVU ZXh0RmllbGRDZWxsIDogTlNUZXh0RmllbGRDZWxsCistIChDRkRpY3Rpb25hcnlSZWYpX2NvcmVV SURyYXdPcHRpb25zV2l0aEZyYW1lOihOU1JlY3QpY2VsbEZyYW1lIGluVmlldzooTlNWaWV3ICop Y29udHJvbFZpZXcgaW5jbHVkZUZvY3VzOihCT09MKWluY2x1ZGVGb2N1czsKK0BlbmQKKworQGlt cGxlbWVudGF0aW9uIFdlYkNvcmVUZXh0RmllbGRDZWxsCistIChDRkRpY3Rpb25hcnlSZWYpX2Nv cmVVSURyYXdPcHRpb25zV2l0aEZyYW1lOihOU1JlY3QpY2VsbEZyYW1lIGluVmlldzooTlNWaWV3 ICopY29udHJvbFZpZXcgaW5jbHVkZUZvY3VzOihCT09MKWluY2x1ZGVGb2N1cworeworICAgIC8v IEZJWE1FOiBUaGlzIGlzIGEgcG9zdC1MaW9uIHdvcmthcm91bmQgZm9yIDxyZGFyOi8vcHJvYmxl bS8xMTM4NTQ2MT4uIFdoZW4gdGhhdCBidWcgaXMgcmVzb2x2ZWQsIHdlIHNob3VsZCByZW1vdmUK KyAgICAvLyB0aGlzIGNvZGUuIEluIHRoZSBtZWFudGltZSwgdGhpcyBhbGxvd3MgdXAgdG8gb3B0 IGludG8gYSB2ZXJzaW9uIG9mIFtOU1RleHRGaWVsZCBkcmF3V2l0aEZyYW1lOl0gdGhhdCB3aWxs IG9ubHkKKyAgICAvLyBkcmF3IHRoZSBmcmFtZSBvZiB0aGUgdGV4dCBmaWVsZDsgd2l0aG91dCB0 aGlzLCBpdCB3aWxsIGRyYXcgdGhlIGZyYW1lIGFuZCB0aGUgYmFja2dyb3VuZCwgd2hpY2ggY3Jl YXRlcyBhIG51bWJlciBvZgorICAgIC8vIHByb2JsZW1zIHdpdGggc3R5bGVkIHRleHQgZmllbGRz IGFuZCB0ZXh0IGZpZWxkcyBpbiBIaURQSS4gVGhlcmUgaXMgYSBsZXNzIGNvbXByZWhlc2l2ZSB3 b3JrYXJvdW5kIGZvciBMaW9uIGFuZAorICAgIC8vIFNub3dMZW9wYXJkIGluIHBsYWNlIGluIFJl bmRlclRoZW1lTWFjOjp0ZXh0RmllbGQoKS4KKyAgICBDRk11dGFibGVEaWN0aW9uYXJ5UmVmIGNv cmVVSURyYXdPcHRpb25zID0gQ0ZEaWN0aW9uYXJ5Q3JlYXRlTXV0YWJsZUNvcHkoTlVMTCwgMCwg W3N1cGVyIF9jb3JlVUlEcmF3T3B0aW9uc1dpdGhGcmFtZTpjZWxsRnJhbWUgaW5WaWV3OmNvbnRy b2xWaWV3IGluY2x1ZGVGb2N1czppbmNsdWRlRm9jdXNdKTsKKyAgICBDRkRpY3Rpb25hcnlTZXRW YWx1ZShjb3JlVUlEcmF3T3B0aW9ucywgQCJib3JkZXJzIG9ubHkiLCBrQ0ZCb29sZWFuVHJ1ZSk7 CisgICAgTlNMb2coQCJoZXJlIik7CisgICAgcmV0dXJuIChDRkRpY3Rpb25hcnlSZWYpW05TTWFr ZUNvbGxlY3RhYmxlKGNvcmVVSURyYXdPcHRpb25zKSBhdXRvcmVsZWFzZV07Cit9CitAZW5kCisK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKQEAgLTQ4 OSw3ICs1MTMsNyBAQCBOU1ZpZXcqIFJlbmRlclRoZW1lTWFjOjpkb2N1bWVudFZpZXdGb3IoCiBi b29sIFJlbmRlclRoZW1lTWFjOjppc0NvbnRyb2xTdHlsZWQoY29uc3QgUmVuZGVyU3R5bGUqIHN0 eWxlLCBjb25zdCBCb3JkZXJEYXRhJiBib3JkZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgRmlsbExheWVyJiBiYWNrZ3JvdW5kLCBjb25zdCBDb2xvciYgYmFj a2dyb3VuZENvbG9yKSBjb25zdAogewotICAgIGlmIChzdHlsZS0+YXBwZWFyYW5jZSgpID09IFRl eHRBcmVhUGFydCB8fCBzdHlsZS0+YXBwZWFyYW5jZSgpID09IExpc3Rib3hQYXJ0KQorICAgIGlm IChzdHlsZS0+YXBwZWFyYW5jZSgpID09IFRleHRGaWVsZFBhcnQgfHwgc3R5bGUtPmFwcGVhcmFu Y2UoKSA9PSBUZXh0QXJlYVBhcnQgfHwgc3R5bGUtPmFwcGVhcmFuY2UoKSA9PSBMaXN0Ym94UGFy dCkKICAgICAgICAgcmV0dXJuIHN0eWxlLT5ib3JkZXIoKSAhPSBib3JkZXI7CiAgICAgICAgIAog ICAgIC8vIEZJWE1FOiBUaGlzIGlzIGhvcnJpYmxlLCBidXQgdGhlcmUgaXMgbm90IG11Y2ggZWxz ZSB0aGF0IGNhbiBiZSBkb25lLiAgTWVudSBsaXN0cyBjYW5ub3QgZHJhdyBwcm9wZXJseSB3aGVu CkBAIC03MTQsNyArNzM4LDIzIEBAIE5TQ29udHJvbFNpemUgUmVuZGVyVGhlbWVNYWM6OmNvbnRy b2xTaXoKIGJvb2wgUmVuZGVyVGhlbWVNYWM6OnBhaW50VGV4dEZpZWxkKFJlbmRlck9iamVjdCog bywgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCiB7CiAgICAg TG9jYWxDdXJyZW50R3JhcGhpY3NDb250ZXh0IGxvY2FsQ29udGV4dChwYWludEluZm8uY29udGV4 dCk7Ci0gICAgTlNUZXh0RmllbGRDZWxsKiB0ZXh0RmllbGQgPSB0aGlzLT50ZXh0RmllbGQoKTsK KworICAgIGJvb2wgdXNlTmV3R3JhZGllbnQgPSB0cnVlOworI2lmIGRlZmluZWQoQlVJTERJTkdf T05fTElPTikgfHwgZGVmaW5lZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQpCisgICAgLy8gU2Vl IGNvbW1lbnQgaW4gUmVuZGVyVGhlbWVNYWM6OnRleHRGaWVsZCgpIGZvciBhIGNvbXBsZXRlIGV4 cGxhbmF0aW9uIG9mIHRoaXMuIEluIHNob3J0LCAKKyAgICAvLyBvbiBMaW9uIGFuZCBTbm93TGVv cGFyZCwgd2Ugb25seSB3YW50IHRvIHVzZSB0aGUgbmV3IHN0eWxlIGdyYWRpZW50IGZvciBjb21w bGV0ZWx5IHVuc3R5bGVkCisgICAgLy8gdGV4dCBmaWVsZHMgaW4gSGlEUEkuIGlzQ29udHJvbGVk U3R5bGUoKSwgaG93ZXZlciwgdHJlYXRzIGFsbCB0ZXh0IGZpZWxkcyB0aGF0IGRvIG5vdCBoYXZl CisgICAgLy8gY3VzdG9tIGJvcmRlcnMgYXMgInVuc3R5bGVkIiB0byBhdm9pZCB1c2luZyB0aGUg Q1NTIGJvcmRlciBpbiB0aGF0IGNhc2UsIHNvIHdlIGhhdmUgdG8gc25pZmYKKyAgICAvLyBhcm91 bmQgZm9yIG90aGVyIHR5cGVzIG9mIHN0eWxpbmcuCisgICAgdXNlTmV3R3JhZGllbnQgPSBXZWJD b3JlOjpkZXZpY2VTY2FsZUZhY3RvcihvLT5mcmFtZSgpKSAhPSAxOworICAgIGlmICh1c2VOZXdH cmFkaWVudCkgeworICAgICAgICB1c2VOZXdHcmFkaWVudCA9IG8tPnN0eWxlKCktPmhhc0FwcGVh cmFuY2UoKQorICAgICAgICAgICAgJiYgby0+c3R5bGUoKS0+dmlzaXRlZERlcGVuZGVudENvbG9y KENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKSA9PSBDb2xvcjo6d2hpdGUKKyAgICAgICAgICAg ICYmICFvLT5zdHlsZSgpLT5oYXNCYWNrZ3JvdW5kSW1hZ2UoKTsKKyAgICB9CisjZW5kaWYKKwor ICAgIE5TVGV4dEZpZWxkQ2VsbCogdGV4dEZpZWxkID0gdGhpcy0+dGV4dEZpZWxkKHVzZU5ld0dy YWRpZW50KTsKIAogICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcigqcGFp bnRJbmZvLmNvbnRleHQpOwogCkBAIC0yMTMzLDE1ICsyMTczLDM2IEBAIE5TU2xpZGVyQ2VsbCog UmVuZGVyVGhlbWVNYWM6OnNsaWRlclRodW0KICAgICByZXR1cm4gbV9zbGlkZXJUaHVtYlZlcnRp Y2FsLmdldCgpOwogfQogCi1OU1RleHRGaWVsZENlbGwqIFJlbmRlclRoZW1lTWFjOjp0ZXh0Rmll bGQoKSBjb25zdAorTlNUZXh0RmllbGRDZWxsKiBSZW5kZXJUaGVtZU1hYzo6dGV4dEZpZWxkKGJv b2wgdXNlTmV3R3JhZGllbnQpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3RleHRGaWVsZCkgewotICAg ICAgICBtX3RleHRGaWVsZC5hZG9wdE5TKFtbTlNUZXh0RmllbGRDZWxsIGFsbG9jXSBpbml0VGV4 dENlbGw6QCIiXSk7CisgICAgICAgIG1fdGV4dEZpZWxkLmFkb3B0TlMoW1tXZWJDb3JlVGV4dEZp ZWxkQ2VsbCBhbGxvY10gaW5pdFRleHRDZWxsOkAiIl0pOwogICAgICAgICBbbV90ZXh0RmllbGQu Z2V0KCkgc2V0QmV6ZWxlZDpZRVNdOwogICAgICAgICBbbV90ZXh0RmllbGQuZ2V0KCkgc2V0RWRp dGFibGU6WUVTXTsKICAgICAgICAgW21fdGV4dEZpZWxkLmdldCgpIHNldEZvY3VzUmluZ1R5cGU6 TlNGb2N1c1JpbmdUeXBlRXh0ZXJpb3JdOworI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX0xJT04p ICYmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKKyAgICAgICAgVU5VU0VEX1BB UkFNKHVzZU5ld0dyYWRpZW50KTsKKyAgICAgICAgW21fdGV4dEZpZWxkLmdldCgpIHNldERyYXdz QmFja2dyb3VuZDpOT107CisjZWxzZQorICAgICAgICBbbV90ZXh0RmllbGQuZ2V0KCkgc2V0RHJh d3NCYWNrZ3JvdW5kOllFU107CisjZW5kaWYKICAgICB9CiAKKyNpZiBkZWZpbmVkKEJVSUxESU5H X09OX0xJT04pIHx8IGRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQorICAgIC8vIFRo aXMgaXMgYSB3b3JrYXJvdW5kIGZvciA8cmRhcjovL3Byb2JsZW0vMTEzODU0NjE+IG9uIExpb24g YW5kIFNub3dMZW9wYXJkLiBOZXdlciB2ZXJzaW9ucyBvZiB0aGUKKyAgICAvLyBPUyBjYW4gYWx3 YXlzIHVzZSB0aGUgbmV3ZXIgdmVyc2lvbiBvZiB0aGUgdGV4dCBmaWVsZCB3aXRoIHRoZSB3b3Jr YXJvdW5kIGFib3ZlIGluCisgICAgLy8gX2NvcmVVSURyYXdPcHRpb25zV2l0aEZyYW1lLiBXaXRo IHRoaXMgd29ya2Fyb3VuZCBmb3Igb2xkZXIgT1Mncywgd2hlbiB0aGUgZGV2aWNlU2NhbGVGYWN0 b3IgaXMgMSwKKyAgICAvLyB3ZSBoYXZlIGFuIG9sZC1zY2hvb2wgZ3JhZGllbnQgYmV6ZWwgaW4g dGV4dCBmaWVsZHMgd2hldGhlciB0aGV5IGFyZSBzdHlsZWQgb3Igbm90LiBUaGlzIGlzIGZpbmUg YW5kCisgICAgLy8gbWF0Y2hlcyBzaGlwcGluZyBTYWZhcmkuIFdoZW4gdGhlIGRldmljZVNjYWxl RmFjdG9yIGlzIGdyZWF0ZXIgdGhhbiAxLCB0ZXh0IGZpZWxkcyB3aWxsIGhhdmUgbmV3ZXIsCisg ICAgLy8gQXBwS2l0LW1hdGNoaW5nIGdyYWRpZW50cyB0aGF0IGxvb2sgbXVjaCBtb3JlIGFwcHJv cHJpYXRlIGF0IHRoZSBoaWdoZXIgcmVzb2x1dGlvbnMuIEhvd2V2ZXIsIGlmIHRoZQorICAgIC8v IHRleHQgZmllbGQgaXMgc3R5bGVkICBpbiBhbnkgd2F5LCB3ZSdsbCByZXZlcnQgdG8gdGhlIG9s ZC1zY2hvb2wgYmV6ZWwsIHdoaWNoIGRvZXNuJ3QgbG9vayBncmVhdCBpbgorICAgIC8vIEhpRFBJ LCBidXQgaXQgbG9va3MgYmV0dGVyIHRoYW4gdGhlIENTUyBib3JkZXIsIHdoaWNoIGlzIHRoZSBv bmx5IGFsdGVybmF0aXZlIHVudGlsIDExMzg1NDYxIGlzIHJlc29sdmVkLgorICAgIGlmICh1c2VO ZXdHcmFkaWVudCkKKyAgICAgICAgW21fdGV4dEZpZWxkLmdldCgpIHNldEJhY2tncm91bmRDb2xv cjpbTlNDb2xvciB3aGl0ZUNvbG9yXV07CisgICAgZWxzZQorICAgICAgICBbbV90ZXh0RmllbGQu Z2V0KCkgc2V0QmFja2dyb3VuZENvbG9yOltOU0NvbG9yIGNsZWFyQ29sb3JdXTsKKyNlbmRpZgor CiAgICAgcmV0dXJuIG1fdGV4dEZpZWxkLmdldCgpOwogfQogCg==