<?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>232987</bug_id>
          
          <creation_ts>2021-11-11 01:45:33 -0800</creation_ts>
          <short_desc>[css-grid] Transfer size for grid item with an aspect-ratio and stretch alignment against the definite row</short_desc>
          <delta_ts>2021-11-18 01:13:25 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>CSS</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>zsun</reporter>
          <assigned_to>zsun</assigned_to>
          <cc>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>jfernandez</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>rego</cc>
    
    <cc>svillar</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1813953</commentid>
    <comment_count>0</comment_count>
    <who name="">zsun</who>
    <bug_when>2021-11-11 01:45:33 -0800</bug_when>
    <thetext>This is similar to bug 231802. Instead of having a percentage of the definite row, the grid item stretches in the block-axis.

Affected test -

imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-004.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1813956</commentid>
    <comment_count>1</comment_count>
      <attachid>443923</attachid>
    <who name="">zsun</who>
    <bug_when>2021-11-11 02:05:15 -0800</bug_when>
    <thetext>Created attachment 443923
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1813989</commentid>
    <comment_count>2</comment_count>
      <attachid>443938</attachid>
    <who name="">zsun</who>
    <bug_when>2021-11-11 05:06:00 -0800</bug_when>
    <thetext>Created attachment 443938
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814410</commentid>
    <comment_count>3</comment_count>
      <attachid>443938</attachid>
    <who name="Javier Fernandez">jfernandez</who>
    <bug_when>2021-11-12 06:19:19 -0800</bug_when>
    <thetext>Comment on attachment 443938
Patch

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

&gt; Source/WebCore/rendering/RenderGrid.cpp:965
&gt; +        if (autoGridItem-&gt;hasStretchedLogicalHeight())

I think a comment here, explaining why we need to apply the stretch alignment, and how it affects the aspect-ratio, would be a good idea.

&gt; Source/WebCore/rendering/RenderReplaced.cpp:805
&gt; +    return (hasRelativeLogicalHeight() || (isGridItem() &amp;&amp; hasStretchedLogicalHeight())) &amp;&amp; style().logicalWidth().isAuto();

