<?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>229105</bug_id>
          
          <creation_ts>2021-08-13 20:08:51 -0700</creation_ts>
          <short_desc>[IFC][Integration] Walk the box tree to update the replaced content location</short_desc>
          <delta_ts>2021-08-20 20:16:30 -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>Layout and Rendering</component>
          <version>WebKit Nightly 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="alan">zalan</reporter>
          <assigned_to name="alan">zalan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>koivisto</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1784303</commentid>
    <comment_count>0</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2021-08-13 20:08:51 -0700</bug_when>
    <thetext>and not the run list. it&apos;s faster.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784304</commentid>
    <comment_count>1</comment_count>
      <attachid>435534</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-08-13 20:13:15 -0700</bug_when>
    <thetext>Created attachment 435534
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784323</commentid>
    <comment_count>2</comment_count>
      <attachid>435534</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2021-08-14 04:58:46 -0700</bug_when>
    <thetext>Comment on attachment 435534
Patch

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

&gt; Source/WebCore/layout/integration/LayoutIntegrationBoxTree.h:66
&gt; +    const BoxAndRendererList&amp; boxAndRendererList() { return m_boxes; }

function should be const too</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784324</commentid>
    <comment_count>3</comment_count>
      <attachid>435534</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2021-08-14 05:00:32 -0700</bug_when>
    <thetext>Comment on attachment 435534
Patch

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

&gt; Source/WebCore/layout/integration/LayoutIntegrationBoxTree.h:65
&gt; +    using BoxAndRendererList = Vector&lt;BoxAndRenderer, 1&gt;;

This is probably not needed, I think you can do

const auto&amp; boxAndRendererList() const { return m_boxes; }</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784325</commentid>
    <comment_count>4</comment_count>
      <attachid>435537</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-08-14 05:21:34 -0700</bug_when>
    <thetext>Created attachment 435537
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786024</commentid>
    <comment_count>5</comment_count>
      <attachid>436037</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-08-20 15:40:49 -0700</bug_when>
    <thetext>Created attachment 436037
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786087</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-08-20 20:09:22 -0700</bug_when>
    <thetext>&lt;rdar://problem/82195667&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786089</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-20 20:16:28 -0700</bug_when>
    <thetext>Committed r281361 (240776@main): &lt;https://commits.webkit.org/240776@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 436037.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435534</attachid>
            <date>2021-08-13 20:13:15 -0700</date>
            <delta_ts>2021-08-14 05:21:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229105-20210813201315.patch</filename>
            <type>text/plain</type>
            <size>3708</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYzYzc3YWZhZjA4ZDI5
