<?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>235175</bug_id>
          
          <creation_ts>2022-01-13 01:20:43 -0800</creation_ts>
          <short_desc>[css-contain] Fix contain-size-replaced-002.html</short_desc>
          <delta_ts>2022-01-15 09:23:18 -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 name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>changseok</cc>
    
    <cc>dino</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fmalita</cc>
    
    <cc>glenn</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>rego</cc>
    
    <cc>sabouhallawa</cc>
    
    <cc>schenney</cc>
    
    <cc>sergio</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zimmermann</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1830488</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-13 01:20:43 -0800</bug_when>
    <thetext>Fix contain-size-replaced-002.html.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830489</commentid>
    <comment_count>1</comment_count>
      <attachid>449034</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-13 01:22:15 -0800</bug_when>
    <thetext>Created attachment 449034
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830540</commentid>
    <comment_count>2</comment_count>
      <attachid>449057</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-13 07:31:18 -0800</bug_when>
    <thetext>Created attachment 449057
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830842</commentid>
    <comment_count>3</comment_count>
      <attachid>449057</attachid>
    <who name="Nikolas Zimmermann">zimmermann</who>
    <bug_when>2022-01-14 01:41:07 -0800</bug_when>
    <thetext>Comment on attachment 449057
Patch

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

Unofficial review :-)

&gt; Source/WebCore/rendering/svg/LegacyRenderSVGRoot.cpp:268
&gt; +    if (clipViewport &amp;&amp; (contentWidth() == LayoutUnit() || contentHeight() == LayoutUnit()))

While a decent compiler won&apos;t create LayoutUnit temporaries over and over, this is still hard to read.

One could either make use of LayoutUnits operator bool() -- however since it&apos;s marked explicit, this is also awkward:
if (clipViewport &amp;&amp; (!bool(contentWidth()) || !bool(contentHeight())))

Therefore I&apos;d avoid using contentWidth()/contentHeight() and instead query &apos;LayoutSize contentSize()&apos;, which encapsulates the logic you&apos;re looking for in the &quot;isEmpty&quot; function:
if (clipViewport &amp;&amp; contentSize().isEmpty())</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830849</commentid>
    <comment_count>4</comment_count>
      <attachid>449151</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-14 02:23:03 -0800</bug_when>
    <thetext>Created attachment 449151
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830850</commentid>
    <comment_count>5</comment_count>
      <attachid>449057</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-14 02:24:25 -0800</bug_when>
    <thetext>Comment on attachment 449057
Patch

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

&gt;&gt; Source/WebCore/rendering/svg/LegacyRenderSVGRoot.cpp:268
&gt;&gt; +    if (clipViewport &amp;&amp; (contentWidth() == LayoutUnit() || contentHeight() == LayoutUnit()))
&gt; 
&gt; While a decent compiler won&apos;t create LayoutUnit temporaries over and over, this is still hard to read.
&gt; 
&gt; One could either make use of LayoutUnits operator bool() -- however since it&apos;s marked explicit, this is also awkward:
&gt; if (clipViewport &amp;&amp; (!bool(contentWidth()) || !bool(contentHeight())))
&gt; 
&gt; Therefore I&apos;d avoid using contentWidth()/contentHeight() and instead query &apos;LayoutSize contentSize()&apos;, which encapsulates the logic you&apos;re looking for in the &quot;isEmpty&quot; function:
&gt; if (clipViewport &amp;&amp; contentSize().isEmpty())

That is much better, thanks! I updated the patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830857</commentid>
    <comment_count>6</comment_count>
    <who name="Nikolas Zimmermann">zimmermann</who>
    <bug_when>2022-01-14 02:57:15 -0800</bug_when>
    <thetext>Looks great, unofficial r=me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830858</commentid>
    <comment_count>7</comment_count>
      <attachid>449151</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2022-01-14 03:11:56 -0800</bug_when>
    <thetext>Comment on attachment 449151
Patch

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

r=me

&gt; Source/WebCore/rendering/svg/LegacyRenderSVGRoot.cpp:269
&gt; +    if (clipViewport &amp;&amp; contentSize().isEmpty())
&gt; +        return;

One question, should we move this up on the method, to avoid doing other checks that might not be needed?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830860</commentid>
    <comment_count>8</comment_count>
      <attachid>449156</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-14 03:19:30 -0800</bug_when>
    <thetext>Created attachment 449156
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830861</commentid>
    <comment_count>9</comment_count>
      <attachid>449151</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-14 03:20:36 -0800</bug_when>
    <thetext>Comment on attachment 449151
Patch

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

&gt;&gt; Source/WebCore/rendering/svg/LegacyRenderSVGRoot.cpp:269
&gt;&gt; +        return;
&gt; 
&gt; One question, should we move this up on the method, to avoid doing other checks that might not be needed?

Good comment, I think the position is okay, but I made a change regarding addRelevantRepaintedObject that I will run by Niko. Thanks for the review.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830893</commentid>
    <comment_count>10</comment_count>
      <attachid>449156</attachid>
    <who name="Nikolas Zimmermann">zimmermann</who>
    <bug_when>2022-01-14 06:16:45 -0800</bug_when>
    <thetext>Comment on attachment 449156
Patch

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

&gt; Source/WebCore/rendering/svg/LegacyRenderSVGRoot.cpp:-259
&gt; -                page().addRelevantUnpaintedObject(this, visualOverflowRect());

You&apos;re no longer keeping track of relevant _unpainted_ objects?
Apparently we lack test coverage for this, nothing turned red :-)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830895</commentid>
    <comment_count>11</comment_count>
      <attachid>449156</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-14 06:18:56 -0800</bug_when>
    <thetext>Comment on attachment 449156
Patch

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

&gt;&gt; Source/WebCore/rendering/svg/LegacyRenderSVGRoot.cpp:-259
&gt;&gt; -                page().addRelevantUnpaintedObject(this, visualOverflowRect());
&gt; 
&gt; You&apos;re no longer keeping track of relevant _unpainted_ objects?
&gt; Apparently we lack test coverage for this, nothing turned red :-)

