<?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>229093</bug_id>
          
          <creation_ts>2021-08-13 13:51:35 -0700</creation_ts>
          <short_desc>Top layer: handle display: contents and non out-of-flow position values</short_desc>
          <delta_ts>2021-08-19 11:06:21 -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>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>
          
          <blocked>84635</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Tim Nguyen (:ntim)">ntim</reporter>
          <assigned_to name="Tim Nguyen (:ntim)">ntim</assigned_to>
          <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1784203</commentid>
    <comment_count>0</comment_count>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2021-08-13 13:51:35 -0700</bug_when>
    <thetext>In top layer:

display: contents -&gt; display: block;

position: static/relative/sticky -&gt; position: absolute;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784207</commentid>
    <comment_count>1</comment_count>
      <attachid>435506</attachid>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2021-08-13 14:00:34 -0700</bug_when>
    <thetext>Created attachment 435506
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784217</commentid>
    <comment_count>2</comment_count>
      <attachid>435506</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-08-13 14:11:32 -0700</bug_when>
    <thetext>Comment on attachment 435506
Patch

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

&gt; Source/WebCore/style/StyleAdjuster.cpp:583
&gt; +    if (!m_element &amp;&amp; style.styleType() != PseudoId::Before &amp;&amp; style.styleType() != PseudoId::After) {

Would be nice to wrap the PseudoId::Before &amp; PseudoId::After check in a function that is named using a spec-related term; maybe put it as a static function in some pseudo-related code.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784255</commentid>
    <comment_count>3</comment_count>
      <attachid>435522</attachid>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2021-08-13 15:24:41 -0700</bug_when>
    <thetext>Created attachment 435522
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784256</commentid>
    <comment_count>4</comment_count>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2021-08-13 15:26:46 -0700</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #2)
&gt; Comment on attachment 435506 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=435506&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/style/StyleAdjuster.cpp:583
&gt; &gt; +    if (!m_element &amp;&amp; style.styleType() != PseudoId::Before &amp;&amp; style.styleType() != PseudoId::After) {
&gt; 
&gt; Would be nice to wrap the PseudoId::Before &amp; PseudoId::After check in a
&gt; function that is named using a spec-related term; maybe put it as a static
&gt; function in some pseudo-related code.

non-before/after pseudo element? not sure. I left it as it was, not sure how to improve it really.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784313</commentid>
    <comment_count>5</comment_count>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2021-08-14 00:23:29 -0700</bug_when>
    <thetext>(In reply to Tim Nguyen (:ntim) from comment #4)
&gt; (In reply to Simon Fraser (smfr) from comment #2)
&gt; &gt; Comment on attachment 435506 [details]
&gt; &gt; Patch
&gt; &gt; 
&gt; &gt; View in context:
&gt; &gt; https://bugs.webkit.org/attachment.cgi?id=435506&amp;action=review
&gt; &gt; 
&gt; &gt; &gt; Source/WebCore/style/StyleAdjuster.cpp:583
&gt; &gt; &gt; +    if (!m_element &amp;&amp; style.styleType() != PseudoId::Before &amp;&amp; style.styleType() != PseudoId::After) {
&gt; &gt; 
&gt; &gt; Would be nice to wrap the PseudoId::Before &amp; PseudoId::After check in a
&gt; &gt; function that is named using a spec-related term; maybe put it as a static
&gt; &gt; function in some pseudo-related code.
&gt; 
&gt; non-before/after pseudo element? not sure. I left it as it was, not sure how
&gt; to improve it really.

hmm maybe non tree-abiding pseudo element</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784314</commentid>
    <comment_count>6</comment_count>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2021-08-14 01:13:44 -0700</bug_when>
    <thetext>(In reply to Tim Nguyen (:ntim) from comment #5)
&gt; (In reply to Tim Nguyen (:ntim) from comment #4)
&gt; &gt; (In reply to Simon Fraser (smfr) from comment #2)
&gt; &gt; &gt; Comment on attachment 435506 [details]
&gt; &gt; &gt; Patch
&gt; &gt; &gt; 
&gt; &gt; &gt; View in context:
&gt; &gt; &gt; https://bugs.webkit.org/attachment.cgi?id=435506&amp;action=review
&gt; &gt; &gt; 
&gt; &gt; &gt; &gt; Source/WebCore/style/StyleAdjuster.cpp:583
&gt; &gt; &gt; &gt; +    if (!m_element &amp;&amp; style.styleType() != PseudoId::Before &amp;&amp; style.styleType() != PseudoId::After) {
&gt; &gt; &gt; 
&gt; &gt; &gt; Would be nice to wrap the PseudoId::Before &amp; PseudoId::After check in a
&gt; &gt; &gt; function that is named using a spec-related term; maybe put it as a static
&gt; &gt; &gt; function in some pseudo-related code.
&gt; &gt; 
&gt; &gt; non-before/after pseudo element? not sure. I left it as it was, not sure how
&gt; &gt; to improve it really.
&gt; 
&gt; hmm maybe non tree-abiding pseudo element

Well, this seems inconsistent across browsers, so I filed a spec issue: https://github.com/w3c/csswg-drafts/issues/6518

Will leave this unchanged for now (though there are improvements that could be done to match other browsers).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785523</commentid>
    <comment_count>7</comment_count>
      <attachid>435886</attachid>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2021-08-19 11:04:19 -0700</bug_when>
    <thetext>Created attachment 435886
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785524</commentid>
    <comment_count>8</comment_count>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2021-08-19 11:05:11 -0700</bug_when>
    <thetext>Committed r281252 (240688@main): &lt;https://commits.webkit.org/240688@main&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785526</commentid>
    <comment_count>9</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-08-19 11:06:21 -0700</bug_when>
    <thetext>&lt;rdar://problem/82133421&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435506</attachid>
            <date>2021-08-13 14:00:34 -0700</date>
            <delta_ts>2021-08-13 15:24:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229093-20210813230033.patch</filename>
            <type>text/plain</type>
            <size>9021</size>
            <attacher name="Tim Nguyen (:ntim)">ntim</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U3MTcyMmVlNTAzNjUz
NmFhMjI5NTM5MThlNDdlMmJmOTVhMDhkOS4uNGZiZmE3NWI0ZDE4MjM2NTFiZTcyODJmMTRkYjZj
NjkzYjc1NjE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA4LTEzICBUaW0g
Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgVG9wIGxheWVyOiBoYW5kbGUgZGlz
cGxheTogY29udGVudHMgYW5kIG5vbiBvdXQtb2YtZmxvdyBwb3NpdGlvbiB2YWx1ZXMKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTA5MworCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZyb206IGh0dHBzOi8v
ZnVsbHNjcmVlbi5zcGVjLndoYXR3Zy5vcmcvI25ldy1zdGFja2luZy1sYXllcgorICAgICAgICBJ
ZiBpdHMgc3BlY2lmaWVkIGRpc3BsYXkgcHJvcGVydHkgaXMgY29udGVudHMsIGl0IGNvbXB1dGVz
IHRvIGJsb2NrLgorICAgICAgICBJZiBpdHMgc3BlY2lmaWVkIHBvc2l0aW9uIHByb3BlcnR5IGlz
IG5vdCBhYnNvbHV0ZSBvciBmaXhlZCwgaXQgY29tcHV0ZXMgdG8gYWJzb2x1dGUuCisKKyAgICAg
ICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9p
bnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQvbW9kYWwtZGlhbG9nLWRpc3Bs
YXktY29udGVudHMuaHRtbAorCisgICAgICAgICogc3R5bGUvU3R5bGVBZGp1c3Rlci5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpTdHlsZTo6QWRqdXN0ZXI6OmFkanVzdCBjb25zdCk6CisgICAgICAg
IChXZWJDb3JlOjpTdHlsZTo6QWRqdXN0ZXI6OmFkanVzdERpc3BsYXlDb250ZW50c1N0eWxlIGNv
bnN0KToKKwogMjAyMS0wOC0xMiAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAgICAg
ICAgIEltcGxlbWVudCA6OmJhY2tkcm9wIHBzZXVkbyBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl
L1N0eWxlQWRqdXN0ZXIuY3BwCmluZGV4IDgwMzg0ZGQxNmFiOTUyYzIzODQ5YjZmZTFjZDgzZjAx
OTlhNWNlMWUuLmMwZTVmNGNjYTk4NzhjZWZkMTBhNmYwZjlmYWMxY2E1ZGM5YWFmNDMgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCkBAIC0zMTMsNiArMzEzLDEyIEBAIHZv
aWQgQWRqdXN0ZXI6OmFkanVzdChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxl
KiB1c2VyQWdlbnRBcHBlYXJhbmNlCiAgICAgICAgICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZl
RGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOwogICAgICAgICB9CiAKKyAgICAgICAgLy8gVG9w
IGxheWVyIGVsZW1lbnRzIGFyZSBhbHdheXMgcG9zaXRpb246IGFic29sdXRlOyB1bmxlc3MgdGhl
IHBvc2l0aW9uIGlzIHNldCB0byBmaXhlZC4KKyAgICAgICAgLy8gaHR0cHM6Ly9mdWxsc2NyZWVu
LnNwZWMud2hhdHdnLm9yZy8jbmV3LXN0YWNraW5nLWxheWVyCisgICAgICAgIGJvb2wgaXNJblRv
cExheWVyID0gc3R5bGUuc3R5bGVUeXBlKCkgPT0gUHNldWRvSWQ6OkJhY2tkcm9wIHx8IChtX2Vs
ZW1lbnQgJiYgbV9lbGVtZW50LT5pc0luVG9wTGF5ZXIoKSk7CisgICAgICAgIGlmIChzdHlsZS5w
b3NpdGlvbigpICE9IFBvc2l0aW9uVHlwZTo6QWJzb2x1dGUgJiYgc3R5bGUucG9zaXRpb24oKSAh
PSBQb3NpdGlvblR5cGU6OkZpeGVkICYmIGlzSW5Ub3BMYXllcikKKyAgICAgICAgICAgIHN0eWxl
LnNldFBvc2l0aW9uKFBvc2l0aW9uVHlwZTo6QWJzb2x1dGUpOworCiAgICAgICAgIC8vIEFic29s
dXRlL2ZpeGVkIHBvc2l0aW9uZWQgZWxlbWVudHMsIGZsb2F0aW5nIGVsZW1lbnRzIGFuZCB0aGUg
ZG9jdW1lbnQgZWxlbWVudCBuZWVkIGJsb2NrLWxpa2Ugb3V0c2lkZSBkaXNwbGF5LgogICAgICAg
ICBpZiAoc3R5bGUuaGFzT3V0T2ZGbG93UG9zaXRpb24oKSB8fCBzdHlsZS5pc0Zsb2F0aW5nKCkg
fHwgKG1fZWxlbWVudCAmJiBtX2RvY3VtZW50LmRvY3VtZW50RWxlbWVudCgpID09IG1fZWxlbWVu
dCkpCiAgICAgICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KGVxdWl2YWxlbnRCbG9j
a0Rpc3BsYXkoc3R5bGUsIG1fZG9jdW1lbnQpKTsKQEAgLTU2OCwxNCArNTc0LDE0IEBAIHN0YXRp
YyBib29sIGhhc0VmZmVjdGl2ZURpc3BsYXlOb25lRm9yRGlzcGxheUNvbnRlbnRzKGNvbnN0IEVs
ZW1lbnQmIGVsZW1lbnQpCiAKIHZvaWQgQWRqdXN0ZXI6OmFkanVzdERpc3BsYXlDb250ZW50c1N0
eWxlKFJlbmRlclN0eWxlJiBzdHlsZSkgY29uc3QKIHsKLSAgICBpZiAoIW1fZWxlbWVudCkgewot
ICAgICAgICBpZiAoc3R5bGUuc3R5bGVUeXBlKCkgIT0gUHNldWRvSWQ6OkJlZm9yZSAmJiBzdHls
ZS5zdHlsZVR5cGUoKSAhPSBQc2V1ZG9JZDo6QWZ0ZXIpCi0gICAgICAgICAgICBzdHlsZS5zZXRF
ZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpOb25lKTsKKyAgICBib29sIGlzSW5Ub3BMYXll
ciA9IHN0eWxlLnN0eWxlVHlwZSgpID09IFBzZXVkb0lkOjpCYWNrZHJvcCB8fCAobV9lbGVtZW50
ICYmIG1fZWxlbWVudC0+aXNJblRvcExheWVyKCkpOworICAgIGlmIChpc0luVG9wTGF5ZXIgfHwg
bV9kb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKSA9PSBtX2VsZW1lbnQpIHsKKyAgICAgICAgc3R5
bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOwogICAgICAgICByZXR1
cm47CiAgICAgfQogCi0gICAgaWYgKG1fZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KCkgPT0gbV9l
bGVtZW50KSB7Ci0gICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZURpc3BsYXkoRGlzcGxheVR5cGU6
OkJsb2NrKTsKKyAgICBpZiAoIW1fZWxlbWVudCAmJiBzdHlsZS5zdHlsZVR5cGUoKSAhPSBQc2V1
ZG9JZDo6QmVmb3JlICYmIHN0eWxlLnN0eWxlVHlwZSgpICE9IFBzZXVkb0lkOjpBZnRlcikgewor
ICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpOb25lKTsKICAg
ICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDQ0ZDg5MmZkMmE4YzE1OGNiNWFkODJiZGEw
OTY5NWIzNWJkMTdmYzguLjQxZjhmYTcyZTkyNmVmZTVlOThmMjk2M2I4OTQzN2RmOWI0YzY4OTcg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0wOC0xMyAgVGltIE5ndXllbiAgPG50aW1AYXBw
bGUuY29tPgorCisgICAgICAgIFRvcCBsYXllcjogaGFuZGxlIGRpc3BsYXk6IGNvbnRlbnRzIGFu
ZCBub24gb3V0LW9mLWZsb3cgcG9zaXRpb24gdmFsdWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkwOTMKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGcm9tOiBodHRwczovL2Z1bGxzY3JlZW4uc3BlYy53
aGF0d2cub3JnLyNuZXctc3RhY2tpbmctbGF5ZXIKKyAgICAgICAgSWYgaXRzIHNwZWNpZmllZCBk
aXNwbGF5IHByb3BlcnR5IGlzIGNvbnRlbnRzLCBpdCBjb21wdXRlcyB0byBibG9jay4KKyAgICAg
ICAgSWYgaXRzIHNwZWNpZmllZCBwb3NpdGlvbiBwcm9wZXJ0eSBpcyBub3QgYWJzb2x1dGUgb3Ig
Zml4ZWQsIGl0IGNvbXB1dGVzIHRvIGFic29sdXRlLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVu
dHMvdGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRpYWxvZy1kaXNwbGF5LWNvbnRlbnRzLmh0bWwK
KworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDgtMTIgIFRpbSBOZ3V5ZW4g
IDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgOjpiYWNrZHJvcCBwc2V1ZG8g
ZWxlbWVudApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggYzAxOGY3YTg3YTg2YjM0
MDUwMjllNDBhN2JkNDkyNDZmOGFhYmM2NS4uZDdiNDAyYTJkMWQ4YTlhZjlkYzgyYzdlZDllNDZk
NGU1MzY4NGFhNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg
QEAKKzIwMjEtMDgtMTMgIFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KKworICAgICAgICBU
b3AgbGF5ZXI6IGhhbmRsZSBkaXNwbGF5OiBjb250ZW50cyBhbmQgbm9uIG91dC1vZi1mbG93IHBv
c2l0aW9uIHZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjI5MDkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgRnJvbTogaHR0cHM6Ly9mdWxsc2NyZWVuLnNwZWMud2hhdHdnLm9yZy8jbmV3LXN0YWNr
aW5nLWxheWVyCisgICAgICAgIElmIGl0cyBzcGVjaWZpZWQgZGlzcGxheSBwcm9wZXJ0eSBpcyBj
b250ZW50cywgaXQgY29tcHV0ZXMgdG8gYmxvY2suCisgICAgICAgIElmIGl0cyBzcGVjaWZpZWQg
cG9zaXRpb24gcHJvcGVydHkgaXMgbm90IGFic29sdXRlIG9yIGZpeGVkLCBpdCBjb21wdXRlcyB0
byBhYnNvbHV0ZS4KKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVu
dC9tb2RhbC1kaWFsb2ctZGlzcGxheS1jb250ZW50cy5odG1sCisKKyAgICAgICAgKiB3ZWItcGxh
dGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxv
Zy1lbGVtZW50L21vZGFsLWRpYWxvZy1kaXNwbGF5LWNvbnRlbnRzLWV4cGVjdGVkLmh0bWw6IEFk
ZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRlcmFj
dGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQvbW9kYWwtZGlhbG9nLWRpc3BsYXktY29u
dGVudHMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDgtMTIgIFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxl
LmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgOjpiYWNrZHJvcCBwc2V1ZG8gZWxlbWVudApkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RF
eHBlY3RhdGlvbnMKaW5kZXggNTU0ODMzYjdkYTYzNzlhYmZkMGUwNzQ0YzAzMzk4Yjc2MTAwYTQ1
NC4uODdjMjhhOGQ2ZDdmMWY1MGY4Y2M1ZDMxNjlkNmJjNTQyMmZiNzE0MyAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zCkBAIC0yMzgwLDkgKzIzODAsNyBAQCBpbXBvcnRlZC9ibGluay9mYXN0L211bHRpY29s
L291dGxpbmVzLWF0LWNvbHVtbi1ib3VuZGFyaWVzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdQogZmFz
dC9tdWx0aWNvbC9tdWx0aWNvbC13aXRoLWNoaWxkLXJlbmRlckxheWVyLWZvci1pbnB1dC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKICMgVG9wIGxheWVyIHRlc3RzCi13ZWJraXQub3JnL2Iv
ODQ3OTYgaW1wb3J0ZWQvYmxpbmsvZGlhbG9nL2JhY2tkcm9wLWluLWZsb3cuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzg0Nzk2IGltcG9ydGVkL2JsaW5rL2RpYWxvZy9i
YWNrZHJvcC1zdGFja2luZy1vcmRlci5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvODQ3OTYgaW1wb3J0ZWQvYmxpbmsvZGlhbG9nL2RvbnQtc2hhcmUtc3R5bGUtdG8tdG9w
LWxheWVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi84NDc5NiBpbXBv
cnRlZC9ibGluay9kaWFsb2cvbW9kYWwtZGlhbG9nLWluLXJlcGxhY2VkLXJlbmRlcmVyLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi84NDc5NiBpbXBvcnRlZC9ibGluay9k
aWFsb2cvbW9kYWwtZGlhbG9nLWluLXRhYmxlLWNvbHVtbi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvODQ3OTYgaW1wb3J0ZWQvYmxpbmsvZGlhbG9nL3JlbW92ZWQtZWxl
bWVudC1pcy1yZW1vdmVkLWZyb20tdG9wLWxheWVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
aHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L21v
ZGFsLWRpYWxvZy1kaXNwbGF5LWNvbnRlbnRzLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZl
LWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9tb2RhbC1kaWFsb2ctZGlzcGxheS1jb250ZW50
cy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFiMzdlZDFhY2E4YWRhNTM3YzU1ZGM4NWY1YmQ4
MTllZTQyMzU1YzQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3Ro
ZS1kaWFsb2ctZWxlbWVudC9tb2RhbC1kaWFsb2ctZGlzcGxheS1jb250ZW50cy1leHBlY3RlZC5o
dG1sCkBAIC0wLDAgKzEsMTggQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8dGl0bGU+UmVm
ZXJlbmNlOiBUZXN0IHRoYXQgZGlzcGxheTogY29udGVudHM7IG9uIG1vZGFsIGRpYWxvZyAmIDo6
YmFja2Ryb3AgYWN0cyBsaWtlIGRpc3BsYXk6IGJsb2NrPC90aXRsZT4KKzxtZXRhIGNoYXJzZXQ9
InV0Zi04Ij4KKzxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iVGltIE5ndXllbiIgaHJlZj0iaHR0
cHM6Ly9naXRodWIuY29tL250MW0iPgorPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBncmVl
biBkaWFsb2c8L3A+Cis8cCBpZD0iY29tcHV0ZWQtdmFsdWUiPmJsb2NrPC9wPgorPHAgaWQ9ImNv
bXB1dGVkLXZhbHVlLWJhY2tkcm9wIj5ibG9jazwvcD4KKzxkaWFsb2c+PC9kaWFsb2c+Cis8c3R5
bGU+CitkaWFsb2cgeworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4K
KzxzY3JpcHQ+Citkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJkaWFsb2ciKS5zaG93TW9kYWwoKTsK
Kzwvc2NyaXB0PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90
aGUtZGlhbG9nLWVsZW1lbnQvbW9kYWwtZGlhbG9nLWRpc3BsYXktY29udGVudHMuaHRtbCBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3Mv
aW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRpYWxvZy1kaXNw
bGF5LWNvbnRlbnRzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTM1NDhkNzc5YTU4MzExZWRhNWJiMDYzMjQx
NWQ1Zjg4NTA5Y2JkNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMv
dGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRpYWxvZy1kaXNwbGF5LWNvbnRlbnRzLmh0bWwKQEAg
LTAsMCArMSwyNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzx0aXRsZT5UZXN0IHRoYXQg
ZGlzcGxheTogY29udGVudHM7IG9uIG1vZGFsIGRpYWxvZyAmIDo6YmFja2Ryb3AgYWN0cyBsaWtl
IGRpc3BsYXk6IGJsb2NrPC90aXRsZT4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzxsaW5rIHJl
bD0iYXV0aG9yIiB0aXRsZT0iVGltIE5ndXllbiIgaHJlZj0iaHR0cHM6Ly9naXRodWIuY29tL250
MW0iPgorPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0ibW9kYWwtZGlhbG9nLWRpc3BsYXktY29udGVu
dHMtZXhwZWN0ZWQuaHRtbCI+Cis8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGdyZWVuIGRp
YWxvZzwvcD4KKzxwIGlkPSJjb21wdXRlZC12YWx1ZSI+PC9wPgorPHAgaWQ9ImNvbXB1dGVkLXZh
bHVlLWJhY2tkcm9wIj48L3A+Cis8ZGlhbG9nPjwvZGlhbG9nPgorPHN0eWxlPgorZGlhbG9nIHsK
KyAgICBkaXNwbGF5OiBjb250ZW50czsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKK30K
K2RpYWxvZzo6YmFja2Ryb3AgeworICAgIGRpc3BsYXk6IGNvbnRlbnRzOworfQorPC9zdHlsZT4K
KzxzY3JpcHQ+CitkaWFsb2cgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJkaWFsb2ciKTsKK2Rp
YWxvZy5zaG93TW9kYWwoKTsKK2RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21wdXRlZC12YWx1
ZSIpLnRleHRDb250ZW50ID0gZ2V0Q29tcHV0ZWRTdHlsZShkaWFsb2cpLmRpc3BsYXk7Citkb2N1
bWVudC5nZXRFbGVtZW50QnlJZCgiY29tcHV0ZWQtdmFsdWUtYmFja2Ryb3AiKS50ZXh0Q29udGVu
dCA9IGdldENvbXB1dGVkU3R5bGUoZGlhbG9nLCAiOjpiYWNrZHJvcCIpLmRpc3BsYXk7Cis8L3Nj
cmlwdD4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435522</attachid>
            <date>2021-08-13 15:24:41 -0700</date>
            <delta_ts>2021-08-19 11:04:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229093-20210814002439.patch</filename>
            <type>text/plain</type>
            <size>9216</size>
            <attacher name="Tim Nguyen (:ntim)">ntim</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U3MTcyMmVlNTAzNjUz
NmFhMjI5NTM5MThlNDdlMmJmOTVhMDhkOS4uY2QwNjg4MDc3Nzk4ZWFhNDRhZmYxMDMxMmYxZDQ1
MmM0M2JiNzgxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA4LTEzICBUaW0g
Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgVG9wIGxheWVyOiBoYW5kbGUgZGlz
cGxheTogY29udGVudHMgYW5kIG5vbiBvdXQtb2YtZmxvdyBwb3NpdGlvbiB2YWx1ZXMKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTA5MworCisgICAg
ICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBGcm9tOiBodHRwczovL2Z1
bGxzY3JlZW4uc3BlYy53aGF0d2cub3JnLyNuZXctc3RhY2tpbmctbGF5ZXIKKyAgICAgICAgSWYg
aXRzIHNwZWNpZmllZCBkaXNwbGF5IHByb3BlcnR5IGlzIGNvbnRlbnRzLCBpdCBjb21wdXRlcyB0
byBibG9jay4KKyAgICAgICAgSWYgaXRzIHNwZWNpZmllZCBwb3NpdGlvbiBwcm9wZXJ0eSBpcyBu
b3QgYWJzb2x1dGUgb3IgZml4ZWQsIGl0IGNvbXB1dGVzIHRvIGFic29sdXRlLgorCisgICAgICAg
IFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50
ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRpYWxvZy1kaXNwbGF5
LWNvbnRlbnRzLmh0bWwKKworICAgICAgICAqIHN0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3QgY29uc3QpOgorICAgICAgICAo
V2ViQ29yZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3REaXNwbGF5Q29udGVudHNTdHlsZSBjb25z
dCk6CisKIDIwMjEtMDgtMTIgIFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAogICAgICAg
ICBJbXBsZW1lbnQgOjpiYWNrZHJvcCBwc2V1ZG8gZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvc3R5bGUvU3R5bGVBZGp1c3Rlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T
dHlsZUFkanVzdGVyLmNwcAppbmRleCA4MDM4NGRkMTZhYjk1MmMyMzg0OWI2ZmUxY2Q4M2YwMTk5
YTVjZTFlLi43MjAzYWJlMGQ0NWIwZDFjZTMzYmQwZGJjYTc5Y2QwZGU2MWQyY2M0IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcApAQCAtMzEzLDYgKzMxMywxMiBAQCB2b2lk
IEFkanVzdGVyOjphZGp1c3QoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSog
dXNlckFnZW50QXBwZWFyYW5jZQogICAgICAgICAgICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZURp
c3BsYXkoRGlzcGxheVR5cGU6OkJsb2NrKTsKICAgICAgICAgfQogCisgICAgICAgIC8vIFRvcCBs
YXllciBlbGVtZW50cyBhcmUgYWx3YXlzIHBvc2l0aW9uOiBhYnNvbHV0ZTsgdW5sZXNzIHRoZSBw
b3NpdGlvbiBpcyBzZXQgdG8gZml4ZWQuCisgICAgICAgIC8vIGh0dHBzOi8vZnVsbHNjcmVlbi5z
cGVjLndoYXR3Zy5vcmcvI25ldy1zdGFja2luZy1sYXllcgorICAgICAgICBib29sIGlzSW5Ub3BM
YXllciA9IHN0eWxlLnN0eWxlVHlwZSgpID09IFBzZXVkb0lkOjpCYWNrZHJvcCB8fCAobV9lbGVt
ZW50ICYmIG1fZWxlbWVudC0+aXNJblRvcExheWVyKCkpOworICAgICAgICBpZiAoc3R5bGUucG9z
aXRpb24oKSAhPSBQb3NpdGlvblR5cGU6OkFic29sdXRlICYmIHN0eWxlLnBvc2l0aW9uKCkgIT0g
UG9zaXRpb25UeXBlOjpGaXhlZCAmJiBpc0luVG9wTGF5ZXIpCisgICAgICAgICAgICBzdHlsZS5z
ZXRQb3NpdGlvbihQb3NpdGlvblR5cGU6OkFic29sdXRlKTsKKwogICAgICAgICAvLyBBYnNvbHV0
ZS9maXhlZCBwb3NpdGlvbmVkIGVsZW1lbnRzLCBmbG9hdGluZyBlbGVtZW50cyBhbmQgdGhlIGRv
Y3VtZW50IGVsZW1lbnQgbmVlZCBibG9jay1saWtlIG91dHNpZGUgZGlzcGxheS4KICAgICAgICAg
aWYgKHN0eWxlLmhhc091dE9mRmxvd1Bvc2l0aW9uKCkgfHwgc3R5bGUuaXNGbG9hdGluZygpIHx8
IChtX2VsZW1lbnQgJiYgbV9kb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKSA9PSBtX2VsZW1lbnQp
KQogICAgICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShlcXVpdmFsZW50QmxvY2tE
aXNwbGF5KHN0eWxlLCBtX2RvY3VtZW50KSk7CkBAIC01NjgsMTggKzU3NCwxOCBAQCBzdGF0aWMg
Ym9vbCBoYXNFZmZlY3RpdmVEaXNwbGF5Tm9uZUZvckRpc3BsYXlDb250ZW50cyhjb25zdCBFbGVt
ZW50JiBlbGVtZW50KQogCiB2b2lkIEFkanVzdGVyOjphZGp1c3REaXNwbGF5Q29udGVudHNTdHls
ZShSZW5kZXJTdHlsZSYgc3R5bGUpIGNvbnN0CiB7Ci0gICAgaWYgKCFtX2VsZW1lbnQpIHsKLSAg
ICAgICAgaWYgKHN0eWxlLnN0eWxlVHlwZSgpICE9IFBzZXVkb0lkOjpCZWZvcmUgJiYgc3R5bGUu
c3R5bGVUeXBlKCkgIT0gUHNldWRvSWQ6OkFmdGVyKQotICAgICAgICAgICAgc3R5bGUuc2V0RWZm
ZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6Tm9uZSk7CisgICAgYm9vbCBpc0luVG9wTGF5ZXIg
PSBzdHlsZS5zdHlsZVR5cGUoKSA9PSBQc2V1ZG9JZDo6QmFja2Ryb3AgfHwgKG1fZWxlbWVudCAm
JiBtX2VsZW1lbnQtPmlzSW5Ub3BMYXllcigpKTsKKyAgICBpZiAoaXNJblRvcExheWVyIHx8IG1f
ZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KCkgPT0gbV9lbGVtZW50KSB7CisgICAgICAgIHN0eWxl
LnNldEVmZmVjdGl2ZURpc3BsYXkoRGlzcGxheVR5cGU6OkJsb2NrKTsKICAgICAgICAgcmV0dXJu
OwogICAgIH0KIAotICAgIGlmIChtX2RvY3VtZW50LmRvY3VtZW50RWxlbWVudCgpID09IG1fZWxl
bWVudCkgewotICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpC
bG9jayk7CisgICAgaWYgKCFtX2VsZW1lbnQgJiYgc3R5bGUuc3R5bGVUeXBlKCkgIT0gUHNldWRv
SWQ6OkJlZm9yZSAmJiBzdHlsZS5zdHlsZVR5cGUoKSAhPSBQc2V1ZG9JZDo6QWZ0ZXIpIHsKKyAg
ICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6Tm9uZSk7CiAgICAg
ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoaGFzRWZmZWN0aXZlRGlzcGxheU5vbmVGb3JE
aXNwbGF5Q29udGVudHMoKm1fZWxlbWVudCkpCisgICAgaWYgKG1fZWxlbWVudCAmJiBoYXNFZmZl
Y3RpdmVEaXNwbGF5Tm9uZUZvckRpc3BsYXlDb250ZW50cygqbV9lbGVtZW50KSkKICAgICAgICAg
c3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6Tm9uZSk7CiB9CiAKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl
eCA0NGQ4OTJmZDJhOGMxNThjYjVhZDgyYmRhMDk2OTViMzViZDE3ZmM4Li4xNzZjNzE3MjI1M2M2
NDM4YWY0MzQ0MjY4OTRlM2MxZjU2ZGQyZmJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEt
MDgtMTMgIFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KKworICAgICAgICBUb3AgbGF5ZXI6
IGhhbmRsZSBkaXNwbGF5OiBjb250ZW50cyBhbmQgbm9uIG91dC1vZi1mbG93IHBvc2l0aW9uIHZh
bHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5
MDkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEZyb206
IGh0dHBzOi8vZnVsbHNjcmVlbi5zcGVjLndoYXR3Zy5vcmcvI25ldy1zdGFja2luZy1sYXllcgor
ICAgICAgICBJZiBpdHMgc3BlY2lmaWVkIGRpc3BsYXkgcHJvcGVydHkgaXMgY29udGVudHMsIGl0
IGNvbXB1dGVzIHRvIGJsb2NrLgorICAgICAgICBJZiBpdHMgc3BlY2lmaWVkIHBvc2l0aW9uIHBy
b3BlcnR5IGlzIG5vdCBhYnNvbHV0ZSBvciBmaXhlZCwgaXQgY29tcHV0ZXMgdG8gYWJzb2x1dGUu
CisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3Nl
bWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQvbW9kYWwtZGlh
bG9nLWRpc3BsYXktY29udGVudHMuaHRtbAorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoK
KwogMjAyMS0wOC0xMiAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAgICAgICAgIElt
cGxlbWVudCA6OmJhY2tkcm9wIHBzZXVkbyBlbGVtZW50CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n
ZUxvZwppbmRleCBjMDE4ZjdhODdhODZiMzQwNTAyOWU0MGE3YmQ0OTI0NmY4YWFiYzY1Li5lMjFl
MjEyYjExZmU4ODM1ZTZjMzg0MzNmYmM3MDk4MGZlMDJjYzA4IDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0wOC0xMyAgVGltIE5ndXllbiAgPG50
aW1AYXBwbGUuY29tPgorCisgICAgICAgIFRvcCBsYXllcjogaGFuZGxlIGRpc3BsYXk6IGNvbnRl
bnRzIGFuZCBub24gb3V0LW9mLWZsb3cgcG9zaXRpb24gdmFsdWVzCisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkwOTMKKworICAgICAgICBSZXZpZXdl
ZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgRnJvbTogaHR0cHM6Ly9mdWxsc2NyZWVuLnNw
ZWMud2hhdHdnLm9yZy8jbmV3LXN0YWNraW5nLWxheWVyCisgICAgICAgIElmIGl0cyBzcGVjaWZp
ZWQgZGlzcGxheSBwcm9wZXJ0eSBpcyBjb250ZW50cywgaXQgY29tcHV0ZXMgdG8gYmxvY2suCisg
ICAgICAgIElmIGl0cyBzcGVjaWZpZWQgcG9zaXRpb24gcHJvcGVydHkgaXMgbm90IGFic29sdXRl
IG9yIGZpeGVkLCBpdCBjb21wdXRlcyB0byBhYnNvbHV0ZS4KKworICAgICAgICBUZXN0OiBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVs
ZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9tb2RhbC1kaWFsb2ctZGlzcGxheS1jb250ZW50cy5o
dG1sCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJh
Y3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRpYWxvZy1kaXNwbGF5LWNv
bnRlbnRzLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0
cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQv
bW9kYWwtZGlhbG9nLWRpc3BsYXktY29udGVudHMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDgtMTIg
IFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgOjpiYWNr
ZHJvcCBwc2V1ZG8gZWxlbWVudApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNTU0ODMzYjdkYTYzNzlh
YmZkMGUwNzQ0YzAzMzk4Yjc2MTAwYTQ1NC4uODdjMjhhOGQ2ZDdmMWY1MGY4Y2M1ZDMxNjlkNmJj
NTQyMmZiNzE0MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0yMzgwLDkgKzIzODAsNyBAQCBpbXBv
cnRlZC9ibGluay9mYXN0L211bHRpY29sL291dGxpbmVzLWF0LWNvbHVtbi1ib3VuZGFyaWVzLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdQogZmFzdC9tdWx0aWNvbC9tdWx0aWNvbC13aXRoLWNoaWxkLXJl
bmRlckxheWVyLWZvci1pbnB1dC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKICMgVG9wIGxh
eWVyIHRlc3RzCi13ZWJraXQub3JnL2IvODQ3OTYgaW1wb3J0ZWQvYmxpbmsvZGlhbG9nL2JhY2tk
cm9wLWluLWZsb3cuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzg0Nzk2
IGltcG9ydGVkL2JsaW5rL2RpYWxvZy9iYWNrZHJvcC1zdGFja2luZy1vcmRlci5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvODQ3OTYgaW1wb3J0ZWQvYmxpbmsvZGlhbG9n
L2RvbnQtc2hhcmUtc3R5bGUtdG8tdG9wLWxheWVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi84NDc5NiBpbXBvcnRlZC9ibGluay9kaWFsb2cvbW9kYWwtZGlhbG9nLWlu
LXJlcGxhY2VkLXJlbmRlcmVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi84NDc5NiBpbXBvcnRlZC9ibGluay9kaWFsb2cvbW9kYWwtZGlhbG9nLWluLXRhYmxlLWNvbHVt
bi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvODQ3OTYgaW1wb3J0ZWQv
YmxpbmsvZGlhbG9nL3JlbW92ZWQtZWxlbWVudC1pcy1yZW1vdmVkLWZyb20tdG9wLWxheWVyLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVu
dHMvdGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRpYWxvZy1kaXNwbGF5LWNvbnRlbnRzLWV4cGVj
dGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0
bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9tb2Rh
bC1kaWFsb2ctZGlzcGxheS1jb250ZW50cy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFiMzdl
ZDFhY2E4YWRhNTM3YzU1ZGM4NWY1YmQ4MTllZTQyMzU1YzQKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNz
L2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9tb2RhbC1kaWFsb2ctZGlz
cGxheS1jb250ZW50cy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTggQEAKKzwhRE9DVFlQRSBo
dG1sPgorPGh0bWw+Cis8dGl0bGU+UmVmZXJlbmNlOiBUZXN0IHRoYXQgZGlzcGxheTogY29udGVu
dHM7IG9uIG1vZGFsIGRpYWxvZyAmIDo6YmFja2Ryb3AgYWN0cyBsaWtlIGRpc3BsYXk6IGJsb2Nr
PC90aXRsZT4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzxsaW5rIHJlbD0iYXV0aG9yIiB0aXRs
ZT0iVGltIE5ndXllbiIgaHJlZj0iaHR0cHM6Ly9naXRodWIuY29tL250MW0iPgorPHA+VGVzdCBw
YXNzZXMgaWYgdGhlcmUgaXMgYSBncmVlbiBkaWFsb2c8L3A+Cis8cCBpZD0iY29tcHV0ZWQtdmFs
dWUiPmJsb2NrPC9wPgorPHAgaWQ9ImNvbXB1dGVkLXZhbHVlLWJhY2tkcm9wIj5ibG9jazwvcD4K
KzxkaWFsb2c+PC9kaWFsb2c+Cis8c3R5bGU+CitkaWFsb2cgeworICAgIGJhY2tncm91bmQtY29s
b3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzxzY3JpcHQ+Citkb2N1bWVudC5xdWVyeVNlbGVjdG9y
KCJkaWFsb2ciKS5zaG93TW9kYWwoKTsKKzwvc2NyaXB0PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGlj
cy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQvbW9kYWwtZGlhbG9nLWRp
c3BsYXktY29udGVudHMuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1l
bGVtZW50L21vZGFsLWRpYWxvZy1kaXNwbGF5LWNvbnRlbnRzLmh0bWwKbmV3IGZpbGUgbW9kZSAx
MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTM1
NDhkNzc5YTU4MzExZWRhNWJiMDYzMjQxNWQ1Zjg4NTA5Y2JkNQotLS0gL2Rldi9udWxsCisrKyBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRpYWxvZy1k
aXNwbGF5LWNvbnRlbnRzLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8
aHRtbD4KKzx0aXRsZT5UZXN0IHRoYXQgZGlzcGxheTogY29udGVudHM7IG9uIG1vZGFsIGRpYWxv
ZyAmIDo6YmFja2Ryb3AgYWN0cyBsaWtlIGRpc3BsYXk6IGJsb2NrPC90aXRsZT4KKzxtZXRhIGNo
YXJzZXQ9InV0Zi04Ij4KKzxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iVGltIE5ndXllbiIgaHJl
Zj0iaHR0cHM6Ly9naXRodWIuY29tL250MW0iPgorPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0ibW9k
YWwtZGlhbG9nLWRpc3BsYXktY29udGVudHMtZXhwZWN0ZWQuaHRtbCI+Cis8cD5UZXN0IHBhc3Nl
cyBpZiB0aGVyZSBpcyBhIGdyZWVuIGRpYWxvZzwvcD4KKzxwIGlkPSJjb21wdXRlZC12YWx1ZSI+
PC9wPgorPHAgaWQ9ImNvbXB1dGVkLXZhbHVlLWJhY2tkcm9wIj48L3A+Cis8ZGlhbG9nPjwvZGlh
bG9nPgorPHN0eWxlPgorZGlhbG9nIHsKKyAgICBkaXNwbGF5OiBjb250ZW50czsKKyAgICBiYWNr
Z3JvdW5kLWNvbG9yOiBncmVlbjsKK30KK2RpYWxvZzo6YmFja2Ryb3AgeworICAgIGRpc3BsYXk6
IGNvbnRlbnRzOworfQorPC9zdHlsZT4KKzxzY3JpcHQ+CitkaWFsb2cgPSBkb2N1bWVudC5xdWVy
eVNlbGVjdG9yKCJkaWFsb2ciKTsKK2RpYWxvZy5zaG93TW9kYWwoKTsKK2RvY3VtZW50LmdldEVs
ZW1lbnRCeUlkKCJjb21wdXRlZC12YWx1ZSIpLnRleHRDb250ZW50ID0gZ2V0Q29tcHV0ZWRTdHls
ZShkaWFsb2cpLmRpc3BsYXk7Citkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29tcHV0ZWQtdmFs
dWUtYmFja2Ryb3AiKS50ZXh0Q29udGVudCA9IGdldENvbXB1dGVkU3R5bGUoZGlhbG9nLCAiOjpi
YWNrZHJvcCIpLmRpc3BsYXk7Cis8L3NjcmlwdD4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435886</attachid>
            <date>2021-08-19 11:04:19 -0700</date>
            <delta_ts>2021-08-19 11:04:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229093-20210819200418.patch</filename>
            <type>text/plain</type>
            <size>6917</size>
            <attacher name="Tim Nguyen (:ntim)">ntim</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNjYzU1YmUyMTVjNmEw
YTY0MGZjNTUzMmNhNTg3N2U1OWY4YjNhNS4uOWE4ZTU3ZjVlMGYxZmNkYjZiODA3NWNlYmY3OGYy
YzFkZjlhMzBlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA4LTEzICBUaW0g
Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgVG9wIGxheWVyOiBoYW5kbGUgZGlz
cGxheTogY29udGVudHMgYW5kIG5vbiBvdXQtb2YtZmxvdyBwb3NpdGlvbiB2YWx1ZXMKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTA5MworCisgICAg
ICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBGcm9tOiBodHRwczovL2Z1
bGxzY3JlZW4uc3BlYy53aGF0d2cub3JnLyNuZXctc3RhY2tpbmctbGF5ZXIKKyAgICAgICAgSWYg
aXRzIHNwZWNpZmllZCBkaXNwbGF5IHByb3BlcnR5IGlzIGNvbnRlbnRzLCBpdCBjb21wdXRlcyB0
byBibG9jay4KKyAgICAgICAgSWYgaXRzIHNwZWNpZmllZCBwb3NpdGlvbiBwcm9wZXJ0eSBpcyBu
b3QgYWJzb2x1dGUgb3IgZml4ZWQsIGl0IGNvbXB1dGVzIHRvIGFic29sdXRlLgorCisgICAgICAg
IFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50
ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRpYWxvZy1kaXNwbGF5
LWNvbnRlbnRzLmh0bWwKKworICAgICAgICAqIHN0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3QgY29uc3QpOgorICAgICAgICAo
V2ViQ29yZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3REaXNwbGF5Q29udGVudHNTdHlsZSBjb25z
dCk6CisKIDIwMjEtMDgtMTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+
CiAKICAgICAgICAgUmVuYW1lIEV2ZW50SGFuZGxlcjo6c2VuZFNjcm9sbEV2ZW50KCkgdG8gc2No
ZWR1bGVTY3JvbGxFdmVudCgpIHNpbmNlIHRoZSBldmVudCBpcyBub3Qgc2VudCBzeW5jaHJvbm91
c2x5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcCBi
L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCmluZGV4IDgwMzg0ZGQxNmFi
OTUyYzIzODQ5YjZmZTFjZDgzZjAxOTlhNWNlMWUuLjcyMDNhYmUwZDQ1YjBkMWNlMzNiZDBkYmNh
NzljZDBkZTYxZDJjYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRq
dXN0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCkBA
IC0zMTMsNiArMzEzLDEyIEBAIHZvaWQgQWRqdXN0ZXI6OmFkanVzdChSZW5kZXJTdHlsZSYgc3R5
bGUsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBlYXJhbmNlCiAgICAgICAgICAgICAg
ICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOwogICAgICAg
ICB9CiAKKyAgICAgICAgLy8gVG9wIGxheWVyIGVsZW1lbnRzIGFyZSBhbHdheXMgcG9zaXRpb246
IGFic29sdXRlOyB1bmxlc3MgdGhlIHBvc2l0aW9uIGlzIHNldCB0byBmaXhlZC4KKyAgICAgICAg
Ly8gaHR0cHM6Ly9mdWxsc2NyZWVuLnNwZWMud2hhdHdnLm9yZy8jbmV3LXN0YWNraW5nLWxheWVy
CisgICAgICAgIGJvb2wgaXNJblRvcExheWVyID0gc3R5bGUuc3R5bGVUeXBlKCkgPT0gUHNldWRv
SWQ6OkJhY2tkcm9wIHx8IChtX2VsZW1lbnQgJiYgbV9lbGVtZW50LT5pc0luVG9wTGF5ZXIoKSk7
CisgICAgICAgIGlmIChzdHlsZS5wb3NpdGlvbigpICE9IFBvc2l0aW9uVHlwZTo6QWJzb2x1dGUg
JiYgc3R5bGUucG9zaXRpb24oKSAhPSBQb3NpdGlvblR5cGU6OkZpeGVkICYmIGlzSW5Ub3BMYXll
cikKKyAgICAgICAgICAgIHN0eWxlLnNldFBvc2l0aW9uKFBvc2l0aW9uVHlwZTo6QWJzb2x1dGUp
OworCiAgICAgICAgIC8vIEFic29sdXRlL2ZpeGVkIHBvc2l0aW9uZWQgZWxlbWVudHMsIGZsb2F0
aW5nIGVsZW1lbnRzIGFuZCB0aGUgZG9jdW1lbnQgZWxlbWVudCBuZWVkIGJsb2NrLWxpa2Ugb3V0
c2lkZSBkaXNwbGF5LgogICAgICAgICBpZiAoc3R5bGUuaGFzT3V0T2ZGbG93UG9zaXRpb24oKSB8
fCBzdHlsZS5pc0Zsb2F0aW5nKCkgfHwgKG1fZWxlbWVudCAmJiBtX2RvY3VtZW50LmRvY3VtZW50
RWxlbWVudCgpID09IG1fZWxlbWVudCkpCiAgICAgICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVE
aXNwbGF5KGVxdWl2YWxlbnRCbG9ja0Rpc3BsYXkoc3R5bGUsIG1fZG9jdW1lbnQpKTsKQEAgLTU2
OCwxOCArNTc0LDE4IEBAIHN0YXRpYyBib29sIGhhc0VmZmVjdGl2ZURpc3BsYXlOb25lRm9yRGlz
cGxheUNvbnRlbnRzKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpCiAKIHZvaWQgQWRqdXN0ZXI6OmFk
anVzdERpc3BsYXlDb250ZW50c1N0eWxlKFJlbmRlclN0eWxlJiBzdHlsZSkgY29uc3QKIHsKLSAg
ICBpZiAoIW1fZWxlbWVudCkgewotICAgICAgICBpZiAoc3R5bGUuc3R5bGVUeXBlKCkgIT0gUHNl
dWRvSWQ6OkJlZm9yZSAmJiBzdHlsZS5zdHlsZVR5cGUoKSAhPSBQc2V1ZG9JZDo6QWZ0ZXIpCi0g
ICAgICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpOb25lKTsK
KyAgICBib29sIGlzSW5Ub3BMYXllciA9IHN0eWxlLnN0eWxlVHlwZSgpID09IFBzZXVkb0lkOjpC
YWNrZHJvcCB8fCAobV9lbGVtZW50ICYmIG1fZWxlbWVudC0+aXNJblRvcExheWVyKCkpOworICAg
IGlmIChpc0luVG9wTGF5ZXIgfHwgbV9kb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKSA9PSBtX2Vs
ZW1lbnQpIHsKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6
QmxvY2spOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKG1fZG9jdW1lbnQuZG9j
dW1lbnRFbGVtZW50KCkgPT0gbV9lbGVtZW50KSB7Ci0gICAgICAgIHN0eWxlLnNldEVmZmVjdGl2
ZURpc3BsYXkoRGlzcGxheVR5cGU6OkJsb2NrKTsKKyAgICBpZiAoIW1fZWxlbWVudCAmJiBzdHls
ZS5zdHlsZVR5cGUoKSAhPSBQc2V1ZG9JZDo6QmVmb3JlICYmIHN0eWxlLnN0eWxlVHlwZSgpICE9
IFBzZXVkb0lkOjpBZnRlcikgeworICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERp
c3BsYXlUeXBlOjpOb25lKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChoYXNF
ZmZlY3RpdmVEaXNwbGF5Tm9uZUZvckRpc3BsYXlDb250ZW50cygqbV9lbGVtZW50KSkKKyAgICBp
ZiAobV9lbGVtZW50ICYmIGhhc0VmZmVjdGl2ZURpc3BsYXlOb25lRm9yRGlzcGxheUNvbnRlbnRz
KCptX2VsZW1lbnQpKQogICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlU
eXBlOjpOb25lKTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDI2NmFjOTZlODVjNzE2ZDAyYWRjMjVmNzZhYmJmMWVj
M2NkODJlOTkuLmEzZDhjNGNlN2E5ZWMwM2EyZDYzNWY3ZDIzMmI4MzJiNzY1MjlkMWYgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxOCBAQAorMjAyMS0wOC0xMyAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29t
PgorCisgICAgICAgIFRvcCBsYXllcjogaGFuZGxlIGRpc3BsYXk6IGNvbnRlbnRzIGFuZCBub24g
b3V0LW9mLWZsb3cgcG9zaXRpb24gdmFsdWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkwOTMKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBG
cmFzZXIuCisKKyAgICAgICAgRnJvbTogaHR0cHM6Ly9mdWxsc2NyZWVuLnNwZWMud2hhdHdnLm9y
Zy8jbmV3LXN0YWNraW5nLWxheWVyCisgICAgICAgIElmIGl0cyBzcGVjaWZpZWQgZGlzcGxheSBw
cm9wZXJ0eSBpcyBjb250ZW50cywgaXQgY29tcHV0ZXMgdG8gYmxvY2suCisgICAgICAgIElmIGl0
cyBzcGVjaWZpZWQgcG9zaXRpb24gcHJvcGVydHkgaXMgbm90IGFic29sdXRlIG9yIGZpeGVkLCBp
dCBjb21wdXRlcyB0byBhYnNvbHV0ZS4KKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1k
aWFsb2ctZWxlbWVudC9tb2RhbC1kaWFsb2ctZGlzcGxheS1jb250ZW50cy5odG1sCisKKyAgICAg
ICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA4LTE5ICBUaW0gTmd1eWVuICA8bnRpbUBh
cHBsZS5jb20+CiAKICAgICAgICAgUmUtaW1wb3J0IGh0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZl
LWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudCBXUFQgLSBBdWd1c3QgMTl0aCAyMDIxCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucwppbmRleCBiMGE4NjY3YmY2NjdjZDk3OTU1YTVhYTQ1MzZiNmI5MzBhY2ViNGFh
Li5hODc4YTYyNzQzNjEzNWIzMDA4ZDUxNTg0OTBmZWRhYTI1NjFmZjA5IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKQEAgLTIzNzQsOSArMjM3NCw3IEBAIGltcG9ydGVkL2JsaW5rL2Zhc3QvbXVsdGljb2wv
b3V0bGluZXMtYXQtY29sdW1uLWJvdW5kYXJpZXMuaHRtbCBbIEltYWdlT25seUZhaWx1CiBmYXN0
L211bHRpY29sL211bHRpY29sLXdpdGgtY2hpbGQtcmVuZGVyTGF5ZXItZm9yLWlucHV0Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogIyBUb3AgbGF5ZXIgdGVzdHMKLXdlYmtpdC5vcmcvYi84
NDc5NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVy
YWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9iYWNrZHJvcC1pbi1mbG93Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi84NDc5NiBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1k
aWFsb2ctZWxlbWVudC9iYWNrZHJvcC1zdGFja2luZy1vcmRlci5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCi13ZWJraXQub3JnL2IvODQ3OTYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQv
ZG9udC1zaGFyZS1zdHlsZS10by10b3AtbGF5ZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzg0Nzk2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9z
ZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L21vZGFsLWRp
YWxvZy1pbi1yZXBsYWNlZC1yZW5kZXJlci5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvODQ3OTYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFu
dGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQvbW9kYWwtZGlhbG9n
LWluLXRhYmxlLWNvbHVtbi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
ODQ3OTYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRl
cmFjdGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQvcmVtb3ZlZC1lbGVtZW50LWlzLXJl
bW92ZWQtZnJvbS10b3AtbGF5ZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtMjM4NSw3
ICsyMzgzLDYgQEAgd2Via2l0Lm9yZy9iLzg0Nzk2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWwKIHdlYmtpdC5vcmcvYi84NDc5NiBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZl
LWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC90b3AtbGF5ZXItc3RhY2tpbmctY29ycmVjdC1v
cmRlci1yZW1vdmUtcmVhZGQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
Lzg0Nzk2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50
ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L3RvcC1sYXllci1zdGFja2luZy1k
eW5hbWljLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi84NDc5NiBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVs
ZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC90b3AtbGF5ZXItc3RhY2tpbmcuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyOTA5MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ct
ZWxlbWVudC9tb2RhbC1kaWFsb2ctZGlzcGxheS1jb250ZW50cy5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiAKICMgaW5lcnQgc3VidHJlZXMKIHdlYmtpdC5vcmcvYi8xMTA5NTIgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50
cy90aGUtZGlhbG9nLWVsZW1lbnQvaW5lcnQtbm9kZS1pcy1ub3QtaGlnaGxpZ2h0ZWQuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>