ZTY1NjU0NmQwZjI4OWZhNjVlY2NlZGI0Mi4uY2ZhY2MyYTIwOWE1ZTZmNGY5ZDhiNDY4MDg0MTBl
NDcxNDYxZWE2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTEzICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g
V2FsayB0aGUgYm94IHRyZWUgdG8gdXBkYXRlIHRoZSByZXBsYWNlZCBjb250ZW50IGxvY2F0aW9u
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkxMDUK
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3JtYWxs
eSB0aGVyZSBhcmUgbW9yZSBydW5zIHRoYW4gZW50cmllcyBpbiB0aGUgYm94IGxpc3QuIEl0J3Mg
bW9yZSBwZXJmb3JtYW50IHRvIGl0ZXJhdGUKKyAgICAgICAgdGhlIGJveCBsaXN0IGZvciB0aGUg
cmVuZGVyZXIgbG9jYXRpb24gYWRqdXN0bWVudC4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3Jh
dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91
dEludGVncmF0aW9uOjpCb3hUcmVlOjpib3hBbmRSZW5kZXJlckxpc3QpOgorICAgICAgICAqIGxh
eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OmNvbnN0cnVjdENvbnRl
bnQpOgorCiAyMDIxLTA4LTEzICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg
ICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0gY2FuVXNlRm9yTGluZUxheW91dFdpdGhSZWFzb24ncyBl
c3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0IHNob3VsZCBjaGVjayBhZ2FpbnN0IGlu
ZmxvdyBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp
b24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50
ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmgKaW5kZXggOTQwYjhhYjdkNTc1M2M4
MzU5ZWU2ZDdhMjRkZTc0OTJjOWZmOGMwMi4uYjExYmMyMGFjMTUyODY4OWFlZDkyMWJlM2I1NDIx
Zjg1YzA4NWQ0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u
L0xheW91dEludGVncmF0aW9uQm94VHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p
bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaApAQCAtNTgsMTcgKzU4LDIwIEBA
IHB1YmxpYzoKIAogICAgIHNpemVfdCBib3hDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94ZXMu
c2l6ZSgpOyB9CiAKKyAgICBzdHJ1Y3QgQm94QW5kUmVuZGVyZXIgeworICAgICAgICBzdGQ6OnVu
aXF1ZV9wdHI8TGF5b3V0OjpCb3g+IGJveDsKKyAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJl
ciB7IG51bGxwdHIgfTsKKyAgICB9OworICAgIHVzaW5nIEJveEFuZFJlbmRlcmVyTGlzdCA9IFZl
Y3RvcjxCb3hBbmRSZW5kZXJlciwgMT47CisgICAgY29uc3QgQm94QW5kUmVuZGVyZXJMaXN0JiBi
b3hBbmRSZW5kZXJlckxpc3QoKSB7IHJldHVybiBtX2JveGVzOyB9CisKIHByaXZhdGU6CiAgICAg
dm9pZCBidWlsZFRyZWUoKTsKICAgICB2b2lkIGFwcGVuZENoaWxkKHN0ZDo6dW5pcXVlX3B0cjxM
YXlvdXQ6OkJveD4sIFJlbmRlck9iamVjdCYpOwogCiAgICAgUmVuZGVyQmxvY2tGbG93JiBtX2Zs
b3c7CiAgICAgTGF5b3V0OjpJbml0aWFsQ29udGFpbmluZ0Jsb2NrIG1fcm9vdDsKLSAgICBzdHJ1
Y3QgQm94QW5kUmVuZGVyZXIgewotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0OjpCb3g+
IGJveDsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciB7IG51bGxwdHIgfTsKLSAgICB9
OwotICAgIFZlY3RvcjxCb3hBbmRSZW5kZXJlciwgMT4gbV9ib3hlczsKKyAgICBCb3hBbmRSZW5k
ZXJlckxpc3QgbV9ib3hlczsKIAogICAgIEhhc2hNYXA8Y29uc3QgUmVuZGVyT2JqZWN0KiwgTGF5
b3V0OjpCb3gqPiBtX3JlbmRlcmVyVG9Cb3hNYXA7CiAgICAgSGFzaE1hcDxjb25zdCBMYXlvdXQ6
OkJveCosIFJlbmRlck9iamVjdCo+IG1fYm94VG9SZW5kZXJlck1hcDsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv
dXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0
aW9uTGluZUxheW91dC5jcHAKaW5kZXggNDgxMjBiN2I3OWI5ZjgxNzUzMzVlN2YwMThhZWJhYWI2
MWJkMGNjOC4uNmVkNGM5Y2ZiNTJkMWI1NzM5N2JiMjMxMzg4NzNjM2E3ZDE0NGU3YyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u
TGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh
eW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKQEAgLTIzMCwxMyArMjMwLDE1IEBAIHZvaWQg
TGluZUxheW91dDo6Y29uc3RydWN0Q29udGVudCgpCiAgICAgaW5saW5lQ29udGVudEJ1aWxkZXIu
YnVpbGQoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIGVuc3VyZUlubGluZUNvbnRlbnQoKSk7CiAg
ICAgQVNTRVJUKG1faW5saW5lQ29udGVudCk7CiAKLSAgICBmb3IgKGF1dG8mIHJ1biA6IG1faW5s
aW5lQ29udGVudC0+cnVucykgewotICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBydW4ubGF5b3V0
Qm94KCk7CisgICAgYXV0byYgYm94QW5kUmVuZGVyZXJMaXN0ID0gbV9ib3hUcmVlLmJveEFuZFJl
bmRlcmVyTGlzdCgpOworICAgIGZvciAoYXV0byYgYm94QW5kUmVuZGVyZXIgOiBib3hBbmRSZW5k
ZXJlckxpc3QpIHsKKyAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gKmJveEFuZFJlbmRlcmVyLmJv
eDsKICAgICAgICAgaWYgKCFsYXlvdXRCb3guaXNSZXBsYWNlZEJveCgpKQogICAgICAgICAgICAg
Y29udGludWU7CiAKLSAgICAgICAgYXV0byYgcmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJCb3g+
KG1fYm94VHJlZS5yZW5kZXJlckZvckxheW91dEJveChsYXlvdXRCb3gpKTsKLSAgICAgICAgcmVu
ZGVyZXIuc2V0TG9jYXRpb24oZmxvb3JlZExheW91dFBvaW50KHJ1bi5yZWN0KCkubG9jYXRpb24o
KSkpOworICAgICAgICBhdXRvJiByZW5kZXJlciA9IGRvd25jYXN0PFJlbmRlckJveD4oKmJveEFu
ZFJlbmRlcmVyLnJlbmRlcmVyKTsKKyAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBpbmxpbmVG
b3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOworICAgICAgICByZW5k
ZXJlci5zZXRMb2NhdGlvbihMYXlvdXQ6OkJveEdlb21ldHJ5Ojpib3JkZXJCb3hUb3BMZWZ0KGJv
eEdlb21ldHJ5KSk7CiAgICAgfQogCiAgICAgbV9pbmxpbmVDb250ZW50LT5jbGVhckdhcEFmdGVy
TGFzdExpbmUgPSBtX2lubGluZUZvcm1hdHRpbmdTdGF0ZS5jbGVhckdhcEFmdGVyTGFzdExpbmUo
KTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435537</attachid>
            <date>2021-08-14 05:21:34 -0700</date>
            <delta_ts>2021-08-20 15:40:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229105-20210814052134.patch</filename>
            <type>text/plain</type>
            <size>3714</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYzYzc3YWZhZjA4ZDI5