Do we need to check for isGridItem() ? wouldn&apos;t this be relevant for flexbox (the other layout model applying stretch alignment) as well ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1815432</commentid>
    <comment_count>4</comment_count>
      <attachid>444370</attachid>
    <who name="">zsun</who>
    <bug_when>2021-11-16 03:43:51 -0800</bug_when>
    <thetext>Created attachment 444370
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1815439</commentid>
    <comment_count>5</comment_count>
    <who name="">zsun</who>
    <bug_when>2021-11-16 04:53:00 -0800</bug_when>
    <thetext>(In reply to Javier Fernandez from comment #3)
&gt; Comment on attachment 443938 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=443938&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/rendering/RenderGrid.cpp:965
&gt; &gt; +        if (autoGridItem-&gt;hasStretchedLogicalHeight())
&gt; 
&gt; I think a comment here, explaining why we need to apply the stretch
&gt; alignment, and how it affects the aspect-ratio, would be a good idea.
&gt; 

Comments added.

&gt; &gt; Source/WebCore/rendering/RenderReplaced.cpp:805
&gt; &gt; +    return (hasRelativeLogicalHeight() || (isGridItem() &amp;&amp; hasStretchedLogicalHeight())) &amp;&amp; style().logicalWidth().isAuto();
&gt; 
&gt; Do we need to check for isGridItem() ? wouldn&apos;t this be relevant for flexbox
&gt; (the other layout model applying stretch alignment) as well ?

Yes, I think we do need to check for isGridItem(). I have seen a couple of table related tests failures without this check. Tried running WPT flexbox tests with the check (e.g. add (isGridItem() || isFlexItem()) but couldn&apos;t see it makes any difference on the test result for flexibox tests.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816148</commentid>
    <comment_count>6</comment_count>
      <attachid>444370</attachid>
    <who name="Javier Fernandez">jfernandez</who>
    <bug_when>2021-11-17 15:08:10 -0800</bug_when>
    <thetext>Comment on attachment 444370
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816342</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-11-18 01:12:59 -0800</bug_when>
    <thetext>Committed r285987 (244384@main): &lt;https://commits.webkit.org/244384@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 444370.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816343</commentid>
    <comment_count>8</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-11-18 01:13:25 -0800</bug_when>
    <thetext>&lt;rdar://problem/85540225&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443923</attachid>
            <date>2021-11-11 02:05:15 -0800</date>
            <delta_ts>2021-11-11 05:05:56 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232987-20211111100514.patch</filename>
            <type>text/plain</type>
            <size>6017</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRhZTdlMGQwMTU5ZTBi
YmI2NmNmMDQ5ZmRlZjA4ZjAzMjdhODhmNC4uOWY4NGNmZWVjZjdlM2E5NWRkNzgwOGQ0NzgwMmIy
ZTc2Zjk0OGJjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTExLTExICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBUcmFuc2ZlciBz
aXplIGZvciBncmlkIGl0ZW0gd2l0aCBhbiBhc3BlY3QtcmF0aW8gYW5kIHN0cmV0Y2ggYWxpZ25t
ZW50IGFnYWluc3QgdGhlIGRlZmluaXRlIHJvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgRm9yIGEgZ3JpZCBpdGVtIHdpdGggYW4gYXNwZWN0LXJhdGlv
LCBpZiBpdCBoYXMgc3RyZXRjaCBhbGlnbm1lbnQgYWdhaW5zdCB0aGUgZGVmaW5pdGUgcm93LCBp
dCBzaG91bGQKKyAgICAgICAgdHJ5IGFuZCByZXNvbHZlIGl0IGlmIHBvc3NpYmxlIGFuZCB0cmFu
c2ZlciB0aGlzIHNpemUgaW50byB0aGUgaW5saW5lIGRpcmVjdGlvbiBmb3IgdGhlIG1pbi9tYXgg
Y29udGVudAorICAgICAgICBzaXplLiBGb3IgdGhlIGNhc2UgdGhhdCB0aGUgZ3JpZCB3aWR0aCBp
cyBjb250ZW50IHNpemVkLCB3ZSBuZWVkIHRvIHVwZGF0ZSB0aGUgd2lkdGggYmVmb3JlIGxheWlu
ZyBvdXQKKyAgICAgICAgdGhlIGdyaWQgaXRlbXMuIFNpbmNlIHRoZSBtaW4tY29udGVudCBjb250
cmlidXRpb24gb2YgdGhlIGdyaWQgaXRlbSBoYXMgY2hhbmdlZCBiYXNlZCBvbiB0aGUgcm93IHNp
emVzCisgICAgICAgIGNhbGN1bGF0ZWQgaW4gc3RlcCAyIG9mIHNpemluZyBhbGdvcml0aG0sIHdl
IGFsc28gbmVlZCB0byByZXBlYXQgdGhlIHNpemluZyBhbGdvcml0aG0gc3RlcHMgdG8gdXBkYXRl
CisgICAgICAgIHRoZSB3aWR0aCBvZiB0aGUgdHJhY2sgc2l6ZXMuCisKKyAgICAgICAgKiByZW5k
ZXJpbmcvR3JpZExheW91dEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmlkTGF5
b3V0RnVuY3Rpb25zOjppc0FzcGVjdFJhdGlvQmxvY2tTaXplRGVwZW5kZW50Q2hpbGQpOgorICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckdyaWQ6OnVwZGF0ZUdyaWRBcmVhRm9yQXNwZWN0UmF0aW9JdGVtcyk6CisgICAgICAgICogcmVu
ZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxh
Y2VkOjpuZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRpb24gY29uc3QpOgorCiAyMDIxLTEx
LTEwICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAg
IFtjc3MtZmxleGJveF0gSW1wcm92ZSAmIHNpbXBsaWZ5IHRoZSBmbGV4LWJhc2lzIGNvbXB1dGF0
aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZExheW91dEZ1bmN0
aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZExheW91dEZ1bmN0aW9ucy5j
cHAKaW5kZXggYWQ3NWM1ZTI4MjIxMzI5OTdkNWIxZjhjMDI4YmQ0MWQ1OGM4ZmU5Yy4uZDRmNzg4
ZGM3MGQyNjAxNTVmNWQ2NGZkNDVmYjgxOTQzNDdhNjVmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL0dyaWRMYXlvdXRGdW5jdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9HcmlkTGF5b3V0RnVuY3Rpb25zLmNwcApAQCAtODQsNyArODQsNyBAQCBi
b29sIGlzT3J0aG9nb25hbENoaWxkKGNvbnN0IFJlbmRlckdyaWQmIGdyaWQsIGNvbnN0IFJlbmRl
ckJveCYgY2hpbGQpCiAKIGJvb2wgaXNBc3BlY3RSYXRpb0Jsb2NrU2l6ZURlcGVuZGVudENoaWxk
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiB7Ci0gICAgcmV0dXJuIChjaGlsZC5zdHlsZSgpLmhh
c0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuaGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSkgJiYgY2hp
bGQuaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCk7CisgICAgcmV0dXJuIChjaGlsZC5zdHlsZSgp
Lmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuaGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSkgJiYg
KGNoaWxkLmhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIHx8IGNoaWxkLmhhc1N0cmV0Y2hlZExv
Z2ljYWxIZWlnaHQoKSk7CiB9CiAKIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBmbG93QXdhcmVE
aXJlY3Rpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJHcmlkJiBncmlkLCBjb25zdCBSZW5kZXJCb3gm
IGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGQ5MGMxMTM5MTkyMmE3MmU4OTAxNjg4MWQ3
YjIzZWQ5YjMwZTc2OTMuLjk2ZDc4MDUyNjFmODBjYTgzNjEwZDlhYzdlM2M2M2Y3NjMzZWU4NGQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTk2MCw4ICs5NjAs
MTEgQEAgdm9pZCBSZW5kZXJHcmlkOjp1cGRhdGVHcmlkQXJlYUZvckFzcGVjdFJhdGlvSXRlbXMo
Y29uc3QgVmVjdG9yPFJlbmRlckJveCo+JiBhdXQKICAgICBwb3B1bGF0ZUdyaWRQb3NpdGlvbnNG
b3JEaXJlY3Rpb24oRm9yQ29sdW1ucyk7CiAgICAgcG9wdWxhdGVHcmlkUG9zaXRpb25zRm9yRGly
ZWN0aW9uKEZvclJvd3MpOwogCi0gICAgZm9yIChhdXRvJiBhdXRvR3JpZEl0ZW0gOiBhdXRvR3Jp
ZEl0ZW1zKSAKKyAgICBmb3IgKGF1dG8mIGF1dG9HcmlkSXRlbSA6IGF1dG9HcmlkSXRlbXMpIHsK
ICAgICAgICAgdXBkYXRlR3JpZEFyZWFMb2dpY2FsU2l6ZSgqYXV0b0dyaWRJdGVtLCBncmlkQXJl
YUJyZWFkdGhGb3JDaGlsZEluY2x1ZGluZ0FsaWdubWVudE9mZnNldHMoKmF1dG9HcmlkSXRlbSwg
Rm9yQ29sdW1ucyksIGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkSW5jbHVkaW5nQWxpZ25tZW50T2Zm
c2V0cygqYXV0b0dyaWRJdGVtLCBGb3JSb3dzKSk7CisgICAgICAgIGlmIChhdXRvR3JpZEl0ZW0t
Pmhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSkKKyAgICAgICAgICAgIGFwcGx5U3RyZXRjaEFs
aWdubWVudFRvQ2hpbGRJZk5lZWRlZCgqYXV0b0dyaWRJdGVtKTsKKyAgICB9CiB9CiAKIHZvaWQg
UmVuZGVyR3JpZDo6bGF5b3V0R3JpZEl0ZW1zKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IGZmOGVhMWQ5NmMxNzA1N2NmNTdmMWNlYmU0NjAyOTFi
MTdiMjU1OWIuLmNmODA5MTI0YjAxYmUyYjk1OGFmZDgyZDRjYzBmMzM3Mzk5YTA0YWIgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtODAyLDcgKzgw
Miw3IEBAIGJvb2wgUmVuZGVyUmVwbGFjZWQ6OmlzQ29udGVudExpa2VseVZpc2libGVJblZpZXdw
b3J0KCkKIGJvb2wgUmVuZGVyUmVwbGFjZWQ6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxh
dGlvbigpIGNvbnN0CiB7CiAgICAgLy8gSWYgdGhlIGhlaWdodCBpcyBhIHBlcmNlbnRhZ2UgYW5k
IHRoZSB3aWR0aCBpcyBhdXRvLCB0aGVuIHRoZSBjb250YWluaW5nQmxvY2tzJ3MgaGVpZ2h0IGNo
YW5naW5nIGNhbiBjYXVzZSB0aGlzIG5vZGUgdG8gY2hhbmdlIGl0J3MgcHJlZmVycmVkIHdpZHRo
IGJlY2F1c2UgaXQgbWFpbnRhaW5zIGFzcGVjdCByYXRpby4KLSAgICByZXR1cm4gaGFzUmVsYXRp
dmVMb2dpY2FsSGVpZ2h0KCkgJiYgc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKTsKKyAg
ICByZXR1cm4gKGhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIHx8IGhhc1N0cmV0Y2hlZExvZ2lj
YWxIZWlnaHQoKSkgJiYgc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKTsKIH0KIAogfQpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CmluZGV4IGU2NTUwZmVmZTBmZjQ3NWU2YzgxNDk3ZWQ3MjFmYzg0MmZlOWE3NjEuLmUxMGUzZjI4
MzVjMDQ4MzdmZGM2MmYwMTVkMTFkZmZlYzFhM2Y0ZTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor
MjAyMS0xMS0xMSAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3Mt
Z3JpZF0gVHJhbnNmZXIgc2l6ZSBmb3IgZ3JpZCBpdGVtIHdpdGggYW4gYXNwZWN0LXJhdGlvIGFu
ZCBzdHJldGNoIGFsaWdubWVudCBhZ2FpbnN0IHRoZSBkZWZpbml0ZSByb3cKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjk4NworCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczog
dW5za2lwIHRoZSB0ZXN0IHRoYXQgaXMgbm93IHBhc3NpbmcuCisKIDIwMjEtMTEtMTAgIFNlcmdp
byBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1mbGV4
Ym94XSBJbXByb3ZlICYgc2ltcGxpZnkgdGhlIGZsZXgtYmFzaXMgY29tcHV0YXRpb24KZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zCmluZGV4IDczYjA0MzY5YWI2OGJmZDQ0NWUyZWIxMmEwMTczMWJjMjUwYjU4YzMu
LjhkMGIyMzUyM2M4YjFkZTdjOTI3ZmFkNzhiNTc1ZjMxOGI4MzhhMWMgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucwpAQCAtMTM5Miw3ICsxMzkyLDYgQEAgd2Via2l0Lm9yZy9iLzIxNjE0NiBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC0KIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQtZGVmaW5pdGlvbi9n
cmlkLWF1dG8tcmVwZWF0LWR5bmFtaWMtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQtZGVmaW5pdGlv
bi9ncmlkLXJlcGVhdC1tYXgtd2lkdGgtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAot
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1pdGVtcy9h
c3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQtaXRlbXMvZ3JpZC1pdGVtLWlubGlu
ZS1jb250cmlidXRpb24tMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMzEwMjEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3Jp
ZC1pdGVtcy9ncmlkLXNpemUtd2l0aC1vcnRob2dvbmFsLWNoaWxkLWR5bmFtaWMuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIzMTAyMSBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9ncmlkLWl0ZW1zL3BlcmNlbnRhZ2UtbWFyZ2luLWR5
bmFtaWMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443938</attachid>
            <date>2021-11-11 05:06:00 -0800</date>
            <delta_ts>2021-11-16 03:43:47 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232987-20211111130559.patch</filename>
            <type>text/plain</type>
            <size>6035</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRhZTdlMGQwMTU5ZTBi
YmI2NmNmMDQ5ZmRlZjA4ZjAzMjdhODhmNC4uOWY4NGNmZWVjZjdlM2E5NWRkNzgwOGQ0NzgwMmIy
ZTc2Zjk0OGJjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTExLTExICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBUcmFuc2ZlciBz
aXplIGZvciBncmlkIGl0ZW0gd2l0aCBhbiBhc3BlY3QtcmF0aW8gYW5kIHN0cmV0Y2ggYWxpZ25t
ZW50IGFnYWluc3QgdGhlIGRlZmluaXRlIHJvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgRm9yIGEgZ3JpZCBpdGVtIHdpdGggYW4gYXNwZWN0LXJhdGlv
LCBpZiBpdCBoYXMgc3RyZXRjaCBhbGlnbm1lbnQgYWdhaW5zdCB0aGUgZGVmaW5pdGUgcm93LCBp
dCBzaG91bGQKKyAgICAgICAgdHJ5IGFuZCByZXNvbHZlIGl0IGlmIHBvc3NpYmxlIGFuZCB0cmFu
c2ZlciB0aGlzIHNpemUgaW50byB0aGUgaW5saW5lIGRpcmVjdGlvbiBmb3IgdGhlIG1pbi9tYXgg
Y29udGVudAorICAgICAgICBzaXplLiBGb3IgdGhlIGNhc2UgdGhhdCB0aGUgZ3JpZCB3aWR0aCBp
cyBjb250ZW50IHNpemVkLCB3ZSBuZWVkIHRvIHVwZGF0ZSB0aGUgd2lkdGggYmVmb3JlIGxheWlu
ZyBvdXQKKyAgICAgICAgdGhlIGdyaWQgaXRlbXMuIFNpbmNlIHRoZSBtaW4tY29udGVudCBjb250
cmlidXRpb24gb2YgdGhlIGdyaWQgaXRlbSBoYXMgY2hhbmdlZCBiYXNlZCBvbiB0aGUgcm93IHNp
emVzCisgICAgICAgIGNhbGN1bGF0ZWQgaW4gc3RlcCAyIG9mIHNpemluZyBhbGdvcml0aG0sIHdl
IGFsc28gbmVlZCB0byByZXBlYXQgdGhlIHNpemluZyBhbGdvcml0aG0gc3RlcHMgdG8gdXBkYXRl
CisgICAgICAgIHRoZSB3aWR0aCBvZiB0aGUgdHJhY2sgc2l6ZXMuCisKKyAgICAgICAgKiByZW5k
ZXJpbmcvR3JpZExheW91dEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmlkTGF5
b3V0RnVuY3Rpb25zOjppc0FzcGVjdFJhdGlvQmxvY2tTaXplRGVwZW5kZW50Q2hpbGQpOgorICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckdyaWQ6OnVwZGF0ZUdyaWRBcmVhRm9yQXNwZWN0UmF0aW9JdGVtcyk6CisgICAgICAgICogcmVu
ZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxh
Y2VkOjpuZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRpb24gY29uc3QpOgorCiAyMDIxLTEx
LTEwICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAg
IFtjc3MtZmxleGJveF0gSW1wcm92ZSAmIHNpbXBsaWZ5IHRoZSBmbGV4LWJhc2lzIGNvbXB1dGF0
aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZExheW91dEZ1bmN0
aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZExheW91dEZ1bmN0aW9ucy5j
cHAKaW5kZXggYWQ3NWM1ZTI4MjIxMzI5OTdkNWIxZjhjMDI4YmQ0MWQ1OGM4ZmU5Yy4uZDRmNzg4
ZGM3MGQyNjAxNTVmNWQ2NGZkNDVmYjgxOTQzNDdhNjVmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL0dyaWRMYXlvdXRGdW5jdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9HcmlkTGF5b3V0RnVuY3Rpb25zLmNwcApAQCAtODQsNyArODQsNyBAQCBi
b29sIGlzT3J0aG9nb25hbENoaWxkKGNvbnN0IFJlbmRlckdyaWQmIGdyaWQsIGNvbnN0IFJlbmRl
ckJveCYgY2hpbGQpCiAKIGJvb2wgaXNBc3BlY3RSYXRpb0Jsb2NrU2l6ZURlcGVuZGVudENoaWxk
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiB7Ci0gICAgcmV0dXJuIChjaGlsZC5zdHlsZSgpLmhh
c0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuaGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSkgJiYgY2hp
bGQuaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCk7CisgICAgcmV0dXJuIChjaGlsZC5zdHlsZSgp
Lmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuaGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSkgJiYg
KGNoaWxkLmhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIHx8IGNoaWxkLmhhc1N0cmV0Y2hlZExv
Z2ljYWxIZWlnaHQoKSk7CiB9CiAKIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBmbG93QXdhcmVE
aXJlY3Rpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJHcmlkJiBncmlkLCBjb25zdCBSZW5kZXJCb3gm
IGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGQ5MGMxMTM5MTkyMmE3MmU4OTAxNjg4MWQ3
YjIzZWQ5YjMwZTc2OTMuLjk2ZDc4MDUyNjFmODBjYTgzNjEwZDlhYzdlM2M2M2Y3NjMzZWU4NGQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTk2MCw4ICs5NjAs
MTEgQEAgdm9pZCBSZW5kZXJHcmlkOjp1cGRhdGVHcmlkQXJlYUZvckFzcGVjdFJhdGlvSXRlbXMo
Y29uc3QgVmVjdG9yPFJlbmRlckJveCo+JiBhdXQKICAgICBwb3B1bGF0ZUdyaWRQb3NpdGlvbnNG
b3JEaXJlY3Rpb24oRm9yQ29sdW1ucyk7CiAgICAgcG9wdWxhdGVHcmlkUG9zaXRpb25zRm9yRGly
ZWN0aW9uKEZvclJvd3MpOwogCi0gICAgZm9yIChhdXRvJiBhdXRvR3JpZEl0ZW0gOiBhdXRvR3Jp
ZEl0ZW1zKSAKKyAgICBmb3IgKGF1dG8mIGF1dG9HcmlkSXRlbSA6IGF1dG9HcmlkSXRlbXMpIHsK
ICAgICAgICAgdXBkYXRlR3JpZEFyZWFMb2dpY2FsU2l6ZSgqYXV0b0dyaWRJdGVtLCBncmlkQXJl
YUJyZWFkdGhGb3JDaGlsZEluY2x1ZGluZ0FsaWdubWVudE9mZnNldHMoKmF1dG9HcmlkSXRlbSwg
Rm9yQ29sdW1ucyksIGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkSW5jbHVkaW5nQWxpZ25tZW50T2Zm
c2V0cygqYXV0b0dyaWRJdGVtLCBGb3JSb3dzKSk7CisgICAgICAgIGlmIChhdXRvR3JpZEl0ZW0t
Pmhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSkKKyAgICAgICAgICAgIGFwcGx5U3RyZXRjaEFs
aWdubWVudFRvQ2hpbGRJZk5lZWRlZCgqYXV0b0dyaWRJdGVtKTsKKyAgICB9CiB9CiAKIHZvaWQg
UmVuZGVyR3JpZDo6bGF5b3V0R3JpZEl0ZW1zKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IGZmOGVhMWQ5NmMxNzA1N2NmNTdmMWNlYmU0NjAyOTFi
MTdiMjU1OWIuLmQ4YWVlNTM5OTgxZDVhMjY0OGQ1NWYwNDY5M2QzMzg0MTMzMjBmNTYgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtODAyLDcgKzgw
Miw3IEBAIGJvb2wgUmVuZGVyUmVwbGFjZWQ6OmlzQ29udGVudExpa2VseVZpc2libGVJblZpZXdw
b3J0KCkKIGJvb2wgUmVuZGVyUmVwbGFjZWQ6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxh
dGlvbigpIGNvbnN0CiB7CiAgICAgLy8gSWYgdGhlIGhlaWdodCBpcyBhIHBlcmNlbnRhZ2UgYW5k
IHRoZSB3aWR0aCBpcyBhdXRvLCB0aGVuIHRoZSBjb250YWluaW5nQmxvY2tzJ3MgaGVpZ2h0IGNo
YW5naW5nIGNhbiBjYXVzZSB0aGlzIG5vZGUgdG8gY2hhbmdlIGl0J3MgcHJlZmVycmVkIHdpZHRo
IGJlY2F1c2UgaXQgbWFpbnRhaW5zIGFzcGVjdCByYXRpby4KLSAgICByZXR1cm4gaGFzUmVsYXRp
dmVMb2dpY2FsSGVpZ2h0KCkgJiYgc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKTsKKyAg
ICByZXR1cm4gKGhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIHx8IChpc0dyaWRJdGVtKCkgJiYg
aGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCgpKSkgJiYgc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5p
c0F1dG8oKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGU2NTUwZmVmZTBmZjQ3NWU2YzgxNDk3ZWQ3MjFmYzg0
MmZlOWE3NjEuLmUxMGUzZjI4MzVjMDQ4MzdmZGM2MmYwMTVkMTFkZmZlYzFhM2Y0ZTQgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMS0xMSAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29t
PgorCisgICAgICAgIFtjc3MtZ3JpZF0gVHJhbnNmZXIgc2l6ZSBmb3IgZ3JpZCBpdGVtIHdpdGgg
YW4gYXNwZWN0LXJhdGlvIGFuZCBzdHJldGNoIGFsaWdubWVudCBhZ2FpbnN0IHRoZSBkZWZpbml0
ZSByb3cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz
Mjk4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
VGVzdEV4cGVjdGF0aW9uczogdW5za2lwIHRoZSB0ZXN0IHRoYXQgaXMgbm93IHBhc3NpbmcuCisK
IDIwMjEtMTEtMTAgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAK
ICAgICAgICAgW2Nzcy1mbGV4Ym94XSBJbXByb3ZlICYgc2ltcGxpZnkgdGhlIGZsZXgtYmFzaXMg
Y29tcHV0YXRpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDczYjA0MzY5YWI2OGJmZDQ0NWUyZWIx
MmEwMTczMWJjMjUwYjU4YzMuLjhkMGIyMzUyM2M4YjFkZTdjOTI3ZmFkNzhiNTc1ZjMxOGI4Mzhh
MWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTM5Miw3ICsxMzkyLDYgQEAgd2Via2l0Lm9yZy9i
LzIxNjE0NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGln
bm1lbnQvZ3JpZC0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlk
L2dyaWQtZGVmaW5pdGlvbi9ncmlkLWF1dG8tcmVwZWF0LWR5bmFtaWMtMDAxLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1n
cmlkL2dyaWQtZGVmaW5pdGlvbi9ncmlkLXJlcGVhdC1tYXgtd2lkdGgtMDAxLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIAotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWdyaWQvZ3JpZC1pdGVtcy9hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQtaXRl
bXMvZ3JpZC1pdGVtLWlubGluZS1jb250cmlidXRpb24tMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMzEwMjEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLWdyaWQvZ3JpZC1pdGVtcy9ncmlkLXNpemUtd2l0aC1vcnRob2dvbmFsLWNoaWxk
LWR5bmFtaWMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIzMTAyMSBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9ncmlkLWl0ZW1zL3Bl
cmNlbnRhZ2UtbWFyZ2luLWR5bmFtaWMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>444370</attachid>
            <date>2021-11-16 03:43:51 -0800</date>
            <delta_ts>2021-11-18 01:13:00 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232987-20211116114350.patch</filename>
            <type>text/plain</type>
            <size>6209</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRhZTdlMGQwMTU5ZTBi
YmI2NmNmMDQ5ZmRlZjA4ZjAzMjdhODhmNC4uOWY4NGNmZWVjZjdlM2E5NWRkNzgwOGQ0NzgwMmIy
ZTc2Zjk0OGJjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTExLTExICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBUcmFuc2ZlciBz
aXplIGZvciBncmlkIGl0ZW0gd2l0aCBhbiBhc3BlY3QtcmF0aW8gYW5kIHN0cmV0Y2ggYWxpZ25t
ZW50IGFnYWluc3QgdGhlIGRlZmluaXRlIHJvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgRm9yIGEgZ3JpZCBpdGVtIHdpdGggYW4gYXNwZWN0LXJhdGlv
LCBpZiBpdCBoYXMgc3RyZXRjaCBhbGlnbm1lbnQgYWdhaW5zdCB0aGUgZGVmaW5pdGUgcm93LCBp
dCBzaG91bGQKKyAgICAgICAgdHJ5IGFuZCByZXNvbHZlIGl0IGlmIHBvc3NpYmxlIGFuZCB0cmFu
c2ZlciB0aGlzIHNpemUgaW50byB0aGUgaW5saW5lIGRpcmVjdGlvbiBmb3IgdGhlIG1pbi9tYXgg
Y29udGVudAorICAgICAgICBzaXplLiBGb3IgdGhlIGNhc2UgdGhhdCB0aGUgZ3JpZCB3aWR0aCBp
cyBjb250ZW50IHNpemVkLCB3ZSBuZWVkIHRvIHVwZGF0ZSB0aGUgd2lkdGggYmVmb3JlIGxheWlu
ZyBvdXQKKyAgICAgICAgdGhlIGdyaWQgaXRlbXMuIFNpbmNlIHRoZSBtaW4tY29udGVudCBjb250
cmlidXRpb24gb2YgdGhlIGdyaWQgaXRlbSBoYXMgY2hhbmdlZCBiYXNlZCBvbiB0aGUgcm93IHNp
emVzCisgICAgICAgIGNhbGN1bGF0ZWQgaW4gc3RlcCAyIG9mIHNpemluZyBhbGdvcml0aG0sIHdl
IGFsc28gbmVlZCB0byByZXBlYXQgdGhlIHNpemluZyBhbGdvcml0aG0gc3RlcHMgdG8gdXBkYXRl
CisgICAgICAgIHRoZSB3aWR0aCBvZiB0aGUgdHJhY2sgc2l6ZXMuCisKKyAgICAgICAgKiByZW5k
ZXJpbmcvR3JpZExheW91dEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmlkTGF5
b3V0RnVuY3Rpb25zOjppc0FzcGVjdFJhdGlvQmxvY2tTaXplRGVwZW5kZW50Q2hpbGQpOgorICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckdyaWQ6OnVwZGF0ZUdyaWRBcmVhRm9yQXNwZWN0UmF0aW9JdGVtcyk6CisgICAgICAgICogcmVu
ZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxh
Y2VkOjpuZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRpb24gY29uc3QpOgorCiAyMDIxLTEx
LTEwICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAg
IFtjc3MtZmxleGJveF0gSW1wcm92ZSAmIHNpbXBsaWZ5IHRoZSBmbGV4LWJhc2lzIGNvbXB1dGF0
aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZExheW91dEZ1bmN0
aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZExheW91dEZ1bmN0aW9ucy5j
cHAKaW5kZXggYWQ3NWM1ZTI4MjIxMzI5OTdkNWIxZjhjMDI4YmQ0MWQ1OGM4ZmU5Yy4uZDRmNzg4
ZGM3MGQyNjAxNTVmNWQ2NGZkNDVmYjgxOTQzNDdhNjVmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL0dyaWRMYXlvdXRGdW5jdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9HcmlkTGF5b3V0RnVuY3Rpb25zLmNwcApAQCAtODQsNyArODQsNyBAQCBi
b29sIGlzT3J0aG9nb25hbENoaWxkKGNvbnN0IFJlbmRlckdyaWQmIGdyaWQsIGNvbnN0IFJlbmRl
ckJveCYgY2hpbGQpCiAKIGJvb2wgaXNBc3BlY3RSYXRpb0Jsb2NrU2l6ZURlcGVuZGVudENoaWxk
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiB7Ci0gICAgcmV0dXJuIChjaGlsZC5zdHlsZSgpLmhh
c0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuaGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSkgJiYgY2hp
bGQuaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCk7CisgICAgcmV0dXJuIChjaGlsZC5zdHlsZSgp
Lmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuaGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSkgJiYg
KGNoaWxkLmhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIHx8IGNoaWxkLmhhc1N0cmV0Y2hlZExv
Z2ljYWxIZWlnaHQoKSk7CiB9CiAKIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBmbG93QXdhcmVE
aXJlY3Rpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJHcmlkJiBncmlkLCBjb25zdCBSZW5kZXJCb3gm
IGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGQ5MGMxMTM5MTkyMmE3MmU4OTAxNjg4MWQ3
YjIzZWQ5YjMwZTc2OTMuLmY3ZjE2M2FlODdlYzk0NTNhYmU3NDYxMTkwZmY0YWYwNTk5YTljNWYg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTk2MCw4ICs5NjAs
MTIgQEAgdm9pZCBSZW5kZXJHcmlkOjp1cGRhdGVHcmlkQXJlYUZvckFzcGVjdFJhdGlvSXRlbXMo
Y29uc3QgVmVjdG9yPFJlbmRlckJveCo+JiBhdXQKICAgICBwb3B1bGF0ZUdyaWRQb3NpdGlvbnNG
b3JEaXJlY3Rpb24oRm9yQ29sdW1ucyk7CiAgICAgcG9wdWxhdGVHcmlkUG9zaXRpb25zRm9yRGly
ZWN0aW9uKEZvclJvd3MpOwogCi0gICAgZm9yIChhdXRvJiBhdXRvR3JpZEl0ZW0gOiBhdXRvR3Jp
ZEl0ZW1zKSAKKyAgICBmb3IgKGF1dG8mIGF1dG9HcmlkSXRlbSA6IGF1dG9HcmlkSXRlbXMpIHsK
ICAgICAgICAgdXBkYXRlR3JpZEFyZWFMb2dpY2FsU2l6ZSgqYXV0b0dyaWRJdGVtLCBncmlkQXJl
YUJyZWFkdGhGb3JDaGlsZEluY2x1ZGluZ0FsaWdubWVudE9mZnNldHMoKmF1dG9HcmlkSXRlbSwg
Rm9yQ29sdW1ucyksIGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkSW5jbHVkaW5nQWxpZ25tZW50T2Zm
c2V0cygqYXV0b0dyaWRJdGVtLCBGb3JSb3dzKSk7CisgICAgICAgIC8vIEZvciBhbiBpdGVtIHd0
aWggYXNwZWN0LXJhdGlvLCBpZiBpdCBoYXMgc3RyZXRjaCBhbGlnbm1lbnQgdGhhdCBzdHJldGNo
ZXMgdG8gdGhlIGRlZmluaXRlIHJvdywgd2UgYWxzbyBuZWVkIHRvIHRyYW5zZmVyIHRoZSBzaXpl
IGJlZm9yZSBsYXlpbmcgb3V0IHRoZSBncmlkIGl0ZW0uCisgICAgICAgIGlmIChhdXRvR3JpZEl0
ZW0tPmhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSkKKyAgICAgICAgICAgIGFwcGx5U3RyZXRj
aEFsaWdubWVudFRvQ2hpbGRJZk5lZWRlZCgqYXV0b0dyaWRJdGVtKTsKKyAgICB9CiB9CiAKIHZv
aWQgUmVuZGVyR3JpZDo6bGF5b3V0R3JpZEl0ZW1zKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IGZmOGVhMWQ5NmMxNzA1N2NmNTdmMWNlYmU0NjAy
OTFiMTdiMjU1OWIuLmQ4YWVlNTM5OTgxZDVhMjY0OGQ1NWYwNDY5M2QzMzg0MTMzMjBmNTYgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtODAyLDcg
KzgwMiw3IEBAIGJvb2wgUmVuZGVyUmVwbGFjZWQ6OmlzQ29udGVudExpa2VseVZpc2libGVJblZp
ZXdwb3J0KCkKIGJvb2wgUmVuZGVyUmVwbGFjZWQ6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxj
dWxhdGlvbigpIGNvbnN0CiB7CiAgICAgLy8gSWYgdGhlIGhlaWdodCBpcyBhIHBlcmNlbnRhZ2Ug
YW5kIHRoZSB3aWR0aCBpcyBhdXRvLCB0aGVuIHRoZSBjb250YWluaW5nQmxvY2tzJ3MgaGVpZ2h0
IGNoYW5naW5nIGNhbiBjYXVzZSB0aGlzIG5vZGUgdG8gY2hhbmdlIGl0J3MgcHJlZmVycmVkIHdp
ZHRoIGJlY2F1c2UgaXQgbWFpbnRhaW5zIGFzcGVjdCByYXRpby4KLSAgICByZXR1cm4gaGFzUmVs
YXRpdmVMb2dpY2FsSGVpZ2h0KCkgJiYgc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKTsK
KyAgICByZXR1cm4gKGhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIHx8IChpc0dyaWRJdGVtKCkg
JiYgaGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCgpKSkgJiYgc3R5bGUoKS5sb2dpY2FsV2lkdGgo
KS5pc0F1dG8oKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGU2NTUwZmVmZTBmZjQ3NWU2YzgxNDk3ZWQ3MjFm
Yzg0MmZlOWE3NjEuLmUxMGUzZjI4MzVjMDQ4MzdmZGM2MmYwMTVkMTFkZmZlYzFhM2Y0ZTQgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMS0xMSAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEu
Y29tPgorCisgICAgICAgIFtjc3MtZ3JpZF0gVHJhbnNmZXIgc2l6ZSBmb3IgZ3JpZCBpdGVtIHdp
dGggYW4gYXNwZWN0LXJhdGlvIGFuZCBzdHJldGNoIGFsaWdubWVudCBhZ2FpbnN0IHRoZSBkZWZp
bml0ZSByb3cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIzMjk4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogVGVzdEV4cGVjdGF0aW9uczogdW5za2lwIHRoZSB0ZXN0IHRoYXQgaXMgbm93IHBhc3Npbmcu
CisKIDIwMjEtMTEtMTAgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+
CiAKICAgICAgICAgW2Nzcy1mbGV4Ym94XSBJbXByb3ZlICYgc2ltcGxpZnkgdGhlIGZsZXgtYmFz
aXMgY29tcHV0YXRpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDczYjA0MzY5YWI2OGJmZDQ0NWUy
ZWIxMmEwMTczMWJjMjUwYjU4YzMuLjhkMGIyMzUyM2M4YjFkZTdjOTI3ZmFkNzhiNTc1ZjMxOGI4
MzhhMWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTM5Miw3ICsxMzkyLDYgQEAgd2Via2l0Lm9y
Zy9iLzIxNjE0NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9h
bGlnbm1lbnQvZ3JpZC0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1n
cmlkL2dyaWQtZGVmaW5pdGlvbi9ncmlkLWF1dG8tcmVwZWF0LWR5bmFtaWMtMDAxLmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1ncmlkL2dyaWQtZGVmaW5pdGlvbi9ncmlkLXJlcGVhdC1tYXgtd2lkdGgtMDAxLmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIAotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWdyaWQvZ3JpZC1pdGVtcy9hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQt
aXRlbXMvZ3JpZC1pdGVtLWlubGluZS1jb250cmlidXRpb24tMDAzLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMzEwMjEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1pdGVtcy9ncmlkLXNpemUtd2l0aC1vcnRob2dvbmFsLWNo
aWxkLWR5bmFtaWMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIzMTAy
MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9ncmlkLWl0ZW1z
L3BlcmNlbnRhZ2UtbWFyZ2luLWR5bmFtaWMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>