<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>211139</bug_id>
          
          <creation_ts>2020-04-28 12:11:09 -0700</creation_ts>
          <short_desc>[WebKitLegacy] Implement -hidePlaceholder and -showPlaceholderIfNecessary in terms of setCanShowPlaceholder()</short_desc>
          <delta_ts>2020-04-28 16:57:50 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebCore Misc.</component>
          <version>WebKit Local Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Daniel Bates">dbates</reporter>
          <assigned_to name="Daniel Bates">dbates</assigned_to>
          <cc>cdumez</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>mifenton</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1646600</commentid>
    <comment_count>0</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2020-04-28 12:11:09 -0700</bug_when>
    <thetext>Implement -hidePlaceholder and -showPlaceholderIfNecessary in terms of -setCanShowPlaceholder, which was added in the patch for bug #206459. Why do this? Because:

1. Unlike -hidePlaceholder and -showPlaceholderIfNecessary, -setCanShowPlaceholder does NOT of reach into the guts of the field and mutate its CSS.
2. Because of (1), it works correctly should future code be written then modifies the DOM or CSS of the placeholder (which is in the guts of the field).
3. Unlike -hidePlaceholder and -showPlaceholderIfNecessary, there is test coverage of setCanShowPlaceholder() to ensure (2).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1646616</commentid>
    <comment_count>1</comment_count>
      <attachid>397871</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2020-04-28 12:32:32 -0700</bug_when>
    <thetext>Created attachment 397871
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1646727</commentid>
    <comment_count>2</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2020-04-28 16:05:49 -0700</bug_when>
    <thetext>Window failure unrelated.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1646736</commentid>
    <comment_count>3</comment_count>
      <attachid>397871</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2020-04-28 16:25:48 -0700</bug_when>
    <thetext>Comment on attachment 397871
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=397871&amp;action=review

&gt; Source/WebKitLegacy/mac/ChangeLog:11
&gt; +                1. Unlike -hidePlaceholder and -showPlaceholderIfNecessary, setCanShowPlaceholder() does NOT of

So much indent.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1646743</commentid>
    <comment_count>4</comment_count>
      <attachid>397901</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2020-04-28 16:34:44 -0700</bug_when>
    <thetext>Created attachment 397901
To Land - now with 50% less indentation</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1646744</commentid>
    <comment_count>5</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2020-04-28 16:35:12 -0700</bug_when>
    <thetext>Committed r260854: &lt;https://trac.webkit.org/changeset/260854&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1646745</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-04-28 16:36:14 -0700</bug_when>
    <thetext>&lt;rdar://problem/62556174&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1646752</commentid>
    <comment_count>7</comment_count>
      <attachid>397901</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-04-28 16:39:12 -0700</bug_when>
    <thetext>Comment on attachment 397901
To Land - now with 50% less indentation

View in context: https://bugs.webkit.org/attachment.cgi?id=397901&amp;action=review

&gt; Source/WebKitLegacy/mac/ChangeLog:11
&gt; +            1. Unlike -hidePlaceholder and -showPlaceholderIfNecessary, setCanShowPlaceholder() does NOT of

s/does NOT of/does Not/</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1646757</commentid>
    <comment_count>8</comment_count>
      <attachid>397901</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2020-04-28 16:57:50 -0700</bug_when>
    <thetext>Comment on attachment 397901
To Land - now with 50% less indentation

View in context: https://bugs.webkit.org/attachment.cgi?id=397901&amp;action=review

&gt;&gt; Source/WebKitLegacy/mac/ChangeLog:11
&gt;&gt; +            1. Unlike -hidePlaceholder and -showPlaceholderIfNecessary, setCanShowPlaceholder() does NOT of
&gt; 
&gt; s/does NOT of/does Not/

yep, I noticed that too AFTER I landed it. I may fix it up in the ChangeLog...</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>397871</attachid>
            <date>2020-04-28 12:32:32 -0700</date>
            <delta_ts>2020-04-28 16:34:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-211139-20200428123232.patch</filename>
            <type>text/plain</type>
            <size>6254</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmZhODk1NmY3NjIwNzZh