ZTY1NjU0NmQwZjI4OWZhNjVlY2NlZGI0Mi4uMGUzY2VmNDdiMmZmZWQ5MWMwNzRjZWZjMGE1ZDNk
ZDM5YWVhOTE0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTEzICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g
V2FsayB0aGUgYm94IHRyZWUgdG8gdXBkYXRlIHRoZSByZXBsYWNlZCBjb250ZW50IGxvY2F0aW9u
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkxMDUK
KworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBOb3JtYWxs
eSB0aGVyZSBhcmUgbW9yZSBydW5zIHRoYW4gZW50cmllcyBpbiB0aGUgYm94IGxpc3QuIEl0J3Mg
bW9yZSBwZXJmb3JtYW50IHRvIGl0ZXJhdGUKKyAgICAgICAgdGhlIGJveCBsaXN0IGZvciB0aGUg
cmVuZGVyZXIgbG9jYXRpb24gYWRqdXN0bWVudC4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3Jh
dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91
dEludGVncmF0aW9uOjpCb3hUcmVlOjpib3hBbmRSZW5kZXJlckxpc3QpOgorICAgICAgICAqIGxh
eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OmNvbnN0cnVjdENvbnRl
bnQpOgorCiAyMDIxLTA4LTEzICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg
ICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0gY2FuVXNlRm9yTGluZUxheW91dFdpdGhSZWFzb24ncyBl
c3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0IHNob3VsZCBjaGVjayBhZ2FpbnN0IGlu
ZmxvdyBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp
b24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50
ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmgKaW5kZXggOTQwYjhhYjdkNTc1M2M4
MzU5ZWU2ZDdhMjRkZTc0OTJjOWZmOGMwMi4uYjU0Yjg4ZjU1MDlhNDc2OWU1ZTcyZGQ4ODNmZTA5
MWJmMTkyYmU1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u
L0xheW91dEludGVncmF0aW9uQm94VHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p
bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaApAQCAtNTgsMTcgKzU4LDIwIEBA
IHB1YmxpYzoKIAogICAgIHNpemVfdCBib3hDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94ZXMu
c2l6ZSgpOyB9CiAKKyAgICBzdHJ1Y3QgQm94QW5kUmVuZGVyZXIgeworICAgICAgICBzdGQ6OnVu
aXF1ZV9wdHI8TGF5b3V0OjpCb3g+IGJveDsKKyAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJl
ciB7IG51bGxwdHIgfTsKKyAgICB9OworICAgIHVzaW5nIEJveEFuZFJlbmRlcmVyTGlzdCA9IFZl
Y3RvcjxCb3hBbmRSZW5kZXJlciwgMT47CisgICAgY29uc3QgQm94QW5kUmVuZGVyZXJMaXN0JiBi
b3hBbmRSZW5kZXJlckxpc3QoKSBjb25zdCB7IHJldHVybiBtX2JveGVzOyB9CisKIHByaXZhdGU6
CiAgICAgdm9pZCBidWlsZFRyZWUoKTsKICAgICB2b2lkIGFwcGVuZENoaWxkKHN0ZDo6dW5pcXVl
X3B0cjxMYXlvdXQ6OkJveD4sIFJlbmRlck9iamVjdCYpOwogCiAgICAgUmVuZGVyQmxvY2tGbG93
JiBtX2Zsb3c7CiAgICAgTGF5b3V0OjpJbml0aWFsQ29udGFpbmluZ0Jsb2NrIG1fcm9vdDsKLSAg
ICBzdHJ1Y3QgQm94QW5kUmVuZGVyZXIgewotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0
OjpCb3g+IGJveDsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciB7IG51bGxwdHIgfTsK
LSAgICB9OwotICAgIFZlY3RvcjxCb3hBbmRSZW5kZXJlciwgMT4gbV9ib3hlczsKKyAgICBCb3hB
bmRSZW5kZXJlckxpc3QgbV9ib3hlczsKIAogICAgIEhhc2hNYXA8Y29uc3QgUmVuZGVyT2JqZWN0
KiwgTGF5b3V0OjpCb3gqPiBtX3JlbmRlcmVyVG9Cb3hNYXA7CiAgICAgSGFzaE1hcDxjb25zdCBM
YXlvdXQ6OkJveCosIFJlbmRlck9iamVjdCo+IG1fYm94VG9SZW5kZXJlck1hcDsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp
bmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu
dGVncmF0aW9uTGluZUxheW91dC5jcHAKaW5kZXggNDgxMjBiN2I3OWI5ZjgxNzUzMzVlN2YwMThh
ZWJhYWI2MWJkMGNjOC4uNmVkNGM5Y2ZiNTJkMWI1NzM5N2JiMjMxMzg4NzNjM2E3ZDE0NGU3YyAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn
cmF0aW9uTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0
aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKQEAgLTIzMCwxMyArMjMwLDE1IEBA
IHZvaWQgTGluZUxheW91dDo6Y29uc3RydWN0Q29udGVudCgpCiAgICAgaW5saW5lQ29udGVudEJ1
aWxkZXIuYnVpbGQoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIGVuc3VyZUlubGluZUNvbnRlbnQo
KSk7CiAgICAgQVNTRVJUKG1faW5saW5lQ29udGVudCk7CiAKLSAgICBmb3IgKGF1dG8mIHJ1biA6
IG1faW5saW5lQ29udGVudC0+cnVucykgewotICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBydW4u
bGF5b3V0Qm94KCk7CisgICAgYXV0byYgYm94QW5kUmVuZGVyZXJMaXN0ID0gbV9ib3hUcmVlLmJv
eEFuZFJlbmRlcmVyTGlzdCgpOworICAgIGZvciAoYXV0byYgYm94QW5kUmVuZGVyZXIgOiBib3hB
bmRSZW5kZXJlckxpc3QpIHsKKyAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gKmJveEFuZFJlbmRl
cmVyLmJveDsKICAgICAgICAgaWYgKCFsYXlvdXRCb3guaXNSZXBsYWNlZEJveCgpKQogICAgICAg
ICAgICAgY29udGludWU7CiAKLSAgICAgICAgYXV0byYgcmVuZGVyZXIgPSBkb3duY2FzdDxSZW5k
ZXJCb3g+KG1fYm94VHJlZS5yZW5kZXJlckZvckxheW91dEJveChsYXlvdXRCb3gpKTsKLSAgICAg
ICAgcmVuZGVyZXIuc2V0TG9jYXRpb24oZmxvb3JlZExheW91dFBvaW50KHJ1bi5yZWN0KCkubG9j
YXRpb24oKSkpOworICAgICAgICBhdXRvJiByZW5kZXJlciA9IGRvd25jYXN0PFJlbmRlckJveD4o
KmJveEFuZFJlbmRlcmVyLnJlbmRlcmVyKTsKKyAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBp
bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOworICAgICAg
ICByZW5kZXJlci5zZXRMb2NhdGlvbihMYXlvdXQ6OkJveEdlb21ldHJ5Ojpib3JkZXJCb3hUb3BM
ZWZ0KGJveEdlb21ldHJ5KSk7CiAgICAgfQogCiAgICAgbV9pbmxpbmVDb250ZW50LT5jbGVhckdh
cEFmdGVyTGFzdExpbmUgPSBtX2lubGluZUZvcm1hdHRpbmdTdGF0ZS5jbGVhckdhcEFmdGVyTGFz
dExpbmUoKTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436037</attachid>
            <date>2021-08-20 15:40:49 -0700</date>
            <delta_ts>2021-08-20 20:16:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229105-20210820154048.patch</filename>
            <type>text/plain</type>
            <size>3473</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDhiM2M3MTc5YTk4MDNh