Yeah, misread the code!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830896</commentid>
    <comment_count>12</comment_count>
    <who name="Nikolas Zimmermann">zimmermann</who>
    <bug_when>2022-01-14 06:26:27 -0800</bug_when>
    <thetext>(In reply to Rob Buis from comment #9)
&gt; Comment on attachment 449151 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=449151&amp;action=review
&gt; 
&gt; &gt;&gt; Source/WebCore/rendering/svg/LegacyRenderSVGRoot.cpp:269
&gt; &gt;&gt; +        return;
&gt; &gt; 
&gt; &gt; One question, should we move this up on the method, to avoid doing other checks that might not be needed?
&gt; 
&gt; Good comment, I think the position is okay, but I made a change regarding
&gt; addRelevantRepaintedObject that I will run by Niko. Thanks for the review.

Hmm, it depends. Apparently addRelevantRepaintedObject/UnpaintedObject is not covered by tests that the bots run at least.

Robs new condition (when viewport is clipped and either width or height are empty, bail out) is preceded by:

    if (paintInfo.phase == PaintPhase::Foreground)
        page().addRelevantRepaintedObject(this, visualOverflowRect());

In LBSE I can immediately answer what the visualOverflowRect() looks like for a SVG renderer in general. However for LegacyRenderSVGRoot and the whole legacy SVG engine we always used to have the problem that we are not exactly sure of the different coordinate systems: visualOverflowRect() is different to SVG objectBoundingBox for instance, defined related to the &apos;border box rect&apos; in CSS terms. So what does that mean for SVG? Hard to answer for the legacy SVG engine, needs to be checked case-by-case.

Therefore I&apos;m not sure: if there is an empty contentSize, why bother claiming that the LegacyRenderSVGRoot is a &apos;relevant repainted object&apos; -- it&apos;s not. The visualOverflowRect() should have either empty width or height, just like the contentSize, no?

At least one should printf() the visualOverflowRect / contentSize for a few cases, to understand this better. Rego is probably right, that we should move the contentSize().isEmpty() check at least above the addRelevantRepaintedObject() section.

Who knows more about addRelevantRepaintedObject()?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830898</commentid>
    <comment_count>13</comment_count>
      <attachid>449168</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-14 06:44:48 -0800</bug_when>
    <thetext>Created attachment 449168
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830967</commentid>
    <comment_count>14</comment_count>
      <attachid>449185</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-14 10:46:18 -0800</bug_when>
    <thetext>Created attachment 449185
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831192</commentid>
    <comment_count>15</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-01-15 06:47:45 -0800</bug_when>
    <thetext>ChangeLog entry in LayoutTests/ChangeLog contains OOPS!.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831196</commentid>
    <comment_count>16</comment_count>
      <attachid>449253</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-15 08:10:41 -0800</bug_when>
    <thetext>Created attachment 449253
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831199</commentid>
    <comment_count>17</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-01-15 09:22:48 -0800</bug_when>
    <thetext>Committed r288057 (246077@main): &lt;https://commits.webkit.org/246077@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 449253.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1831200</commentid>
    <comment_count>18</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-01-15 09:23:18 -0800</bug_when>
    <thetext>&lt;rdar://problem/87639203&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449034</attachid>
            <date>2022-01-13 01:22:15 -0800</date>
            <delta_ts>2022-01-13 07:31:13 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235175-20220113092214.patch</filename>
            <type>text/plain</type>
            <size>3399</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODZmZTRjYTE2MGIyZGJl
ZjAwZDI2M2FhZjA2ODc5MTVhNGZlYmI5OC4uZDRkNGRlYTkyOGFjMDRhMWMzYmU3NDVlODIyMWMw
YWU4MzcyNGE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAxLTEzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jb250YWluXSBGaXggY29u
dGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL0xlZ2Fj
eVJlbmRlclNWR1Jvb3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5UmVuZGVyU1ZHUm9v
dDo6cGFpbnRSZXBsYWNlZCk6CisKIDIwMjItMDEtMTIgIEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5n
QGlnYWxpYS5jb20+CiAKICAgICAgICAgUHJvdGVjdCBEb2N1bWVudExvYWRlciB3aGVuIGEgcmVm
ZXJlbmNlIHRvIGl0cyBtZW1iZXJzIGlzIHVzZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL3N2Zy9MZWdhY3lSZW5kZXJTVkdSb290LmNwcAppbmRleCA0NzQ2N2Y3ODM4MDY0
YjFkNGI4NTViYjkxZWExYWQ0ZGQ5Yzk2MTdlLi5lOWFlZjgyMTZkZDk2ODJiZTc4OWZkNzRiNzhl
NmJkYmZkMzQ3OGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL0xl
Z2FjeVJlbmRlclNWR1Jvb3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv
TGVnYWN5UmVuZGVyU1ZHUm9vdC5jcHAKQEAgLTI2NCwxMiArMjY0LDE2IEBAIHZvaWQgTGVnYWN5
UmVuZGVyU1ZHUm9vdDo6cGFpbnRSZXBsYWNlZChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3Qg
TGF5b3V0UG9pbnQmCiAgICAgaWYgKHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlOjpGb3Jl
Z3JvdW5kKQogICAgICAgICBwYWdlKCkuYWRkUmVsZXZhbnRSZXBhaW50ZWRPYmplY3QodGhpcywg
dmlzdWFsT3ZlcmZsb3dSZWN0KCkpOwogCisgICAgYm9vbCBjbGlwVmlld3BvcnQgPSBzaG91bGRB
cHBseVZpZXdwb3J0Q2xpcCgpOworICAgIGlmIChjbGlwVmlld3BvcnQgJiYgKGNvbnRlbnRXaWR0
aCgpID09IExheW91dFVuaXQoKSB8fCBjb250ZW50SGVpZ2h0KCkgPT0gTGF5b3V0VW5pdCgpKSkK
KyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gTWFrZSBhIGNvcHkgb2YgdGhlIFBhaW50SW5mbyBi
ZWNhdXNlIGFwcGx5VHJhbnNmb3JtIHdpbGwgbW9kaWZ5IHRoZSBkYW1hZ2UgcmVjdC4KICAgICBQ
YWludEluZm8gY2hpbGRQYWludEluZm8ocGFpbnRJbmZvKTsKICAgICBjaGlsZFBhaW50SW5mby5j
b250ZXh0KCkuc2F2ZSgpOwogCiAgICAgLy8gQXBwbHkgaW5pdGlhbCB2aWV3cG9ydCBjbGlwCi0g
ICAgaWYgKHNob3VsZEFwcGx5Vmlld3BvcnRDbGlwKCkpCisgICAgaWYgKGNsaXBWaWV3cG9ydCkK
ICAgICAgICAgY2hpbGRQYWludEluZm8uY29udGV4dCgpLmNsaXAoc25hcHBlZEludFJlY3Qob3Zl
cmZsb3dDbGlwUmVjdChwYWludE9mZnNldCkpKTsKIAogICAgIC8vIENvbnZlcnQgZnJvbSBjb250
YWluZXIgb2Zmc2V0cyAoaHRtbCByZW5kZXJlcnMpIHRvIGEgcmVsYXRpdmUgdHJhbnNmb3JtIChz
dmcgcmVuZGVyZXJzKS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2MDc4YTdmNjNkZWNlMDE5MjkxZTczOTYwOWE3ZDQyNzg4
ODNkY2IzLi44ZjY0NGI1YTJlMjQzOGI0YTVkOWI4NWNiODNjZjFkZWNjZmY2MDY0IDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMTIgQEAKKzIwMjItMDEtMTMgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4K
KworICAgICAgICBbY3NzLWNvbnRhaW5dIEZpeCBjb250YWluLXNpemUtcmVwbGFjZWQtMDAyLmh0
bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTE3
NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVz
dEV4cGVjdGF0aW9uczoKKwogMjAyMi0wMS0xMSAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFw
cGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nlc3NdIE1ha2UgU1ZHIHJlc291cmNlcyBjcmVh
dGUgcmVtb3RlIEltYWdlQnVmZmVycyBmb3IgdGhlaXIgZHJhd2luZwpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK
aW5kZXggYTNjYWMwZmQ1MTdjMjU4OWE4ZGQzZDkwMTQyNjA2MjBiN2FkYzE2My4uOGUzYzJhNjYx
YjE3MWE5NWFiNTJiMGUyMTc4YjUxNTZlYWRlM2Y2ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00
ODAyLDkgKzQ4MDIsNiBAQCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
Y29udGFpbi9jb250ZW50LXZpc2liaWxpdHkvYW5pbWF0aW9uLWRpcwogIyBDYW52YXMgZG9lc24n
dCBnZXQgZGVmYXVsdCBhc3BlY3QtcmF0aW8gZm9yIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRl
cy4KIHdlYmtpdC5vcmcvYi8yMTc1MjkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWZsZXhib3gvY2FudmFzLWNvbnRhaW4tc2l6ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiAKLSMgQ29udGVudCBpcyBwYWludGVkIG9uIHN2ZydzIHBhZGRpbmcgYXJlYS4KLXdlYmtp
dC5vcmcvYi80MjU4NjggaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNv
bnRhaW4vY29udGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci0KICMgTXVsdGljb2x1bW4gZG9lcyBub3QgcGFpbnQgdGhlIGhvcml6b250YWwgb3ZlcmZsb3cg
YXJlYSBvZiBhIHJlbGF0aXZlIGNoaWxkLgogd2Via2l0Lm9yZy9iLzQxNzk2IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW4tc2l6ZS1tb25vbGl0
aGljLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449057</attachid>
            <date>2022-01-13 07:31:18 -0800</date>
            <delta_ts>2022-01-14 02:22:58 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235175-20220113153117.patch</filename>
            <type>text/plain</type>
            <size>3606</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODZmZTRjYTE2MGIyZGJl
ZjAwZDI2M2FhZjA2ODc5MTVhNGZlYmI5OC4uYjJlMzhjMjZhNWJiNGNkODc1YzYyMDczN2YzNjNm
MDkwZWQyMDQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAxLTEzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jb250YWluXSBGaXggY29u
dGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBJZiB0aGUgU1ZHIHJvb3QgaGFzIHplcm8gY29udGVudCB3aWR0
aCBhbmQvb3IgaGVpZ2h0LCB0aGVyZSBpcyBubyBwb2ludAorICAgICAgICBpbiBwYWludGluZyB0
aGUgY2hpbGRyZW4gY29udGVudHMuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXplLXJlcGxhY2VkLTAwMi5o
dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGVnYWN5UmVuZGVyU1ZHUm9vdDo6cGFpbnRSZXBsYWNlZCk6CisK
IDIwMjItMDEtMTIgIEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgUHJvdGVjdCBEb2N1bWVudExvYWRlciB3aGVuIGEgcmVmZXJlbmNlIHRvIGl0cyBtZW1iZXJz
IGlzIHVzZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL0xlZ2Fj
eVJlbmRlclNWR1Jvb3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9MZWdhY3lS
ZW5kZXJTVkdSb290LmNwcAppbmRleCA0NzQ2N2Y3ODM4MDY0YjFkNGI4NTViYjkxZWExYWQ0ZGQ5
Yzk2MTdlLi5lOWFlZjgyMTZkZDk2ODJiZTc4OWZkNzRiNzhlNmJkYmZkMzQ3OGJhIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9vdC5j
cHAKQEAgLTI2NCwxMiArMjY0LDE2IEBAIHZvaWQgTGVnYWN5UmVuZGVyU1ZHUm9vdDo6cGFpbnRS
ZXBsYWNlZChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmCiAgICAgaWYg
KHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlOjpGb3JlZ3JvdW5kKQogICAgICAgICBwYWdl
KCkuYWRkUmVsZXZhbnRSZXBhaW50ZWRPYmplY3QodGhpcywgdmlzdWFsT3ZlcmZsb3dSZWN0KCkp
OwogCisgICAgYm9vbCBjbGlwVmlld3BvcnQgPSBzaG91bGRBcHBseVZpZXdwb3J0Q2xpcCgpOwor
ICAgIGlmIChjbGlwVmlld3BvcnQgJiYgKGNvbnRlbnRXaWR0aCgpID09IExheW91dFVuaXQoKSB8
fCBjb250ZW50SGVpZ2h0KCkgPT0gTGF5b3V0VW5pdCgpKSkKKyAgICAgICAgcmV0dXJuOworCiAg
ICAgLy8gTWFrZSBhIGNvcHkgb2YgdGhlIFBhaW50SW5mbyBiZWNhdXNlIGFwcGx5VHJhbnNmb3Jt
IHdpbGwgbW9kaWZ5IHRoZSBkYW1hZ2UgcmVjdC4KICAgICBQYWludEluZm8gY2hpbGRQYWludElu
Zm8ocGFpbnRJbmZvKTsKICAgICBjaGlsZFBhaW50SW5mby5jb250ZXh0KCkuc2F2ZSgpOwogCiAg
ICAgLy8gQXBwbHkgaW5pdGlhbCB2aWV3cG9ydCBjbGlwCi0gICAgaWYgKHNob3VsZEFwcGx5Vmll
d3BvcnRDbGlwKCkpCisgICAgaWYgKGNsaXBWaWV3cG9ydCkKICAgICAgICAgY2hpbGRQYWludElu
Zm8uY29udGV4dCgpLmNsaXAoc25hcHBlZEludFJlY3Qob3ZlcmZsb3dDbGlwUmVjdChwYWludE9m
ZnNldCkpKTsKIAogICAgIC8vIENvbnZlcnQgZnJvbSBjb250YWluZXIgb2Zmc2V0cyAoaHRtbCBy
ZW5kZXJlcnMpIHRvIGEgcmVsYXRpdmUgdHJhbnNmb3JtIChzdmcgcmVuZGVyZXJzKS4KZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl
eCA2MDc4YTdmNjNkZWNlMDE5MjkxZTczOTYwOWE3ZDQyNzg4ODNkY2IzLi44ZjY0NGI1YTJlMjQz
OGI0YTVkOWI4NWNiODNjZjFkZWNjZmY2MDY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjIt
MDEtMTMgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWNvbnRh
aW5dIEZpeCBjb250YWluLXNpemUtcmVwbGFjZWQtMDAyLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTE3NQorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAy
Mi0wMS0xMSAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBb
R1BVIFByb2Nlc3NdIE1ha2UgU1ZHIHJlc291cmNlcyBjcmVhdGUgcmVtb3RlIEltYWdlQnVmZmVy
cyBmb3IgdGhlaXIgZHJhd2luZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYTNjYWMwZmQ1MTdjMjU4
OWE4ZGQzZDkwMTQyNjA2MjBiN2FkYzE2My4uOGUzYzJhNjYxYjE3MWE5NWFiNTJiMGUyMTc4YjUx
NTZlYWRlM2Y2ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00ODAyLDkgKzQ4MDIsNiBAQCBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250ZW50LXZpc2li
aWxpdHkvYW5pbWF0aW9uLWRpcwogIyBDYW52YXMgZG9lc24ndCBnZXQgZGVmYXVsdCBhc3BlY3Qt
cmF0aW8gZm9yIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRlcy4KIHdlYmtpdC5vcmcvYi8yMTc1
MjkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvY2FudmFz
LWNvbnRhaW4tc2l6ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKLSMgQ29udGVudCBpcyBw
YWludGVkIG9uIHN2ZydzIHBhZGRpbmcgYXJlYS4KLXdlYmtpdC5vcmcvYi80MjU4NjggaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXplLXJl
cGxhY2VkLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi0KICMgTXVsdGljb2x1bW4gZG9l
cyBub3QgcGFpbnQgdGhlIGhvcml6b250YWwgb3ZlcmZsb3cgYXJlYSBvZiBhIHJlbGF0aXZlIGNo
aWxkLgogd2Via2l0Lm9yZy9iLzQxNzk2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1jb250YWluL2NvbnRhaW4tc2l6ZS1tb25vbGl0aGljLTAwMi5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449151</attachid>
            <date>2022-01-14 02:23:03 -0800</date>
            <delta_ts>2022-01-14 03:19:25 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235175-20220114102302.patch</filename>
            <type>text/plain</type>
            <size>3495</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVjOTJmYmVjYmEzYWMw
ZWE3ZjY2N2UwNjRhOTE0ZWQzMzhkMmE2Yi4uOWE1NGUwMjMzNzE3YTc5NDhkMzJmYTY0NjY2Mjc4
ZWQ3MjM4ZmI0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAxLTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jb250YWluXSBGaXggY29u
dGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBJZiB0aGUgU1ZHIHJvb3QgaGFzIHplcm8gY29udGVudCB3aWR0
aCBhbmQvb3IgaGVpZ2h0LCB0aGVyZSBpcyBubyBwb2ludAorICAgICAgICBpbiBwYWludGluZyB0
aGUgY2hpbGRyZW4gY29udGVudHMuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXplLXJlcGxhY2VkLTAwMi5o
dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGVnYWN5UmVuZGVyU1ZHUm9vdDo6cGFpbnRSZXBsYWNlZCk6CisK
IDIwMjItMDEtMTQgIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQGlnYWxpYS5jb20+
CiAKICAgICAgICAgW0xCU0VdIEludHJvZHVjZSBTVkdDb250YWluZXJMYXlvdXQKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9vdC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwCmlu
ZGV4IDQ3NDY3Zjc4MzgwNjRiMWQ0Yjg1NWJiOTFlYTFhZDRkZDljOTYxN2UuLjI3YjgyYjA5NTY3
NTQ5OTdmMmQ3Y2UwZGI5NmUwMDc5MzQxYzRjYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9vdC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL3N2Zy9MZWdhY3lSZW5kZXJTVkdSb290LmNwcApAQCAtMjY0LDEyICsyNjQs
MTYgQEAgdm9pZCBMZWdhY3lSZW5kZXJTVkdSb290OjpwYWludFJlcGxhY2VkKFBhaW50SW5mbyYg
cGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYKICAgICBpZiAocGFpbnRJbmZvLnBoYXNlID09
IFBhaW50UGhhc2U6OkZvcmVncm91bmQpCiAgICAgICAgIHBhZ2UoKS5hZGRSZWxldmFudFJlcGFp
bnRlZE9iamVjdCh0aGlzLCB2aXN1YWxPdmVyZmxvd1JlY3QoKSk7CiAKKyAgICBib29sIGNsaXBW
aWV3cG9ydCA9IHNob3VsZEFwcGx5Vmlld3BvcnRDbGlwKCk7CisgICAgaWYgKGNsaXBWaWV3cG9y
dCAmJiBjb250ZW50U2l6ZSgpLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8g
TWFrZSBhIGNvcHkgb2YgdGhlIFBhaW50SW5mbyBiZWNhdXNlIGFwcGx5VHJhbnNmb3JtIHdpbGwg
bW9kaWZ5IHRoZSBkYW1hZ2UgcmVjdC4KICAgICBQYWludEluZm8gY2hpbGRQYWludEluZm8ocGFp
bnRJbmZvKTsKICAgICBjaGlsZFBhaW50SW5mby5jb250ZXh0KCkuc2F2ZSgpOwogCiAgICAgLy8g
QXBwbHkgaW5pdGlhbCB2aWV3cG9ydCBjbGlwCi0gICAgaWYgKHNob3VsZEFwcGx5Vmlld3BvcnRD
bGlwKCkpCisgICAgaWYgKGNsaXBWaWV3cG9ydCkKICAgICAgICAgY2hpbGRQYWludEluZm8uY29u
dGV4dCgpLmNsaXAoc25hcHBlZEludFJlY3Qob3ZlcmZsb3dDbGlwUmVjdChwYWludE9mZnNldCkp
KTsKIAogICAgIC8vIENvbnZlcnQgZnJvbSBjb250YWluZXIgb2Zmc2V0cyAoaHRtbCByZW5kZXJl
cnMpIHRvIGEgcmVsYXRpdmUgdHJhbnNmb3JtIChzdmcgcmVuZGVyZXJzKS4KZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4MWRj
ZTc2M2UwYmI1N2Y2MmU3MTVkODg4YWMyZjcxYTA3MDAxYzc3Li5jMzIxZWNmZjUzZGQ2ZTE1Mjg1
ZTFlZWFjNTBjYWE4NjFlMWM0ZTlmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjItMDEtMTQg
IFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWNvbnRhaW5dIEZp
eCBjb250YWluLXNpemUtcmVwbGFjZWQtMDAyLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTE3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMi0wMS0x
MyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBVcGRhdGUg
V1BUIGZvciBjc3MvY3NzLXBzZXVkbwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVj
dGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggM2RjYzM5MTJjNmQy
NjIwYzFmZjlmNjUxYTkxM2ZkOGI1NjU0NWM3MC4uOTRjOTQ0ZDk0NzhhZTE2ZThlYjA4MzFmODFk
YzUwMWJmNzE1ZTFhMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwor
KysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00ODE4LDkgKzQ4MTgsNiBAQCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250ZW50LXZp
c2liaWxpdHkvYW5pbWF0aW9uLWRpcwogIyBDYW52YXMgZG9lc24ndCBnZXQgZGVmYXVsdCBhc3Bl
Y3QtcmF0aW8gZm9yIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRlcy4KIHdlYmtpdC5vcmcvYi8y
MTc1MjkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvY2Fu
dmFzLWNvbnRhaW4tc2l6ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKLSMgQ29udGVudCBp
cyBwYWludGVkIG9uIHN2ZydzIHBhZGRpbmcgYXJlYS4KLXdlYmtpdC5vcmcvYi80MjU4NjggaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXpl
LXJlcGxhY2VkLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi0KICMgTXVsdGljb2x1bW4g
ZG9lcyBub3QgcGFpbnQgdGhlIGhvcml6b250YWwgb3ZlcmZsb3cgYXJlYSBvZiBhIHJlbGF0aXZl
IGNoaWxkLgogd2Via2l0Lm9yZy9iLzQxNzk2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW4tc2l6ZS1tb25vbGl0aGljLTAwMi5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449156</attachid>
            <date>2022-01-14 03:19:30 -0800</date>
            <delta_ts>2022-01-14 06:44:42 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235175-20220114111929.patch</filename>
            <type>text/plain</type>
            <size>4141</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVjOTJmYmVjYmEzYWMw
ZWE3ZjY2N2UwNjRhOTE0ZWQzMzhkMmE2Yi4uMDIxYzhhODBlZWU2MjMwOTA3NWY2OWRhZjlmNmVj
MGJkMDU1YjIyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAxLTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jb250YWluXSBGaXggY29u
dGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBNYW51ZWwg
UmVnbyBDYXNhc25vdmFzLgorCisgICAgICAgIElmIHRoZSBTVkcgcm9vdCBoYXMgemVybyBjb250
ZW50IHdpZHRoIGFuZC9vciBoZWlnaHQsIHRoZXJlIGlzIG5vIHBvaW50CisgICAgICAgIGluIHBh
aW50aW5nIHRoZSBjaGlsZHJlbiBjb250ZW50cy4KKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluLXNpemUtcmVwbGFj
ZWQtMDAyLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9v
dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lSZW5kZXJTVkdSb290OjpwYWludFJlcGxh
Y2VkKToKKwogMjAyMi0wMS0xNCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AaWdh
bGlhLmNvbT4KIAogICAgICAgICBbTEJTRV0gSW50cm9kdWNlIFNWR0NvbnRhaW5lckxheW91dApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9MZWdhY3lSZW5kZXJTVkdS
b290LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9v
dC5jcHAKaW5kZXggNDc0NjdmNzgzODA2NGIxZDRiODU1YmI5MWVhMWFkNGRkOWM5NjE3ZS4uYmZi
NmZhZjE0ZjE3Y2ViM2RmYzQ1OGU2ZDE3YjliNTY0MzJkZGI1NSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9MZWdhY3lSZW5kZXJTVkdSb290LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwCkBAIC0yNTEs
MjUgKzI1MSwyNiBAQCB2b2lkIExlZ2FjeVJlbmRlclNWR1Jvb3Q6OnBhaW50UmVwbGFjZWQoUGFp
bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JgogICAgICAgICByZXR1cm47CiAg
ICAgfQogCisgICAgaWYgKHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlOjpGb3JlZ3JvdW5k
KQorICAgICAgICBwYWdlKCkuYWRkUmVsZXZhbnRSZXBhaW50ZWRPYmplY3QodGhpcywgdmlzdWFs
T3ZlcmZsb3dSZWN0KCkpOworCiAgICAgLy8gRG9uJ3QgcGFpbnQgaWYgd2UgZG9uJ3QgaGF2ZSBr
aWRzLCBleGNlcHQgaWYgd2UgaGF2ZSBmaWx0ZXJzIHdlIHNob3VsZCBwYWludCB0aG9zZS4KICAg
ICBpZiAoIWZpcnN0Q2hpbGQoKSkgewogICAgICAgICBhdXRvKiByZXNvdXJjZXMgPSBTVkdSZXNv
dXJjZXNDYWNoZTo6Y2FjaGVkUmVzb3VyY2VzRm9yUmVuZGVyZXIoKnRoaXMpOwotICAgICAgICBp
ZiAoIXJlc291cmNlcyB8fCAhcmVzb3VyY2VzLT5maWx0ZXIoKSkgewotICAgICAgICAgICAgaWYg
KHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlOjpGb3JlZ3JvdW5kKQotICAgICAgICAgICAg
ICAgIHBhZ2UoKS5hZGRSZWxldmFudFVucGFpbnRlZE9iamVjdCh0aGlzLCB2aXN1YWxPdmVyZmxv
d1JlY3QoKSk7CisgICAgICAgIGlmICghcmVzb3VyY2VzIHx8ICFyZXNvdXJjZXMtPmZpbHRlcigp
KQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKHBhaW50
SW5mby5waGFzZSA9PSBQYWludFBoYXNlOjpGb3JlZ3JvdW5kKQotICAgICAgICBwYWdlKCkuYWRk
UmVsZXZhbnRSZXBhaW50ZWRPYmplY3QodGhpcywgdmlzdWFsT3ZlcmZsb3dSZWN0KCkpOworICAg
IGJvb2wgY2xpcFZpZXdwb3J0ID0gc2hvdWxkQXBwbHlWaWV3cG9ydENsaXAoKTsKKyAgICBpZiAo
Y2xpcFZpZXdwb3J0ICYmIGNvbnRlbnRTaXplKCkuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47
CiAKICAgICAvLyBNYWtlIGEgY29weSBvZiB0aGUgUGFpbnRJbmZvIGJlY2F1c2UgYXBwbHlUcmFu
c2Zvcm0gd2lsbCBtb2RpZnkgdGhlIGRhbWFnZSByZWN0LgogICAgIFBhaW50SW5mbyBjaGlsZFBh
aW50SW5mbyhwYWludEluZm8pOwogICAgIGNoaWxkUGFpbnRJbmZvLmNvbnRleHQoKS5zYXZlKCk7
CiAKICAgICAvLyBBcHBseSBpbml0aWFsIHZpZXdwb3J0IGNsaXAKLSAgICBpZiAoc2hvdWxkQXBw
bHlWaWV3cG9ydENsaXAoKSkKKyAgICBpZiAoY2xpcFZpZXdwb3J0KQogICAgICAgICBjaGlsZFBh
aW50SW5mby5jb250ZXh0KCkuY2xpcChzbmFwcGVkSW50UmVjdChvdmVyZmxvd0NsaXBSZWN0KHBh
aW50T2Zmc2V0KSkpOwogCiAgICAgLy8gQ29udmVydCBmcm9tIGNvbnRhaW5lciBvZmZzZXRzICho
dG1sIHJlbmRlcmVycykgdG8gYSByZWxhdGl2ZSB0cmFuc2Zvcm0gKHN2ZyByZW5kZXJlcnMpLgpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CmluZGV4IDgxZGNlNzYzZTBiYjU3ZjYyZTcxNWQ4ODhhYzJmNzFhMDcwMDFjNzcuLjgyZTA4YmYz
NTBhMjA3M2NlYzUxYmNhMTcwZWNmYTM4YmJlYmM4ZjggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor
MjAyMi0wMS0xNCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3Mt
Y29udGFpbl0gRml4IGNvbnRhaW4tc2l6ZS1yZXBsYWNlZC0wMDIuaHRtbAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MTc1CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTWFudWVsIFJlZ28gQ2FzYXNub3Zhcy4KKworICAgICAgICAqIFRlc3RFeHBlY3Rh
dGlvbnM6CisKIDIwMjItMDEtMTMgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+
CiAKICAgICAgICAgVXBkYXRlIFdQVCBmb3IgY3NzL2Nzcy1wc2V1ZG8KZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CmluZGV4IDNkY2MzOTEyYzZkMjYyMGMxZmY5ZjY1MWE5MTNmZDhiNTY1NDVjNzAuLjk0Yzk0NGQ5
NDc4YWUxNmU4ZWIwODMxZjgxZGM1MDFiZjcxNWUxYTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAt
NDgxOCw5ICs0ODE4LDYgQEAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWNvbnRhaW4vY29udGVudC12aXNpYmlsaXR5L2FuaW1hdGlvbi1kaXMKICMgQ2FudmFzIGRvZXNu
J3QgZ2V0IGRlZmF1bHQgYXNwZWN0LXJhdGlvIGZvciB3aWR0aCBhbmQgaGVpZ2h0IGF0dHJpYnV0
ZXMuCiB3ZWJraXQub3JnL2IvMjE3NTI5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1mbGV4Ym94L2NhbnZhcy1jb250YWluLXNpemUuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogCi0jIENvbnRlbnQgaXMgcGFpbnRlZCBvbiBzdmcncyBwYWRkaW5nIGFyZWEuCi13ZWJr
aXQub3JnL2IvNDI1ODY4IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1j
b250YWluL2NvbnRhaW4tc2l6ZS1yZXBsYWNlZC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQotCiAjIE11bHRpY29sdW1uIGRvZXMgbm90IHBhaW50IHRoZSBob3Jpem9udGFsIG92ZXJmbG93
IGFyZWEgb2YgYSByZWxhdGl2ZSBjaGlsZC4KIHdlYmtpdC5vcmcvYi80MTc5NiBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluLXNpemUtbW9ub2xp
dGhpYy0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449168</attachid>
            <date>2022-01-14 06:44:48 -0800</date>
            <delta_ts>2022-01-14 10:46:13 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235175-20220114144446.patch</filename>
            <type>text/plain</type>
            <size>3699</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NkYWE3NzRhYjVjZjUx
N2FlODZlODg4YjViOWIwN2IxOWNlM2I1MC4uYjY1MDg0MGQwY2UxNjVkODljNGQ4NzcxYjYxZmZi
NTcxYTgyNjM4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAxLTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jb250YWluXSBGaXggY29u
dGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBJZiB0aGUgU1ZHIHJvb3QgaGFzIHplcm8gY29udGVudCB3aWR0
aCBhbmQvb3IgaGVpZ2h0LCB0aGVyZSBpcyBubyBwb2ludAorICAgICAgICBpbiBwYWludGluZyB0
aGUgY2hpbGRyZW4gY29udGVudHMuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXplLXJlcGxhY2VkLTAwMi5o
dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGVnYWN5UmVuZGVyU1ZHUm9vdDo6cGFpbnRSZXBsYWNlZCk6CisK
IDIwMjItMDEtMTQgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM
RkNdW0lGQ10gSW5jb3JyZWN0IHJvb3QgaW5saW5lIGJveCBwb3NpdGlvbiB3aGVuIG5vbi1lbXB0
eSBhdG9taWMgaW5saW5lIGxldmVsIGNoaWxkIGJveCBoYXMgaGVpZ2h0OiAwcHgKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9vdC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwCmlu
ZGV4IDQ3NDY3Zjc4MzgwNjRiMWQ0Yjg1NWJiOTFlYTFhZDRkZDljOTYxN2UuLmFmNTQ5NTY2Zjc5
OTU2MWQwMGIxZTlhNTM5YmJkYjBkZGJjZTdhYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9vdC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL3N2Zy9MZWdhY3lSZW5kZXJTVkdSb290LmNwcApAQCAtMjI3LDYgKzIyNywx
MCBAQCB2b2lkIExlZ2FjeVJlbmRlclNWR1Jvb3Q6OnBhaW50UmVwbGFjZWQoUGFpbnRJbmZvJiBw
YWludEluZm8sIGNvbnN0IExheW91dFBvaW50JgogICAgIGlmIChib3JkZXJCb3hSZWN0KCkuaXNF
bXB0eSgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBib29sIGNsaXBWaWV3cG9ydCA9IHNob3Vs
ZEFwcGx5Vmlld3BvcnRDbGlwKCk7CisgICAgaWYgKGNsaXBWaWV3cG9ydCAmJiBjb250ZW50U2l6
ZSgpLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gRG9uJ3QgcGFpbnQsIGlm
IHRoZSBjb250ZXh0IGV4cGxpY2l0bHkgZGlzYWJsZWQgaXQuCiAgICAgaWYgKHBhaW50SW5mby5j
b250ZXh0KCkucGFpbnRpbmdEaXNhYmxlZCgpICYmICFwYWludEluZm8uY29udGV4dCgpLmRldGVj
dGluZ0NvbnRlbnRmdWxQYWludCgpKQogICAgICAgICByZXR1cm47CkBAIC0yNjksNyArMjczLDcg
QEAgdm9pZCBMZWdhY3lSZW5kZXJTVkdSb290OjpwYWludFJlcGxhY2VkKFBhaW50SW5mbyYgcGFp
bnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYKICAgICBjaGlsZFBhaW50SW5mby5jb250ZXh0KCku
c2F2ZSgpOwogCiAgICAgLy8gQXBwbHkgaW5pdGlhbCB2aWV3cG9ydCBjbGlwCi0gICAgaWYgKHNo
b3VsZEFwcGx5Vmlld3BvcnRDbGlwKCkpCisgICAgaWYgKGNsaXBWaWV3cG9ydCkKICAgICAgICAg
Y2hpbGRQYWludEluZm8uY29udGV4dCgpLmNsaXAoc25hcHBlZEludFJlY3Qob3ZlcmZsb3dDbGlw
UmVjdChwYWludE9mZnNldCkpKTsKIAogICAgIC8vIENvbnZlcnQgZnJvbSBjb250YWluZXIgb2Zm
c2V0cyAoaHRtbCByZW5kZXJlcnMpIHRvIGEgcmVsYXRpdmUgdHJhbnNmb3JtIChzdmcgcmVuZGVy
ZXJzKS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No
YW5nZUxvZwppbmRleCAxYmQzNTI1YjdlYjJhMjljNzZiYTYzNjYxYjkwZTBiODE1YjU4NGMzLi5m
YmU2ZmZlMjRmZWM4YjU1MTczMDU3OWE4NjVhNjFiMGE3MjgyMmJmIDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs
MTIgQEAKKzIwMjItMDEtMTQgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAg
ICBbY3NzLWNvbnRhaW5dIEZpeCBjb250YWluLXNpemUtcmVwbGFjZWQtMDAyLmh0bWwKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTE3NQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0
aW9uczoKKwogMjAyMi0wMS0xNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg
ICAgICAgW0xGQ11bSUZDXSBJbmNvcnJlY3Qgcm9vdCBpbmxpbmUgYm94IHBvc2l0aW9uIHdoZW4g
bm9uLWVtcHR5IGF0b21pYyBpbmxpbmUgbGV2ZWwgY2hpbGQgYm94IGhhcyBoZWlnaHQ6IDBweApk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rl
c3RFeHBlY3RhdGlvbnMKaW5kZXggYTEwMzE4MjVmYmZhMGJjNmExYjkzZGIzZjk4ZWYwZGUyNzI0
ODFiZC4uZjMxYzZhNDAzNzkzY2U2MTAxNTk1Y2I3YmQyNzkwZWVmYjk4ZjM0NyAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zCkBAIC00ODIxLDkgKzQ4MjEsNiBAQCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250ZW50LXZpc2liaWxpdHkvYW5pbWF0aW9uLWRpcwog
IyBDYW52YXMgZG9lc24ndCBnZXQgZGVmYXVsdCBhc3BlY3QtcmF0aW8gZm9yIHdpZHRoIGFuZCBo
ZWlnaHQgYXR0cmlidXRlcy4KIHdlYmtpdC5vcmcvYi8yMTc1MjkgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvY2FudmFzLWNvbnRhaW4tc2l6ZS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiAKLSMgQ29udGVudCBpcyBwYWludGVkIG9uIHN2ZydzIHBhZGRp
bmcgYXJlYS4KLXdlYmtpdC5vcmcvYi80MjU4NjggaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi0KICMgTXVsdGljb2x1bW4gZG9lcyBub3QgcGFpbnQgdGhlIGhvcml6
b250YWwgb3ZlcmZsb3cgYXJlYSBvZiBhIHJlbGF0aXZlIGNoaWxkLgogd2Via2l0Lm9yZy9iLzQx
Nzk2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRh
aW4tc2l6ZS1tb25vbGl0aGljLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449185</attachid>
            <date>2022-01-14 10:46:18 -0800</date>
            <delta_ts>2022-01-15 08:10:36 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235175-20220114184617.patch</filename>
            <type>text/plain</type>
            <size>3683</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NkYWE3NzRhYjVjZjUx
N2FlODZlODg4YjViOWIwN2IxOWNlM2I1MC4uYjY1MDg0MGQwY2UxNjVkODljNGQ4NzcxYjYxZmZi
NTcxYTgyNjM4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAxLTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jb250YWluXSBGaXggY29u
dGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBJZiB0aGUgU1ZHIHJvb3QgaGFzIHplcm8gY29udGVudCB3aWR0
aCBhbmQvb3IgaGVpZ2h0LCB0aGVyZSBpcyBubyBwb2ludAorICAgICAgICBpbiBwYWludGluZyB0
aGUgY2hpbGRyZW4gY29udGVudHMuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXplLXJlcGxhY2VkLTAwMi5o
dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6TGVnYWN5UmVuZGVyU1ZHUm9vdDo6cGFpbnRSZXBsYWNlZCk6CisK
IDIwMjItMDEtMTQgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM
RkNdW0lGQ10gSW5jb3JyZWN0IHJvb3QgaW5saW5lIGJveCBwb3NpdGlvbiB3aGVuIG5vbi1lbXB0
eSBhdG9taWMgaW5saW5lIGxldmVsIGNoaWxkIGJveCBoYXMgaGVpZ2h0OiAwcHgKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9vdC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwCmlu
ZGV4IDQ3NDY3Zjc4MzgwNjRiMWQ0Yjg1NWJiOTFlYTFhZDRkZDljOTYxN2UuLmNiNjZlNjkxOGU4
Y2ZmODY3ZTU3OTI2YWY1Yjk4MjI0NmQ4NjQyMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9vdC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL3N2Zy9MZWdhY3lSZW5kZXJTVkdSb290LmNwcApAQCAtMjI0LDcgKzIyNCw4
IEBAIGJvb2wgTGVnYWN5UmVuZGVyU1ZHUm9vdDo6c2hvdWxkQXBwbHlWaWV3cG9ydENsaXAoKSBj
b25zdAogdm9pZCBMZWdhY3lSZW5kZXJTVkdSb290OjpwYWludFJlcGxhY2VkKFBhaW50SW5mbyYg
cGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpCiB7CiAgICAgLy8gQW4g
ZW1wdHkgdmlld3BvcnQgZGlzYWJsZXMgcmVuZGVyaW5nLgotICAgIGlmIChib3JkZXJCb3hSZWN0
KCkuaXNFbXB0eSgpKQorICAgIGJvb2wgY2xpcFZpZXdwb3J0ID0gc2hvdWxkQXBwbHlWaWV3cG9y
dENsaXAoKTsKKyAgICBpZiAoY2xpcFZpZXdwb3J0ICYmIGNvbnRlbnRTaXplKCkuaXNFbXB0eSgp
KQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBEb24ndCBwYWludCwgaWYgdGhlIGNvbnRleHQg
ZXhwbGljaXRseSBkaXNhYmxlZCBpdC4KQEAgLTI2OSw3ICsyNzAsNyBAQCB2b2lkIExlZ2FjeVJl
bmRlclNWR1Jvb3Q6OnBhaW50UmVwbGFjZWQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExh
eW91dFBvaW50JgogICAgIGNoaWxkUGFpbnRJbmZvLmNvbnRleHQoKS5zYXZlKCk7CiAKICAgICAv
LyBBcHBseSBpbml0aWFsIHZpZXdwb3J0IGNsaXAKLSAgICBpZiAoc2hvdWxkQXBwbHlWaWV3cG9y
dENsaXAoKSkKKyAgICBpZiAoY2xpcFZpZXdwb3J0KQogICAgICAgICBjaGlsZFBhaW50SW5mby5j
b250ZXh0KCkuY2xpcChzbmFwcGVkSW50UmVjdChvdmVyZmxvd0NsaXBSZWN0KHBhaW50T2Zmc2V0
KSkpOwogCiAgICAgLy8gQ29udmVydCBmcm9tIGNvbnRhaW5lciBvZmZzZXRzIChodG1sIHJlbmRl
cmVycykgdG8gYSByZWxhdGl2ZSB0cmFuc2Zvcm0gKHN2ZyByZW5kZXJlcnMpLgpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDFi
ZDM1MjViN2ViMmEyOWM3NmJhNjM2NjFiOTBlMGI4MTViNTg0YzMuLmZiZTZmZmUyNGZlYzhiNTUx
NzMwNTc5YTg2NWE2MWIwYTcyODIyYmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMi0wMS0x
NCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtY29udGFpbl0g
Rml4IGNvbnRhaW4tc2l6ZS1yZXBsYWNlZC0wMDIuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MTc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIyLTAx
LTE0ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNd
IEluY29ycmVjdCByb290IGlubGluZSBib3ggcG9zaXRpb24gd2hlbiBub24tZW1wdHkgYXRvbWlj
IGlubGluZSBsZXZlbCBjaGlsZCBib3ggaGFzIGhlaWdodDogMHB4CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpp
bmRleCBhMTAzMTgyNWZiZmEwYmM2YTFiOTNkYjNmOThlZjBkZTI3MjQ4MWJkLi5mMzFjNmE0MDM3
OTNjZTYxMDE1OTVjYjdiZDI3OTBlZWZiOThmMzQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9U
ZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ4
MjEsOSArNDgyMSw2IEBAIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1j
b250YWluL2NvbnRlbnQtdmlzaWJpbGl0eS9hbmltYXRpb24tZGlzCiAjIENhbnZhcyBkb2Vzbid0
IGdldCBkZWZhdWx0IGFzcGVjdC1yYXRpbyBmb3Igd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVz
Lgogd2Via2l0Lm9yZy9iLzIxNzUyOSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtZmxleGJveC9jYW52YXMtY29udGFpbi1zaXplLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIAotIyBDb250ZW50IGlzIHBhaW50ZWQgb24gc3ZnJ3MgcGFkZGluZyBhcmVhLgotd2Via2l0
Lm9yZy9iLzQyNTg2OCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29u
dGFpbi9jb250YWluLXNpemUtcmVwbGFjZWQtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LQogIyBNdWx0aWNvbHVtbiBkb2VzIG5vdCBwYWludCB0aGUgaG9yaXpvbnRhbCBvdmVyZmxvdyBh
cmVhIG9mIGEgcmVsYXRpdmUgY2hpbGQuCiB3ZWJraXQub3JnL2IvNDE3OTYgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXplLW1vbm9saXRo
aWMtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449253</attachid>
            <date>2022-01-15 08:10:41 -0800</date>
            <delta_ts>2022-01-15 09:22:49 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235175-20220115161040.patch</filename>
            <type>text/plain</type>
            <size>3699</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NkYWE3NzRhYjVjZjUx
N2FlODZlODg4YjViOWIwN2IxOWNlM2I1MC4uNjZjMjllMTczODJkYmI3NTJiOTVlNDFiZDUzZjNi
ZjM4NjY5MDExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAxLTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jb250YWluXSBGaXggY29u
dGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxNzUKKworICAgICAgICBSZXZpZXdlZCBieSBNYW51ZWwg
UmVnbyBDYXNhc25vdmFzLgorCisgICAgICAgIElmIHRoZSBTVkcgcm9vdCBoYXMgemVybyBjb250
ZW50IHdpZHRoIGFuZC9vciBoZWlnaHQsIHRoZXJlIGlzIG5vIHBvaW50CisgICAgICAgIGluIHBh
aW50aW5nIHRoZSBjaGlsZHJlbiBjb250ZW50cy4KKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluLXNpemUtcmVwbGFj
ZWQtMDAyLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9v
dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lSZW5kZXJTVkdSb290OjpwYWludFJlcGxh
Y2VkKToKKwogMjAyMi0wMS0xNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg
ICAgICAgW0xGQ11bSUZDXSBJbmNvcnJlY3Qgcm9vdCBpbmxpbmUgYm94IHBvc2l0aW9uIHdoZW4g
bm9uLWVtcHR5IGF0b21pYyBpbmxpbmUgbGV2ZWwgY2hpbGQgYm94IGhhcyBoZWlnaHQ6IDBweApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9MZWdhY3lSZW5kZXJTVkdS
b290LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvTGVnYWN5UmVuZGVyU1ZHUm9v
dC5jcHAKaW5kZXggNDc0NjdmNzgzODA2NGIxZDRiODU1YmI5MWVhMWFkNGRkOWM5NjE3ZS4uY2I2
NmU2OTE4ZThjZmY4NjdlNTc5MjZhZjViOTgyMjQ2ZDg2NDIyMSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9MZWdhY3lSZW5kZXJTVkdSb290LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL0xlZ2FjeVJlbmRlclNWR1Jvb3QuY3BwCkBAIC0yMjQs
NyArMjI0LDggQEAgYm9vbCBMZWdhY3lSZW5kZXJTVkdSb290OjpzaG91bGRBcHBseVZpZXdwb3J0
Q2xpcCgpIGNvbnN0CiB2b2lkIExlZ2FjeVJlbmRlclNWR1Jvb3Q6OnBhaW50UmVwbGFjZWQoUGFp
bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKIHsKICAg
ICAvLyBBbiBlbXB0eSB2aWV3cG9ydCBkaXNhYmxlcyByZW5kZXJpbmcuCi0gICAgaWYgKGJvcmRl
ckJveFJlY3QoKS5pc0VtcHR5KCkpCisgICAgYm9vbCBjbGlwVmlld3BvcnQgPSBzaG91bGRBcHBs
eVZpZXdwb3J0Q2xpcCgpOworICAgIGlmIChjbGlwVmlld3BvcnQgJiYgY29udGVudFNpemUoKS5p
c0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIERvbid0IHBhaW50LCBpZiB0aGUg
Y29udGV4dCBleHBsaWNpdGx5IGRpc2FibGVkIGl0LgpAQCAtMjY5LDcgKzI3MCw3IEBAIHZvaWQg
TGVnYWN5UmVuZGVyU1ZHUm9vdDo6cGFpbnRSZXBsYWNlZChQYWludEluZm8mIHBhaW50SW5mbywg
Y29uc3QgTGF5b3V0UG9pbnQmCiAgICAgY2hpbGRQYWludEluZm8uY29udGV4dCgpLnNhdmUoKTsK
IAogICAgIC8vIEFwcGx5IGluaXRpYWwgdmlld3BvcnQgY2xpcAotICAgIGlmIChzaG91bGRBcHBs
eVZpZXdwb3J0Q2xpcCgpKQorICAgIGlmIChjbGlwVmlld3BvcnQpCiAgICAgICAgIGNoaWxkUGFp
bnRJbmZvLmNvbnRleHQoKS5jbGlwKHNuYXBwZWRJbnRSZWN0KG92ZXJmbG93Q2xpcFJlY3QocGFp
bnRPZmZzZXQpKSk7CiAKICAgICAvLyBDb252ZXJ0IGZyb20gY29udGFpbmVyIG9mZnNldHMgKGh0
bWwgcmVuZGVyZXJzKSB0byBhIHJlbGF0aXZlIHRyYW5zZm9ybSAoc3ZnIHJlbmRlcmVycykuCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
aW5kZXggMWJkMzUyNWI3ZWIyYTI5Yzc2YmE2MzY2MWI5MGUwYjgxNWI1ODRjMy4uZWUzYWI0ODg3
M2NkMTdhYjgxNjE5MzA4NTdiYTkzYTBkMjQwYzUxMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisy
MDIyLTAxLTE0ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1j
b250YWluXSBGaXggY29udGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUxNzUKKworICAgICAgICBSZXZp
ZXdlZCBieSBNYW51ZWwgUmVnbyBDYXNhc25vdmFzLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0
aW9uczoKKwogMjAyMi0wMS0xNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg
ICAgICAgW0xGQ11bSUZDXSBJbmNvcnJlY3Qgcm9vdCBpbmxpbmUgYm94IHBvc2l0aW9uIHdoZW4g
bm9uLWVtcHR5IGF0b21pYyBpbmxpbmUgbGV2ZWwgY2hpbGQgYm94IGhhcyBoZWlnaHQ6IDBweApk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rl
c3RFeHBlY3RhdGlvbnMKaW5kZXggYTEwMzE4MjVmYmZhMGJjNmExYjkzZGIzZjk4ZWYwZGUyNzI0
ODFiZC4uZjMxYzZhNDAzNzkzY2U2MTAxNTk1Y2I3YmQyNzkwZWVmYjk4ZjM0NyAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zCkBAIC00ODIxLDkgKzQ4MjEsNiBAQCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250ZW50LXZpc2liaWxpdHkvYW5pbWF0aW9uLWRpcwog
IyBDYW52YXMgZG9lc24ndCBnZXQgZGVmYXVsdCBhc3BlY3QtcmF0aW8gZm9yIHdpZHRoIGFuZCBo
ZWlnaHQgYXR0cmlidXRlcy4KIHdlYmtpdC5vcmcvYi8yMTc1MjkgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvY2FudmFzLWNvbnRhaW4tc2l6ZS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiAKLSMgQ29udGVudCBpcyBwYWludGVkIG9uIHN2ZydzIHBhZGRp
bmcgYXJlYS4KLXdlYmtpdC5vcmcvYi80MjU4NjggaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbi1zaXplLXJlcGxhY2VkLTAwMi5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi0KICMgTXVsdGljb2x1bW4gZG9lcyBub3QgcGFpbnQgdGhlIGhvcml6
b250YWwgb3ZlcmZsb3cgYXJlYSBvZiBhIHJlbGF0aXZlIGNoaWxkLgogd2Via2l0Lm9yZy9iLzQx
Nzk2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRh
aW4tc2l6ZS1tb25vbGl0aGljLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>