NzIyNDczYmQxNGVlODgwZDJkNGFhMTIwYi4uOWM5MjFkODlhZThmMzgzN2U4NmI2ZjkyZDM4NzNk
ODU3NjliZjhkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA0LTI4ICBEYW5p
ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViS2l0TGVnYWN5XSBJ
bXBsZW1lbnQgLWhpZGVQbGFjZWhvbGRlciBhbmQgLXNob3dQbGFjZWhvbGRlcklmTmVjZXNzYXJ5
IGluIHRlcm1zIG9mIHNldENhblNob3dQbGFjZWhvbGRlcigpCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTExMzkKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgaGlkZVBsYWNlaG9sZGVyKCkgYW5k
IHNob3dQbGFjZWhvbGRlcklmTmVjZXNzYXJ5KCkgYXMgdGhleSBhcmUgbm8gbG9uZ2VyIG5lZWRl
ZC4KKyAgICAgICAgQ2FsbGVycyBzaG91bGQgdXNlIHNldENhblNob3dQbGFjZWhvbGRlcigpIGlu
c3RlYWQuCisKKyAgICAgICAgKiBodG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpoaWRlUGxhY2Vo
b2xkZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRleHRGb3JtQ29udHJvbEVs
ZW1lbnQ6OnNob3dQbGFjZWhvbGRlcklmTmVjZXNzYXJ5KTogRGVsZXRlZC4KKyAgICAgICAgKiBo
dG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Lmg6CisKIDIwMjAtMDQtMjAgIERhbmllbCBC
YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgdG9nZ2xpbmcgZGVi
dWcgb3ZlcmxheSBmb3IgdG91Y2ggYWN0aW9uIHJlZ2lvbiBhbmQgZWRpdGFibGUgZWxlbWVudCBy
ZWdpb24gaW5kZXBlbmRlbnQgZnJvbSBub24tZmFzdCBzY3JvbGxhYmxlIHJlZ2lvbgpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExl
Z2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IDliZDRkYzM5NzUwZjJmMTViM2NlMmU4OWRkYjY5Nzhh
ZDQ4NDY2ZWIuLjQ3MjVjNzg3MWUyYTA0NmYzNWNlOGU2MzE1NGVjYzliMmIwZGM4NjYgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi
S2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAyMC0wNC0yOCAgRGFu
aWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYktpdExlZ2FjeV0g
SW1wbGVtZW50IC1oaWRlUGxhY2Vob2xkZXIgYW5kIC1zaG93UGxhY2Vob2xkZXJJZk5lY2Vzc2Fy
eSBpbiB0ZXJtcyBvZiBzZXRDYW5TaG93UGxhY2Vob2xkZXIoKQorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMTM5CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IC1oaWRlUGxhY2Vob2xkZXIg
YW5kIC1zaG93UGxhY2Vob2xkZXJJZk5lY2Vzc2FyeSBpbiB0ZXJtcyBvZiBzZXRDYW5TaG93UGxh
Y2Vob2xkZXIoKQorICAgICAgICBiZWNhdXNlOgorCisgICAgICAgICAgICAgICAgMS4gVW5saWtl
IC1oaWRlUGxhY2Vob2xkZXIgYW5kIC1zaG93UGxhY2Vob2xkZXJJZk5lY2Vzc2FyeSwgc2V0Q2Fu
U2hvd1BsYWNlaG9sZGVyKCkgZG9lcyBOT1Qgb2YKKyAgICAgICAgICAgICAgICAgICByZWFjaCBp
bnRvIHRoZSBndXRzIG9mIHRoZSBjb250cm9sIGFuZCBtdXRhdGUgaXRzIENTUy4KKworICAgICAg
ICAgICAgICAgIDIuIEJlY2F1c2Ugb2YgKDEpLCBpdCB3b3JrcyBjb3JyZWN0bHkgc2hvdWxkIGZ1
dHVyZSBjb2RlIGJlIHdyaXR0ZW4gdGhhdCBtb2RpZmllcyB0aGUgc3RydWN0dXJlCisgICAgICAg
ICAgICAgICAgICAgb2YgdGhlIGd1dHMgb3IgdGhlIENTUyBvZiB0aGUgcGxhY2Vob2xkZXIgZWxl
bWVudCAod2hpY2ggaXMgaW5zaWRlIHRoZSBndXRzIG9mIHRoZSBjb250cm9sKS4KKworICAgICAg
ICAgICAgICAgIDMuIFVubGlrZSAtaGlkZVBsYWNlaG9sZGVyIGFuZCAtc2hvd1BsYWNlaG9sZGVy
SWZOZWNlc3NhcnksIHRoZXJlIGlzIHRlc3QgY292ZXJhZ2UgZm9yIHNldENhblNob3dQbGFjZWhv
bGRlcigpCisgICAgICAgICAgICAgICAgICAgdG8gZW5zdXJlICgyKS4KKworICAgICAgICAqIERP
TS9XZWJET01PcGVyYXRpb25zLm1tOgorICAgICAgICAoLVtET01Ob2RlIGhpZGVQbGFjZWhvbGRl
cl0pOgorICAgICAgICAoLVtET01Ob2RlIHNob3dQbGFjZWhvbGRlcklmTmVjZXNzYXJ5XSk6CisK
IDIwMjAtMDQtMjcgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAg
ICBDbGVhbiB1cCBzb21lIHVzZWxlc3MgaW5jbHVkZXMgb2YgQ1NTQW5pbWF0aW9uQ29udHJvbGxl
ci5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xF
bGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1l
bnQuY3BwCmluZGV4IGFhOGIyYjhjZDJjZmM4ZGYxNzZhMTllZjBjNGNmNjdmNTVhNjZiMDcuLjEz
OGQ1MTE1YTUzMjE1ZTEyYzEzMGFkYzhkYjJkYzcwYmRkMTNmMGEgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuY3BwCkBAIC02NzcsMjAg
KzY3Nyw2IEBAIHVuc2lnbmVkIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjppbmRleEZvclBv
c2l0aW9uKGNvbnN0IFBvc2l0aW9uJiBwYXNzZWRQb3NpCiAgICAgcmV0dXJuIGluZGV4OwogfQog
Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLXZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1l
bnQ6OmhpZGVQbGFjZWhvbGRlcigpCi17Ci0gICAgaWYgKFJlZlB0cjxIVE1MRWxlbWVudD4gcGxh
Y2Vob2xkZXIgPSBwbGFjZWhvbGRlckVsZW1lbnQoKSkKLSAgICAgICAgcGxhY2Vob2xkZXItPnNl
dElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlWaXNpYmlsaXR5LCBDU1NWYWx1ZUhpZGRl
biwgdHJ1ZSk7Ci19Ci0KLXZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNob3dQbGFj
ZWhvbGRlcklmTmVjZXNzYXJ5KCkKLXsKLSAgICBpZiAoUmVmUHRyPEhUTUxFbGVtZW50PiBwbGFj
ZWhvbGRlciA9IHBsYWNlaG9sZGVyRWxlbWVudCgpKQotICAgICAgICBwbGFjZWhvbGRlci0+c2V0
SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVZpc2liaWxpdHksIENTU1ZhbHVlVmlzaWJs
ZSwgdHJ1ZSk7Ci19Ci0jZW5kaWYKLQogc3RhdGljIHZvaWQgZ2V0TmV4dFNvZnRCcmVhayhSb290
SW5saW5lQm94KiYgbGluZSwgTm9kZSomIGJyZWFrTm9kZSwgdW5zaWduZWQmIGJyZWFrT2Zmc2V0
KQogewogICAgIFJvb3RJbmxpbmVCb3gqIG5leHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1s
L0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmgKaW5kZXggMDRjYTk5ZWE2YTIyMjdiMzgxOGJi
OWI0ZjYzNDgwNzJjOTNkODRlNS4uYWQzMWExZjY2MGM2OWUwMGVjMzMzYzExNzBiMzQ0MThkN2Q4
YmNjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9s
RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVs
ZW1lbnQuaApAQCAtOTksMTAgKzk5LDYgQEAgcHVibGljOgogICAgIFN0cmluZyBkaXJlY3Rpb25G
b3JGb3JtRGF0YSgpIGNvbnN0OwogCiAgICAgdm9pZCBzZXRUZXh0QXNPZkxhc3RGb3JtQ29udHJv
bENoYW5nZUV2ZW50KGNvbnN0IFN0cmluZyYgdGV4dCkgeyBtX3RleHRBc09mTGFzdEZvcm1Db250
cm9sQ2hhbmdlRXZlbnQgPSB0ZXh0OyB9Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBX
RUJDT1JFX0VYUE9SVCB2b2lkIGhpZGVQbGFjZWhvbGRlcigpOwotICAgIFdFQkNPUkVfRVhQT1JU
IHZvaWQgc2hvd1BsYWNlaG9sZGVySWZOZWNlc3NhcnkoKTsKLSNlbmRpZgogCiAgICAgV0VCQ09S
RV9FWFBPUlQgdmlydHVhbCBib29sIGlzSW5uZXJUZXh0RWxlbWVudEVkaXRhYmxlKCkgY29uc3Q7
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0RPTS9XZWJET01PcGVyYXRp
b25zLm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvRE9NL1dlYkRPTU9wZXJhdGlvbnMubW0K
aW5kZXggMWQzMTBiOGVlYWRkMmNmMDE2ZTkxOGQyMWU0OTc3YjFiZjRjZWY5NS4uNzFjMDRkYjIy
OTM3YTMzMGUxYTQ3M2YyMTNmYWM4M2M5NTczMWYwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dExlZ2FjeS9tYWMvRE9NL1dlYkRPTU9wZXJhdGlvbnMubW0KKysrIGIvU291cmNlL1dlYktpdExl
Z2FjeS9tYWMvRE9NL1dlYkRPTU9wZXJhdGlvbnMubW0KQEAgLTQ4LDYgKzQ4LDcgQEAKICNpbXBv
cnQgPFdlYkNvcmUvRnJhbWVMb2FkZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTElucHV0RWxl
bWVudC5oPgogI2ltcG9ydCA8V2ViQ29yZS9IVE1MUGFyc2VySWRpb21zLmg+CisjaW1wb3J0IDxX
ZWJDb3JlL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0pT
RWxlbWVudC5oPgogI2ltcG9ydCA8V2ViQ29yZS9MZWdhY3lXZWJBcmNoaXZlLmg+CiAjaW1wb3J0
IDxXZWJDb3JlL1BsYXRmb3JtV2hlZWxFdmVudC5oPgpAQCAtOTcsNiArOTgsNyBAQCAtIChXZWJB
cmNoaXZlICopd2ViQXJjaGl2ZUJ5RmlsdGVyaW5nU3ViZnJhbWVzOihXZWJBcmNoaXZlU3ViZnJh
bWVGaWx0ZXIpd2ViQXJjaAogfQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKwogLSAoQk9P
TClpc0hvcml6b250YWxXcml0aW5nTW9kZQogewogICAgIE5vZGUqIG5vZGUgPSBjb3JlKHNlbGYp
OwpAQCAtMTEyLDI0ICsxMTQsMTYgQEAgLSAoQk9PTClpc0hvcml6b250YWxXcml0aW5nTW9kZQog
CiAtICh2b2lkKWhpZGVQbGFjZWhvbGRlcgogewotICAgIGlmICghW3NlbGYgaXNLaW5kT2ZDbGFz
czpbRE9NSFRNTElucHV0RWxlbWVudCBjbGFzc11dCi0gICAgICAgICYmICFbc2VsZiBpc0tpbmRP
ZkNsYXNzOltET01IVE1MVGV4dEFyZWFFbGVtZW50IGNsYXNzXV0pCi0gICAgICAgIHJldHVybjsK
LSAgICAKLSAgICBOb2RlICpub2RlID0gY29yZShzZWxmKTsKLSAgICBIVE1MVGV4dEZvcm1Db250
cm9sRWxlbWVudCAqZm9ybUNvbnRyb2wgPSBzdGF0aWNfY2FzdDxIVE1MVGV4dEZvcm1Db250cm9s
RWxlbWVudCAqPihub2RlKTsKLSAgICBmb3JtQ29udHJvbC0+aGlkZVBsYWNlaG9sZGVyKCk7Cisg
ICAgaWYgKGF1dG8gbm9kZSA9IGNvcmUoc2VsZik7IGlzPEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVt
ZW50Pihub2RlKSkKKyAgICAgICAgZG93bmNhc3Q8SFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ+
KCpub2RlKS5zZXRDYW5TaG93UGxhY2Vob2xkZXIoZmFsc2UpOwogfQogCiAtICh2b2lkKXNob3dQ
bGFjZWhvbGRlcklmTmVjZXNzYXJ5CiB7Ci0gICAgaWYgKCFbc2VsZiBpc0tpbmRPZkNsYXNzOltE
T01IVE1MSW5wdXRFbGVtZW50IGNsYXNzXV0KLSAgICAgICAgJiYgIVtzZWxmIGlzS2luZE9mQ2xh
c3M6W0RPTUhUTUxUZXh0QXJlYUVsZW1lbnQgY2xhc3NdXSkKLSAgICAgICAgcmV0dXJuOwotICAg
IAotICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50ICpmb3JtQ29udHJvbCA9IHN0YXRpY19j
YXN0PEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50ICo+KGNvcmUoc2VsZikpOwotICAgIGZvcm1D
b250cm9sLT5zaG93UGxhY2Vob2xkZXJJZk5lY2Vzc2FyeSgpOworICAgIGlmIChhdXRvIG5vZGUg
PSBjb3JlKHNlbGYpOyBpczxIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudD4obm9kZSkpCisgICAg
ICAgIGRvd25jYXN0PEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Pigqbm9kZSkuc2V0Q2FuU2hv
d1BsYWNlaG9sZGVyKHRydWUpOwogfQorCiAjZW5kaWYKIAogQGVuZAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>397901</attachid>
            <date>2020-04-28 16:34:44 -0700</date>
            <delta_ts>2020-04-28 16:34:44 -0700</delta_ts>
            <desc>To Land - now with 50% less indentation</desc>
            <filename>bug-211139-20200428163444.patch</filename>
            <type>text/plain</type>
            <size>6157</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwODUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmNkY2MwYzZhMGY1MjAy