NTQ0ZDU3YWZkZWIyYTA2ZTEwNmRiNjhmNC4uMDNkNTgxNTYxNzkxYmMyM2RkZDE5ZGE5Y2FmODU4
YmZiNmE3YzU5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTIwICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g
V2FsayB0aGUgYm94IHRyZWUgdG8gdXBkYXRlIHRoZSByZXBsYWNlZCBjb250ZW50IGxvY2F0aW9u
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkxMDUK
KworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBOb3JtYWxs
eSB0aGVyZSBhcmUgbW9yZSBydW5zIHRoYW4gZW50cmllcyBpbiB0aGUgYm94IGxpc3QuIEl0J3Mg
bW9yZSBwZXJmb3JtYW50IHRvIGl0ZXJhdGUKKyAgICAgICAgdGhlIGJveCBsaXN0IGZvciB0aGUg
cmVuZGVyZXIgbG9jYXRpb24gYWRqdXN0bWVudC4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3Jh
dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91
dEludGVncmF0aW9uOjpCb3hUcmVlOjpib3hBbmRSZW5kZXJlckxpc3QpOgorICAgICAgICAqIGxh
eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OmNvbnN0cnVjdENvbnRl
bnQpOgorCiAyMDIxLTA4LTIwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg
ICAgICBbTEZDXVtJRkNdIE1ha2UgbWlkLXdvcmQgYnJlYWtpbmcgc3Vycm9nYXRlIHBhaXIgYXdh
cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ
bnRlZ3JhdGlvbkJveFRyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M
YXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaAppbmRleCA5NDBiOGFiN2Q1NzUzYzgzNTllZTZkN2Ey
NGRlNzQ5MmM5ZmY4YzAyLi4yY2Q4NWU4YzBiOTQzYmMyYmNiNGM3OTE2MTAxYmU3MmU0YmI3MjJi
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50
ZWdyYXRpb25Cb3hUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u
L0xheW91dEludGVncmF0aW9uQm94VHJlZS5oCkBAIC01OCwxNiArNTgsMTggQEAgcHVibGljOgog
CiAgICAgc2l6ZV90IGJveENvdW50KCkgY29uc3QgeyByZXR1cm4gbV9ib3hlcy5zaXplKCk7IH0K
IAorICAgIHN0cnVjdCBCb3hBbmRSZW5kZXJlciB7CisgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxM
YXlvdXQ6OkJveD4gYm94OworICAgICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyIHsgbnVsbHB0
ciB9OworICAgIH07CisgICAgY29uc3QgYXV0byYgYm94QW5kUmVuZGVyZXJMaXN0KCkgY29uc3Qg
eyByZXR1cm4gbV9ib3hlczsgfQorCiBwcml2YXRlOgogICAgIHZvaWQgYnVpbGRUcmVlKCk7CiAg
ICAgdm9pZCBhcHBlbmRDaGlsZChzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0OjpCb3g+LCBSZW5kZXJP
YmplY3QmKTsKIAogICAgIFJlbmRlckJsb2NrRmxvdyYgbV9mbG93OwogICAgIExheW91dDo6SW5p
dGlhbENvbnRhaW5pbmdCbG9jayBtX3Jvb3Q7Ci0gICAgc3RydWN0IEJveEFuZFJlbmRlcmVyIHsK
LSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPExheW91dDo6Qm94PiBib3g7Ci0gICAgICAgIFJlbmRl
ck9iamVjdCogcmVuZGVyZXIgeyBudWxscHRyIH07Ci0gICAgfTsKICAgICBWZWN0b3I8Qm94QW5k
UmVuZGVyZXIsIDE+IG1fYm94ZXM7CiAKICAgICBIYXNoTWFwPGNvbnN0IFJlbmRlck9iamVjdCos
IExheW91dDo6Qm94Kj4gbV9yZW5kZXJlclRvQm94TWFwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5l
TGF5b3V0LmNwcAppbmRleCAyNGIxNTc4YTk1ZTc2ZTQ3NDI0NmYyMjhiYmExOWJmODliZTZkNGM3
Li5jNTY3Y2I3YWZkNDhmZjhiYzZjODU5ZjI1MWU5OWMzYzAwMzYxMmRhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5
b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50
ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtMjMwLDEzICsyMzAsMTUgQEAgdm9pZCBMaW5lTGF5
b3V0Ojpjb25zdHJ1Y3RDb250ZW50KCkKICAgICBpbmxpbmVDb250ZW50QnVpbGRlci5idWlsZChp
bmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgZW5zdXJlSW5saW5lQ29udGVudCgpKTsKICAgICBBU1NF
UlQobV9pbmxpbmVDb250ZW50KTsKIAotICAgIGZvciAoYXV0byYgcnVuIDogbV9pbmxpbmVDb250
ZW50LT5ydW5zKSB7Ci0gICAgICAgIGF1dG8mIGxheW91dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsK
KyAgICBhdXRvJiBib3hBbmRSZW5kZXJlckxpc3QgPSBtX2JveFRyZWUuYm94QW5kUmVuZGVyZXJM
aXN0KCk7CisgICAgZm9yIChhdXRvJiBib3hBbmRSZW5kZXJlciA6IGJveEFuZFJlbmRlcmVyTGlz
dCkgeworICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSAqYm94QW5kUmVuZGVyZXIuYm94OwogICAg
ICAgICBpZiAoIWxheW91dEJveC5pc1JlcGxhY2VkQm94KCkpCiAgICAgICAgICAgICBjb250aW51
ZTsKIAotICAgICAgICBhdXRvJiByZW5kZXJlciA9IGRvd25jYXN0PFJlbmRlckJveD4obV9ib3hU
cmVlLnJlbmRlcmVyRm9yTGF5b3V0Qm94KGxheW91dEJveCkpOwotICAgICAgICByZW5kZXJlci5z
ZXRMb2NhdGlvbihmbG9vcmVkTGF5b3V0UG9pbnQocnVuLnJlY3QoKS5sb2NhdGlvbigpKSk7Cisg
ICAgICAgIGF1dG8mIHJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVyQm94PigqYm94QW5kUmVuZGVy
ZXIucmVuZGVyZXIpOworICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGlubGluZUZvcm1hdHRp
bmdDb250ZXh0Lmdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7CisgICAgICAgIHJlbmRlcmVyLnNl
dExvY2F0aW9uKExheW91dDo6Qm94R2VvbWV0cnk6OmJvcmRlckJveFRvcExlZnQoYm94R2VvbWV0
cnkpKTsKICAgICB9CiAKICAgICBtX2lubGluZUNvbnRlbnQtPmNsZWFyR2FwQWZ0ZXJMYXN0TGlu
ZSA9IG1faW5saW5lRm9ybWF0dGluZ1N0YXRlLmNsZWFyR2FwQWZ0ZXJMYXN0TGluZSgpOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>