MDkzMDA5MDQ5MDI3MmRlYzNhOTQ5NDU1NS4uNmFmZTRmNTA4M2MxYjAzN2Y3OTEwZmZlMzFhMTA4
NWZjMDNhZWI1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA0LTI4ICBEYW5p
ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViS2l0TGVnYWN5XSBJ
bXBsZW1lbnQgLWhpZGVQbGFjZWhvbGRlciBhbmQgLXNob3dQbGFjZWhvbGRlcklmTmVjZXNzYXJ5
IGluIHRlcm1zIG9mIHNldENhblNob3dQbGFjZWhvbGRlcigpCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTExMzkKKworICAgICAgICBSZXZpZXdlZCBi
eSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgUmVtb3ZlIGhpZGVQbGFjZWhvbGRlcigpIGFuZCBz
aG93UGxhY2Vob2xkZXJJZk5lY2Vzc2FyeSgpIGFzIHRoZXkgYXJlIG5vIGxvbmdlciBuZWVkZWQu
CisgICAgICAgIENhbGxlcnMgc2hvdWxkIHVzZSBzZXRDYW5TaG93UGxhY2Vob2xkZXIoKSBpbnN0
ZWFkLgorCisgICAgICAgICogaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6aGlkZVBsYWNlaG9s
ZGVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVt
ZW50OjpzaG93UGxhY2Vob2xkZXJJZk5lY2Vzc2FyeSk6IERlbGV0ZWQuCisgICAgICAgICogaHRt
bC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oOgorCiAyMDIwLTA0LTI4ICBDaGFuZ1Nlb2sg
T2ggIDxjaGFuZ3Nlb2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBbR1RLXSBGaXggYnVpbGQgZmFp
bHVyZXMgZm9yIEFOR0xFX1dFQkdMIGFmdGVyIHIyNTk1ODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5n
ZUxvZwppbmRleCA5YmQ0ZGMzOTc1MGYyZjE1YjNjZTJlODlkZGI2OTc4YWQ0ODQ2NmViLi41ZWFj
NWY3NjVjNWQ4NDY2MzEwMDAwYjRhY2Q1MWJhZGIzMDNkNTNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDQtMjggIERhbmllbCBCYXRlcyAgPGRh
YmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJLaXRMZWdhY3ldIEltcGxlbWVudCAtaGlk
ZVBsYWNlaG9sZGVyIGFuZCAtc2hvd1BsYWNlaG9sZGVySWZOZWNlc3NhcnkgaW4gdGVybXMgb2Yg
c2V0Q2FuU2hvd1BsYWNlaG9sZGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxMTEzOQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNl
ci4KKworICAgICAgICBJbXBsZW1lbnQgLWhpZGVQbGFjZWhvbGRlciBhbmQgLXNob3dQbGFjZWhv
bGRlcklmTmVjZXNzYXJ5IGluIHRlcm1zIG9mIHNldENhblNob3dQbGFjZWhvbGRlcigpCisgICAg
ICAgIGJlY2F1c2U6CisKKyAgICAgICAgICAgIDEuIFVubGlrZSAtaGlkZVBsYWNlaG9sZGVyIGFu
ZCAtc2hvd1BsYWNlaG9sZGVySWZOZWNlc3NhcnksIHNldENhblNob3dQbGFjZWhvbGRlcigpIGRv
ZXMgTk9UIG9mCisgICAgICAgICAgICAgICByZWFjaCBpbnRvIHRoZSBndXRzIG9mIHRoZSBjb250
cm9sIGFuZCBtdXRhdGUgaXRzIENTUy4KKworICAgICAgICAgICAgMi4gQmVjYXVzZSBvZiAoMSks
IGl0IHdvcmtzIGNvcnJlY3RseSBzaG91bGQgZnV0dXJlIGNvZGUgYmUgd3JpdHRlbiB0aGF0IG1v
ZGlmaWVzIHRoZSBzdHJ1Y3R1cmUKKyAgICAgICAgICAgICAgIG9mIHRoZSBndXRzIG9yIHRoZSBD
U1Mgb2YgdGhlIHBsYWNlaG9sZGVyIGVsZW1lbnQgKHdoaWNoIGlzIGluc2lkZSB0aGUgZ3V0cyBv
ZiB0aGUgY29udHJvbCkuCisKKyAgICAgICAgICAgIDMuIFVubGlrZSAtaGlkZVBsYWNlaG9sZGVy
IGFuZCAtc2hvd1BsYWNlaG9sZGVySWZOZWNlc3NhcnksIHRoZXJlIGlzIHRlc3QgY292ZXJhZ2Ug
Zm9yIHNldENhblNob3dQbGFjZWhvbGRlcigpCisgICAgICAgICAgICAgICB0byBlbnN1cmUgKDIp
LgorCisgICAgICAgICogRE9NL1dlYkRPTU9wZXJhdGlvbnMubW06CisgICAgICAgICgtW0RPTU5v
ZGUgaGlkZVBsYWNlaG9sZGVyXSk6CisgICAgICAgICgtW0RPTU5vZGUgc2hvd1BsYWNlaG9sZGVy
SWZOZWNlc3NhcnldKToKKwogMjAyMC0wNC0yNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBw
bGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIHNvbWUgdXNlbGVzcyBpbmNsdWRlcyBvZiBDU1NB
bmltYXRpb25Db250cm9sbGVyLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN
TFRleHRGb3JtQ29udHJvbEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4
dEZvcm1Db250cm9sRWxlbWVudC5jcHAKaW5kZXggYWE4YjJiOGNkMmNmYzhkZjE3NmExOWVmMGM0
Y2Y2N2Y1NWE2NmIwNy4uMTM4ZDUxMTVhNTMyMTVlMTJjMTMwYWRjOGRiMmRjNzBiZGQxM2YwYSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVu
dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVu
dC5jcHAKQEAgLTY3NywyMCArNjc3LDYgQEAgdW5zaWduZWQgSFRNTFRleHRGb3JtQ29udHJvbEVs
ZW1lbnQ6OmluZGV4Rm9yUG9zaXRpb24oY29uc3QgUG9zaXRpb24mIHBhc3NlZFBvc2kKICAgICBy
ZXR1cm4gaW5kZXg7CiB9CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotdm9pZCBIVE1MVGV4
dEZvcm1Db250cm9sRWxlbWVudDo6aGlkZVBsYWNlaG9sZGVyKCkKLXsKLSAgICBpZiAoUmVmUHRy
PEhUTUxFbGVtZW50PiBwbGFjZWhvbGRlciA9IHBsYWNlaG9sZGVyRWxlbWVudCgpKQotICAgICAg
ICBwbGFjZWhvbGRlci0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVZpc2liaWxp
dHksIENTU1ZhbHVlSGlkZGVuLCB0cnVlKTsKLX0KLQotdm9pZCBIVE1MVGV4dEZvcm1Db250cm9s
RWxlbWVudDo6c2hvd1BsYWNlaG9sZGVySWZOZWNlc3NhcnkoKQotewotICAgIGlmIChSZWZQdHI8
SFRNTEVsZW1lbnQ+IHBsYWNlaG9sZGVyID0gcGxhY2Vob2xkZXJFbGVtZW50KCkpCi0gICAgICAg
IHBsYWNlaG9sZGVyLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VmlzaWJpbGl0
eSwgQ1NTVmFsdWVWaXNpYmxlLCB0cnVlKTsKLX0KLSNlbmRpZgotCiBzdGF0aWMgdm9pZCBnZXRO
ZXh0U29mdEJyZWFrKFJvb3RJbmxpbmVCb3gqJiBsaW5lLCBOb2RlKiYgYnJlYWtOb2RlLCB1bnNp
Z25lZCYgYnJlYWtPZmZzZXQpCiB7CiAgICAgUm9vdElubGluZUJveCogbmV4dDsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuaCBiL1Nv
dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuaAppbmRleCAwNGNh
OTllYTZhMjIyN2IzODE4YmI5YjRmNjM0ODA3MmM5M2Q4NGU1Li5hZDMxYTFmNjYwYzY5ZTAwZWMz
MzNjMTE3MGIzNDQxOGQ3ZDhiY2MyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU
TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M
VGV4dEZvcm1Db250cm9sRWxlbWVudC5oCkBAIC05OSwxMCArOTksNiBAQCBwdWJsaWM6CiAgICAg
U3RyaW5nIGRpcmVjdGlvbkZvckZvcm1EYXRhKCkgY29uc3Q7CiAKICAgICB2b2lkIHNldFRleHRB
c09mTGFzdEZvcm1Db250cm9sQ2hhbmdlRXZlbnQoY29uc3QgU3RyaW5nJiB0ZXh0KSB7IG1fdGV4
dEFzT2ZMYXN0Rm9ybUNvbnRyb2xDaGFuZ2VFdmVudCA9IHRleHQ7IH0KLSNpZiBQTEFURk9STShJ
T1NfRkFNSUxZKQotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgaGlkZVBsYWNlaG9sZGVyKCk7Ci0g
ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzaG93UGxhY2Vob2xkZXJJZk5lY2Vzc2FyeSgpOwotI2Vu
ZGlmCiAKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIGJvb2wgaXNJbm5lclRleHRFbGVtZW50
RWRpdGFibGUoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv
RE9NL1dlYkRPTU9wZXJhdGlvbnMubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vV2Vi
RE9NT3BlcmF0aW9ucy5tbQppbmRleCAxZDMxMGI4ZWVhZGQyY2YwMTZlOTE4ZDIxZTQ5NzdiMWJm
NGNlZjk1Li43MWMwNGRiMjI5MzdhMzMwZTFhNDczZjIxM2ZhYzgzYzk1NzMxZjBiIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vV2ViRE9NT3BlcmF0aW9ucy5tbQorKysg
Yi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vV2ViRE9NT3BlcmF0aW9ucy5tbQpAQCAtNDgs
NiArNDgsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9GcmFtZUxvYWRlci5oPgogI2ltcG9ydCA8V2Vi
Q29yZS9IVE1MSW5wdXRFbGVtZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxQYXJzZXJJZGlv
bXMuaD4KKyNpbXBvcnQgPFdlYkNvcmUvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuaD4KICNp
bXBvcnQgPFdlYkNvcmUvSlNFbGVtZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0xlZ2FjeVdlYkFy
Y2hpdmUuaD4KICNpbXBvcnQgPFdlYkNvcmUvUGxhdGZvcm1XaGVlbEV2ZW50Lmg+CkBAIC05Nyw2
ICs5OCw3IEBAIC0gKFdlYkFyY2hpdmUgKil3ZWJBcmNoaXZlQnlGaWx0ZXJpbmdTdWJmcmFtZXM6
KFdlYkFyY2hpdmVTdWJmcmFtZUZpbHRlcil3ZWJBcmNoCiB9CiAKICNpZiBQTEFURk9STShJT1Nf
RkFNSUxZKQorCiAtIChCT09MKWlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlCiB7CiAgICAgTm9kZSog
bm9kZSA9IGNvcmUoc2VsZik7CkBAIC0xMTIsMjQgKzExNCwxNiBAQCAtIChCT09MKWlzSG9yaXpv
bnRhbFdyaXRpbmdNb2RlCiAKIC0gKHZvaWQpaGlkZVBsYWNlaG9sZGVyCiB7Ci0gICAgaWYgKCFb
c2VsZiBpc0tpbmRPZkNsYXNzOltET01IVE1MSW5wdXRFbGVtZW50IGNsYXNzXV0KLSAgICAgICAg
JiYgIVtzZWxmIGlzS2luZE9mQ2xhc3M6W0RPTUhUTUxUZXh0QXJlYUVsZW1lbnQgY2xhc3NdXSkK
LSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIE5vZGUgKm5vZGUgPSBjb3JlKHNlbGYpOwotICAg
IEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50ICpmb3JtQ29udHJvbCA9IHN0YXRpY19jYXN0PEhU
TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50ICo+KG5vZGUpOwotICAgIGZvcm1Db250cm9sLT5oaWRl
UGxhY2Vob2xkZXIoKTsKKyAgICBpZiAoYXV0byBub2RlID0gY29yZShzZWxmKTsgaXM8SFRNTFRl
eHRGb3JtQ29udHJvbEVsZW1lbnQ+KG5vZGUpKQorICAgICAgICBkb3duY2FzdDxIVE1MVGV4dEZv
cm1Db250cm9sRWxlbWVudD4oKm5vZGUpLnNldENhblNob3dQbGFjZWhvbGRlcihmYWxzZSk7CiB9
CiAKIC0gKHZvaWQpc2hvd1BsYWNlaG9sZGVySWZOZWNlc3NhcnkKIHsKLSAgICBpZiAoIVtzZWxm
IGlzS2luZE9mQ2xhc3M6W0RPTUhUTUxJbnB1dEVsZW1lbnQgY2xhc3NdXQotICAgICAgICAmJiAh
W3NlbGYgaXNLaW5kT2ZDbGFzczpbRE9NSFRNTFRleHRBcmVhRWxlbWVudCBjbGFzc11dKQotICAg
ICAgICByZXR1cm47Ci0gICAgCi0gICAgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQgKmZvcm1D
b250cm9sID0gc3RhdGljX2Nhc3Q8SFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQgKj4oY29yZShz
ZWxmKSk7Ci0gICAgZm9ybUNvbnRyb2wtPnNob3dQbGFjZWhvbGRlcklmTmVjZXNzYXJ5KCk7Cisg
ICAgaWYgKGF1dG8gbm9kZSA9IGNvcmUoc2VsZik7IGlzPEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVt
ZW50Pihub2RlKSkKKyAgICAgICAgZG93bmNhc3Q8SFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ+
KCpub2RlKS5zZXRDYW5TaG93UGxhY2Vob2xkZXIodHJ1ZSk7CiB9CisKICNlbmRpZgogCiBAZW5k
Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>