<?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>212289</bug_id>
          
          <creation_ts>2020-05-22 16:49:07 -0700</creation_ts>
          <short_desc>Do not send a second sync request for positition information to the web process if we have not recieved information since the previous sync request.</short_desc>
          <delta_ts>2020-05-28 13:10:17 -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>New Bugs</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="Megan Gardner">megan_gardner</reporter>
          <assigned_to name="Megan Gardner">megan_gardner</assigned_to>
          <cc>thorton</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1655499</commentid>
    <comment_count>0</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-05-22 16:49:07 -0700</bug_when>
    <thetext>Do not send a second sync request for positition information to the web process if we have not recieved information since the previous sync request.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1655514</commentid>
    <comment_count>1</comment_count>
      <attachid>400090</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-05-22 16:55:48 -0700</bug_when>
    <thetext>Created attachment 400090
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1655516</commentid>
    <comment_count>2</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-05-22 16:56:12 -0700</bug_when>
    <thetext>&lt;rdar://problem/58494578&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1656583</commentid>
    <comment_count>3</comment_count>
      <attachid>400382</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-05-27 14:26:20 -0700</bug_when>
    <thetext>Created attachment 400382
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1656643</commentid>
    <comment_count>4</comment_count>
      <attachid>400382</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-05-27 15:46:28 -0700</bug_when>
    <thetext>Comment on attachment 400382
Patch

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

&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2245
&gt; +    if (!_isWaitingOnPositionInformation) {

I would flip this around into an early return (don&apos;t wait if we&apos;re already waiting)

&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2253
&gt; +    return _isWaitingOnPositionInformation;

Why do we return YES (that we have valid state) in the case where we&apos;re already waiting??</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1656671</commentid>
    <comment_count>5</comment_count>
      <attachid>400401</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-05-27 16:35:35 -0700</bug_when>
    <thetext>Created attachment 400401
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1656753</commentid>
    <comment_count>6</comment_count>
      <attachid>400401</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-05-27 20:15:05 -0700</bug_when>
    <thetext>Comment on attachment 400401
Patch

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

&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2245
&gt; +    if (_isWaitingOnPositionInformation)

I think this can just check _outstandingPositionInformationRequest, no need for a new bool, right?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1656959</commentid>
    <comment_count>7</comment_count>
      <attachid>400493</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-05-28 12:28:30 -0700</bug_when>
    <thetext>Created attachment 400493
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1656961</commentid>
    <comment_count>8</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-05-28 12:33:13 -0700</bug_when>
    <thetext>I know I looked at using that bool, but concluded that it would not be enough information.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1656962</commentid>
    <comment_count>9</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-05-28 12:34:42 -0700</bug_when>
    <thetext>Oh, right because it will be true after we ask for position information, thus we will never attempt a waitForAndDispatchImmediately, which is not what we want.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1656977</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-05-28 13:10:17 -0700</bug_when>
    <thetext>Committed r262255: &lt;https://trac.webkit.org/changeset/262255&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 400493.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400090</attachid>
            <date>2020-05-22 16:55:48 -0700</date>
            <delta_ts>2020-05-27 14:26:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212289-20200522165541.patch</filename>
            <type>text/plain</type>
            <size>4920</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM1OWM0MDdiOTk0Yzg2MDM2
Yjk3N2ViYjQ2Yjk3Y2NlNDM4NDQwZDIuLjRjZWI0MWM0YTlhZDhmN2FhYmI1MWUwYmI4N2Q4ODM0
YmUzNjc0NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDUtMjIgIE1lZ2FuIEdh
cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3Qgc2VuZCBh
IHNlY29uZCBzeW5jIHJlcXVlc3QgZm9yIHBvc2l0aXRpb24gaW5mb3JtYXRpb24gdG8gdGhlIHdl
YiBwcm9jZXNzIGlmIHdlIGhhdmUgbm90IHJlY2lldmVkIGluZm9ybWF0aW9uIHNpbmNlIHRoZSBw
cmV2aW91cyBzeW5jIHJlcXVlc3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMTIyODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4NDk0NTc4Pgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHdlIGhh
dmUgc2VudCBhIHN5bmMgcmVxdWVzdHMgdG8gdGhlIHdlYiBwcm9jZXNzIGZvciBwb3NpdGlvbiBp
bmZvcm1hdGlvbiwgYW5kIHRpbWVkIG91dCwgYW5kIGhhdmUgbm90CisgICAgICAgIHJlY2VpdmVk
IGEgbWVzc2FnZSB3aXRoIHBvc2l0aW9uIGluZm9ybWF0aW9uIGluIHRoZSBpbnRlcmltLCBkbyBu
b3Qgc2VuZCBhbm90aGVyIHN5bmMgcmVxdWVzdC4gVGhlIHdlYgorICAgICAgICBwcm9jZXNzIGlz
IGxpa2VseSBzdGlsbCBodW5nLCBhbmQgdGhlcmUgaXMgbm8gcmVhc29uIHRvIGhhbmcgdGhlIFVJ
UHJvY2VzcyBhZ2FpbiBpZiB3ZSBzdXNwZWN0IHRoYXQgaXQKKyAgICAgICAgaXMgdW5saWtlbHkg
dGhhdCB3ZSB3aWxsIHJlY2VpdmUgYSByZXBseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv
V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv
bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZW5zdXJl
UG9zaXRpb25JbmZvcm1hdGlvbklzVXBUb0RhdGU6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZp
ZXcgX2ludm9rZUFuZFJlbW92ZVBlbmRpbmdIYW5kbGVyc1ZhbGlkRm9yQ3VycmVudFBvc2l0aW9u
SW5mb3JtYXRpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfcG9zaXRpb25JbmZvcm1h
dGlvbkRpZENoYW5nZTpdKToKKwogMjAyMC0wNS0yMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh
c2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBQbHVtYiB0aGUgZGlzcGxheSdzIG5vbWluYWwgcmVm
cmVzaCByYXRlIGRvd24gdG8gU2Nyb2xsaW5nVHJlZSBmb3IgdXNlIGluIHNjcm9sbCBzeW5jaHJv
bml6YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl
bnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl
bnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCBjYzRkMzY3NTJhNjg0NTkwZmMzMGFjNDFlY2I5YmM3
ZjVkYmIzODc2Li5hYTI0NGE4MWRhYjVjZGZjMDM4YmZjNzU1NDFjZjlmMGVlMDA3MGFiIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0
aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl
cmFjdGlvbi5oCkBAIC0zMjcsNiArMzI3LDcgQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRh
IHsKIAogICAgIHVpbnQ2NF90IF9wb3NpdGlvbkluZm9ybWF0aW9uQ2FsbGJhY2tEZXB0aDsKICAg
ICBWZWN0b3I8T3B0aW9uYWw8SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3RBbmRDYWxsYmFj
az4+IF9wZW5kaW5nUG9zaXRpb25JbmZvcm1hdGlvbkhhbmRsZXJzOworICAgIGJvb2wgX2lzV2Fp
dGluZ09uUG9zaXRpb25JbmZvcm1hdGlvbjsKICAgICAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2Vi
S2l0OjpJbnB1dFZpZXdVcGRhdGVEZWZlcnJlcj4gX2lucHV0Vmlld1VwZGF0ZURlZmVycmVyOwog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu
dGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ
bnRlcmFjdGlvbi5tbQppbmRleCA0ZjcwN2QxMmI3YjJkMGQ3ZTA5YzJhOGNmOTRlMjAxZDkyNmE4
Yjc4Li5iODNjYWVmOTU5ZWI3NzMwODgwMmE3MTBiYjllMWQzOWZlOTViNmM3IDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t
CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp
b24ubW0KQEAgLTIyMzYsMTcgKzIyMzYsMTMgQEAgLSAoQk9PTCllbnN1cmVQb3NpdGlvbkluZm9y
bWF0aW9uSXNVcFRvRGF0ZTooV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWUKICAg
ICBpZiAoIWNvbm5lY3Rpb24pCiAgICAgICAgIHJldHVybiBOTzsKIAotICAgIGlmIChbc2VsZiBf
aGFzVmFsaWRPdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0OnJlcXVlc3RdKQot
ICAgICAgICByZXR1cm4gY29ubmVjdGlvbi0+d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8
TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUmVjZWl2ZVBvc2l0aW9uSW5mb3JtYXRpb24+KF9w
YWdlLT53ZWJQYWdlSUQoKSwgMV9zLCBJUEM6OldhaXRGb3JPcHRpb246OkludGVycnVwdFdhaXRp
bmdJZlN5bmNNZXNzYWdlQXJyaXZlcyk7Ci0KLSAgICBib29sIHJlY2VpdmVkUmVzcG9uc2UgPSBf
cGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2U6OkdldFBvc2l0aW9uSW5mb3JtYXRpb24o
cmVxdWVzdCksIE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRQb3NpdGlvbkluZm9ybWF0aW9uOjpSZXBs
eShfcG9zaXRpb25JbmZvcm1hdGlvbiksIDFfcywgSVBDOjpTZW5kU3luY09wdGlvbjo6Rm9yY2VE
aXNwYXRjaFdoZW5EZXN0aW5hdGlvbklzV2FpdGluZ0ZvclVuYm91bmRlZFN5bmNSZXBseSk7Ci0g
ICAgX2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbiA9IHJlY2VpdmVkUmVzcG9uc2UgJiYgX3Bv
c2l0aW9uSW5mb3JtYXRpb24uY2FuQmVWYWxpZDsKLSAgICAKLSAgICAvLyBGSVhNRTogV2UgbmVl
ZCB0byBjbGVhbiB1cCB0aGVzZSBoYW5kbGVycyBpbiB0aGUgZXZlbnQgdGhhdCB3ZSBhcmUgbm90
IGFibGUgdG8gY29sbGVjdCBkYXRhLCBvciBpZiB0aGUgV2ViUHJvY2VzcyBjcmFzaGVzLgotICAg
IGlmIChfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uKQotICAgICAgICBbc2VsZiBfaW52b2tl
QW5kUmVtb3ZlUGVuZGluZ0hhbmRsZXJzVmFsaWRGb3JDdXJyZW50UG9zaXRpb25JbmZvcm1hdGlv
bl07CisgICAgaWYgKCFfaXNXYWl0aW5nT25Qb3NpdGlvbkluZm9ybWF0aW9uKSB7CisgICAgICAg
IGlmICghW3NlbGYgX2hhc1ZhbGlkT3V0c3RhbmRpbmdQb3NpdGlvbkluZm9ybWF0aW9uUmVxdWVz
dDpyZXF1ZXN0XSkKKyAgICAgICAgICAgIFtzZWxmIHJlcXVlc3RBc3luY2hyb25vdXNQb3NpdGlv
bkluZm9ybWF0aW9uVXBkYXRlOnJlcXVlc3RdOworICAgICAgICBfaXNXYWl0aW5nT25Qb3NpdGlv
bkluZm9ybWF0aW9uID0gIWNvbm5lY3Rpb24tPndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5
PE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFJlY2VpdmVQb3NpdGlvbkluZm9ybWF0aW9uPihf
cGFnZS0+d2ViUGFnZUlEKCksIDFfcywgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0
aW5nSWZTeW5jTWVzc2FnZUFycml2ZXMpOworICAgIH0KKyAgICByZXR1cm4gX2lzV2FpdGluZ09u
UG9zaXRpb25JbmZvcm1hdGlvbjsKIAotICAgIHJldHVybiBfaGFzVmFsaWRQb3NpdGlvbkluZm9y
bWF0aW9uOwogfQogCiAtICh2b2lkKXJlcXVlc3RBc3luY2hyb25vdXNQb3NpdGlvbkluZm9ybWF0
aW9uVXBkYXRlOihXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0KXJlcXVlc3QK
QEAgLTIyNzgsNiArMjI3NCw3IEBAIC0gKHZvaWQpX2ludm9rZUFuZFJlbW92ZVBlbmRpbmdIYW5k
bGVyc1ZhbGlkRm9yQ3VycmVudFBvc2l0aW9uSW5mb3JtYXRpb24KIHsKICAgICBBU1NFUlQoX2hh
c1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbik7CiAKKyAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBj
bGVhbiB1cCB0aGVzZSBoYW5kbGVycyBpbiB0aGUgZXZlbnQgdGhhdCB3ZSBhcmUgbm90IGFibGUg
dG8gY29sbGVjdCBkYXRhLCBvciBpZiB0aGUgV2ViUHJvY2VzcyBjcmFzaGVzLgogICAgICsrX3Bv
c2l0aW9uSW5mb3JtYXRpb25DYWxsYmFja0RlcHRoOwogICAgIGF1dG8gdXBkYXRlZFBvc2l0aW9u
SW5mb3JtYXRpb24gPSBfcG9zaXRpb25JbmZvcm1hdGlvbjsKIApAQCAtMjg2MCw2ICsyODU3LDcg
QEAgLSAodm9pZCljbGVhclNlbGVjdGlvbgogLSAodm9pZClfcG9zaXRpb25JbmZvcm1hdGlvbkRp
ZENoYW5nZTooY29uc3QgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiYp
aW5mbwogewogICAgIF9vdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0ID0gV1RG
OjpudWxsb3B0OworICAgIF9pc1dhaXRpbmdPblBvc2l0aW9uSW5mb3JtYXRpb24gPSBOTzsKIAog
ICAgIFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24gbmV3SW5mbyA9IGlu
Zm87CiAgICAgbmV3SW5mby5tZXJnZUNvbXBhdGlibGVPcHRpb25hbEluZm9ybWF0aW9uKF9wb3Np
dGlvbkluZm9ybWF0aW9uKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400382</attachid>
            <date>2020-05-27 14:26:20 -0700</date>
            <delta_ts>2020-05-27 16:35:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212289-20200527142620.patch</filename>
            <type>text/plain</type>
            <size>5279</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiNTQzNjdlYWFlOTM4YzJk
M2IxOGIxOGM1Nzk0MzFjOWMyNzA0NDYuLmJmMTNlNTQ1NmZlYWEwY2YzODM2M2NjNjUzZTMyMGZk
MTExZmRlY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDUtMjcgIE1lZ2FuIEdh
cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3Qgc2VuZCBh
IHNlY29uZCBzeW5jIHJlcXVlc3QgZm9yIHBvc2l0aXRpb24gaW5mb3JtYXRpb24gdG8gdGhlIHdl
YiBwcm9jZXNzIGlmIHdlIGhhdmUgbm90IHJlY2lldmVkIGluZm9ybWF0aW9uIHNpbmNlIHRoZSBw
cmV2aW91cyBzeW5jIHJlcXVlc3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMTIyODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4NDk0NTc4Pgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHdlIGhh
dmUgc2VudCBhIHN5bmMgcmVxdWVzdHMgdG8gdGhlIHdlYiBwcm9jZXNzIGZvciBwb3NpdGlvbiBp
bmZvcm1hdGlvbiwgYW5kIHRpbWVkIG91dCwgYW5kIGhhdmUgbm90CisgICAgICAgIHJlY2VpdmVk
IGEgbWVzc2FnZSB3aXRoIHBvc2l0aW9uIGluZm9ybWF0aW9uIGluIHRoZSBpbnRlcmltLCBkbyBu
b3Qgc2VuZCBhbm90aGVyIHN5bmMgcmVxdWVzdC4gVGhlIHdlYgorICAgICAgICBwcm9jZXNzIGlz
IGxpa2VseSBzdGlsbCBodW5nLCBhbmQgdGhlcmUgaXMgbm8gcmVhc29uIHRvIGhhbmcgdGhlIFVJ
UHJvY2VzcyBhZ2FpbiBpZiB3ZSBzdXNwZWN0IHRoYXQgaXQKKyAgICAgICAgaXMgdW5saWtlbHkg
dGhhdCB3ZSB3aWxsIHJlY2VpdmUgYSByZXBseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv
V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv
bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgY2xlYW5V
cEludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZW5zdXJlUG9zaXRpb25J
bmZvcm1hdGlvbklzVXBUb0RhdGU6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3Bvc2l0
aW9uSW5mb3JtYXRpb25EaWRDaGFuZ2U6XSk6CisKIDIwMjAtMDUtMjYgIEFuZHkgRXN0ZXMgIDxh
ZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgZW5naW5lZXJpbmcgYnVpbGQgb24g
aW50ZXJuYWwgU0RLcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL
Q29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL
Q29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IGNjNGQzNjc1MmE2ODQ1OTBmYzMwYWM0MWVj
YjliYzdmNWRiYjM4NzYuLjZmZDA3MmMzY2FkNDQ2ZTkzMTZmYjU0YjRmNTUxZjVjNzgwYzQ0OTgg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50
ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll
d0ludGVyYWN0aW9uLmgKQEAgLTM1OSw2ICszNTksNyBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlv
bkRhdGEgewogICAgIEJPT0wgX3Nob3dEZWJ1Z1RhcEhpZ2hsaWdodHNGb3JGYXN0Q2xpY2tpbmc7
CiAgICAgQk9PTCBfdGV4dEludGVyYWN0aW9uRGlkQ2hhbmdlRm9jdXNlZEVsZW1lbnQ7CiAgICAg
Qk9PTCBfdGV4dEludGVyYWN0aW9uSXNIYXBwZW5pbmc7CisgICAgYm9vbCBfaXNXYWl0aW5nT25Q
b3NpdGlvbkluZm9ybWF0aW9uOwogCiAgICAgV2ViQ29yZTo6UG9pbnRlcklEIG1fY29tbWl0UG90
ZW50aWFsVGFwUG9pbnRlcklkOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBkZmZlNzlhZmNkOGQ2M2Zh
YTFmZTRjMzc1MGVkODMwZDRlNjM3OWNkLi42ZDI1MGZjMjA3MGRmODc4N2Y4YzlkMDdkMzkyYWNh
Y2E5ZDRiYTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250
ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X
S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTkyMCw2ICs5MjAsNyBAQCAtICh2b2lkKWNs
ZWFuVXBJbnRlcmFjdGlvbgogICAgIF9mb3JtSW5wdXRTZXNzaW9uID0gbmlsOwogICAgIFtfaGln
aGxpZ2h0VmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKICAgICBfb3V0c3RhbmRpbmdQb3NpdGlv
bkluZm9ybWF0aW9uUmVxdWVzdCA9IFdURjo6bnVsbG9wdDsKKyAgICBfaXNXYWl0aW5nT25Qb3Np
dGlvbkluZm9ybWF0aW9uID0gTk87CiAKICAgICBfZm9jdXNSZXF1aXJlc1N0cm9uZ1Bhc3N3b3Jk
QXNzaXN0YW5jZSA9IE5POwogICAgIF9hZGRpdGlvbmFsQ29udGV4dEZvclN0cm9uZ1Bhc3N3b3Jk
QXNzaXN0YW5jZSA9IG5pbDsKQEAgLTIyNDEsMTcgKzIyNDIsMTUgQEAgLSAoQk9PTCllbnN1cmVQ
b3NpdGlvbkluZm9ybWF0aW9uSXNVcFRvRGF0ZTooV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0
aW9uUmVxdWUKICAgICBpZiAoIWNvbm5lY3Rpb24pCiAgICAgICAgIHJldHVybiBOTzsKIAotICAg
IGlmIChbc2VsZiBfaGFzVmFsaWRPdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0
OnJlcXVlc3RdKQotICAgICAgICByZXR1cm4gY29ubmVjdGlvbi0+d2FpdEZvckFuZERpc3BhdGNo
SW1tZWRpYXRlbHk8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUmVjZWl2ZVBvc2l0aW9uSW5m
b3JtYXRpb24+KF9wYWdlLT53ZWJQYWdlSUQoKSwgMV9zLCBJUEM6OldhaXRGb3JPcHRpb246Oklu
dGVycnVwdFdhaXRpbmdJZlN5bmNNZXNzYWdlQXJyaXZlcyk7Ci0KLSAgICBib29sIHJlY2VpdmVk
UmVzcG9uc2UgPSBfcGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2U6OkdldFBvc2l0aW9u
SW5mb3JtYXRpb24ocmVxdWVzdCksIE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRQb3NpdGlvbkluZm9y
bWF0aW9uOjpSZXBseShfcG9zaXRpb25JbmZvcm1hdGlvbiksIDFfcywgSVBDOjpTZW5kU3luY09w
dGlvbjo6Rm9yY2VEaXNwYXRjaFdoZW5EZXN0aW5hdGlvbklzV2FpdGluZ0ZvclVuYm91bmRlZFN5
bmNSZXBseSk7Ci0gICAgX2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbiA9IHJlY2VpdmVkUmVz
cG9uc2UgJiYgX3Bvc2l0aW9uSW5mb3JtYXRpb24uY2FuQmVWYWxpZDsKLSAgICAKLSAgICAvLyBG
SVhNRTogV2UgbmVlZCB0byBjbGVhbiB1cCB0aGVzZSBoYW5kbGVycyBpbiB0aGUgZXZlbnQgdGhh
dCB3ZSBhcmUgbm90IGFibGUgdG8gY29sbGVjdCBkYXRhLCBvciBpZiB0aGUgV2ViUHJvY2VzcyBj
cmFzaGVzLgotICAgIGlmIChfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uKQotICAgICAgICBb
c2VsZiBfaW52b2tlQW5kUmVtb3ZlUGVuZGluZ0hhbmRsZXJzVmFsaWRGb3JDdXJyZW50UG9zaXRp
b25JbmZvcm1hdGlvbl07Ci0KLSAgICByZXR1cm4gX2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlv
bjsKKyAgICBpZiAoIV9pc1dhaXRpbmdPblBvc2l0aW9uSW5mb3JtYXRpb24pIHsKKyAgICAgICAg
X2lzV2FpdGluZ09uUG9zaXRpb25JbmZvcm1hdGlvbiA9IFlFUzsKKyAgICAgICAgaWYgKCFbc2Vs
ZiBfaGFzVmFsaWRPdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0OnJlcXVlc3Rd
KQorICAgICAgICAgICAgW3NlbGYgcmVxdWVzdEFzeW5jaHJvbm91c1Bvc2l0aW9uSW5mb3JtYXRp
b25VcGRhdGU6cmVxdWVzdF07CisgICAgICAgIGJvb2wgcmVjZWl2ZWRSZXNwb25zZSA9IGNvbm5l
Y3Rpb24tPndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2VzOjpXZWJQYWdlUHJv
eHk6OkRpZFJlY2VpdmVQb3NpdGlvbkluZm9ybWF0aW9uPihfcGFnZS0+d2ViUGFnZUlEKCksIDFf
cywgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0aW5nSWZTeW5jTWVzc2FnZUFycml2
ZXMpOworICAgICAgICBfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uID0gcmVjZWl2ZWRSZXNw
b25zZSAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5jYW5CZVZhbGlkOworICAgICAgICByZXR1cm4g
X2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbjsKKyAgICB9CisgICAgcmV0dXJuIF9pc1dhaXRp
bmdPblBvc2l0aW9uSW5mb3JtYXRpb247CiB9CiAKIC0gKHZvaWQpcmVxdWVzdEFzeW5jaHJvbm91
c1Bvc2l0aW9uSW5mb3JtYXRpb25VcGRhdGU6KFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlv
blJlcXVlc3QpcmVxdWVzdApAQCAtMjI4Myw2ICsyMjgyLDcgQEAgLSAodm9pZClfaW52b2tlQW5k
UmVtb3ZlUGVuZGluZ0hhbmRsZXJzVmFsaWRGb3JDdXJyZW50UG9zaXRpb25JbmZvcm1hdGlvbgog
ewogICAgIEFTU0VSVChfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uKTsKIAorICAgIC8vIEZJ
WE1FOiBXZSBuZWVkIHRvIGNsZWFuIHVwIHRoZXNlIGhhbmRsZXJzIGluIHRoZSBldmVudCB0aGF0
IHdlIGFyZSBub3QgYWJsZSB0byBjb2xsZWN0IGRhdGEsIG9yIGlmIHRoZSBXZWJQcm9jZXNzIGNy
YXNoZXMuCiAgICAgKytfcG9zaXRpb25JbmZvcm1hdGlvbkNhbGxiYWNrRGVwdGg7CiAgICAgYXV0
byB1cGRhdGVkUG9zaXRpb25JbmZvcm1hdGlvbiA9IF9wb3NpdGlvbkluZm9ybWF0aW9uOwogCkBA
IC0yODY1LDYgKzI4NjUsNyBAQCAtICh2b2lkKWNsZWFyU2VsZWN0aW9uCiAtICh2b2lkKV9wb3Np
dGlvbkluZm9ybWF0aW9uRGlkQ2hhbmdlOihjb25zdCBXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3Jt
YXRpb25BdFBvc2l0aW9uJilpbmZvCiB7CiAgICAgX291dHN0YW5kaW5nUG9zaXRpb25JbmZvcm1h
dGlvblJlcXVlc3QgPSBXVEY6Om51bGxvcHQ7CisgICAgX2lzV2FpdGluZ09uUG9zaXRpb25JbmZv
cm1hdGlvbiA9IE5POwogCiAgICAgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3Np
dGlvbiBuZXdJbmZvID0gaW5mbzsKICAgICBuZXdJbmZvLm1lcmdlQ29tcGF0aWJsZU9wdGlvbmFs
SW5mb3JtYXRpb24oX3Bvc2l0aW9uSW5mb3JtYXRpb24pOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400401</attachid>
            <date>2020-05-27 16:35:35 -0700</date>
            <delta_ts>2020-05-28 12:28:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-212289-20200527163535.patch</filename>
            <type>text/plain</type>
            <size>5077</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiNTQzNjdlYWFlOTM4YzJk
M2IxOGIxOGM1Nzk0MzFjOWMyNzA0NDYuLmJmMTNlNTQ1NmZlYWEwY2YzODM2M2NjNjUzZTMyMGZk
MTExZmRlY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDUtMjcgIE1lZ2FuIEdh
cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3Qgc2VuZCBh
IHNlY29uZCBzeW5jIHJlcXVlc3QgZm9yIHBvc2l0aXRpb24gaW5mb3JtYXRpb24gdG8gdGhlIHdl
YiBwcm9jZXNzIGlmIHdlIGhhdmUgbm90IHJlY2lldmVkIGluZm9ybWF0aW9uIHNpbmNlIHRoZSBw
cmV2aW91cyBzeW5jIHJlcXVlc3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMTIyODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4NDk0NTc4Pgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHdlIGhh
dmUgc2VudCBhIHN5bmMgcmVxdWVzdHMgdG8gdGhlIHdlYiBwcm9jZXNzIGZvciBwb3NpdGlvbiBp
bmZvcm1hdGlvbiwgYW5kIHRpbWVkIG91dCwgYW5kIGhhdmUgbm90CisgICAgICAgIHJlY2VpdmVk
IGEgbWVzc2FnZSB3aXRoIHBvc2l0aW9uIGluZm9ybWF0aW9uIGluIHRoZSBpbnRlcmltLCBkbyBu
b3Qgc2VuZCBhbm90aGVyIHN5bmMgcmVxdWVzdC4gVGhlIHdlYgorICAgICAgICBwcm9jZXNzIGlz
IGxpa2VseSBzdGlsbCBodW5nLCBhbmQgdGhlcmUgaXMgbm8gcmVhc29uIHRvIGhhbmcgdGhlIFVJ
UHJvY2VzcyBhZ2FpbiBpZiB3ZSBzdXNwZWN0IHRoYXQgaXQKKyAgICAgICAgaXMgdW5saWtlbHkg
dGhhdCB3ZSB3aWxsIHJlY2VpdmUgYSByZXBseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv
V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv
bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgY2xlYW5V
cEludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZW5zdXJlUG9zaXRpb25J
bmZvcm1hdGlvbklzVXBUb0RhdGU6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3Bvc2l0
aW9uSW5mb3JtYXRpb25EaWRDaGFuZ2U6XSk6CisKIDIwMjAtMDUtMjYgIEFuZHkgRXN0ZXMgIDxh
ZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgZW5naW5lZXJpbmcgYnVpbGQgb24g
aW50ZXJuYWwgU0RLcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL
Q29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL
Q29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IGNjNGQzNjc1MmE2ODQ1OTBmYzMwYWM0MWVj
YjliYzdmNWRiYjM4NzYuLjZmZDA3MmMzY2FkNDQ2ZTkzMTZmYjU0YjRmNTUxZjVjNzgwYzQ0OTgg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50
ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll
d0ludGVyYWN0aW9uLmgKQEAgLTM1OSw2ICszNTksNyBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlv
bkRhdGEgewogICAgIEJPT0wgX3Nob3dEZWJ1Z1RhcEhpZ2hsaWdodHNGb3JGYXN0Q2xpY2tpbmc7
CiAgICAgQk9PTCBfdGV4dEludGVyYWN0aW9uRGlkQ2hhbmdlRm9jdXNlZEVsZW1lbnQ7CiAgICAg
Qk9PTCBfdGV4dEludGVyYWN0aW9uSXNIYXBwZW5pbmc7CisgICAgYm9vbCBfaXNXYWl0aW5nT25Q
b3NpdGlvbkluZm9ybWF0aW9uOwogCiAgICAgV2ViQ29yZTo6UG9pbnRlcklEIG1fY29tbWl0UG90
ZW50aWFsVGFwUG9pbnRlcklkOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBkZmZlNzlhZmNkOGQ2M2Zh
YTFmZTRjMzc1MGVkODMwZDRlNjM3OWNkLi43MDViNzU3YmRlNzYzNDBkNzVhNTFjMDdhNWYxN2Yx
NGU2YmMxZDZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250
ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X
S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTkyMCw2ICs5MjAsNyBAQCAtICh2b2lkKWNs
ZWFuVXBJbnRlcmFjdGlvbgogICAgIF9mb3JtSW5wdXRTZXNzaW9uID0gbmlsOwogICAgIFtfaGln
aGxpZ2h0VmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKICAgICBfb3V0c3RhbmRpbmdQb3NpdGlv
bkluZm9ybWF0aW9uUmVxdWVzdCA9IFdURjo6bnVsbG9wdDsKKyAgICBfaXNXYWl0aW5nT25Qb3Np
dGlvbkluZm9ybWF0aW9uID0gTk87CiAKICAgICBfZm9jdXNSZXF1aXJlc1N0cm9uZ1Bhc3N3b3Jk
QXNzaXN0YW5jZSA9IE5POwogICAgIF9hZGRpdGlvbmFsQ29udGV4dEZvclN0cm9uZ1Bhc3N3b3Jk
QXNzaXN0YW5jZSA9IG5pbDsKQEAgLTIyNDEsMTYgKzIyNDIsMTQgQEAgLSAoQk9PTCllbnN1cmVQ
b3NpdGlvbkluZm9ybWF0aW9uSXNVcFRvRGF0ZTooV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0
aW9uUmVxdWUKICAgICBpZiAoIWNvbm5lY3Rpb24pCiAgICAgICAgIHJldHVybiBOTzsKIAotICAg
IGlmIChbc2VsZiBfaGFzVmFsaWRPdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0
OnJlcXVlc3RdKQotICAgICAgICByZXR1cm4gY29ubmVjdGlvbi0+d2FpdEZvckFuZERpc3BhdGNo
SW1tZWRpYXRlbHk8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUmVjZWl2ZVBvc2l0aW9uSW5m
b3JtYXRpb24+KF9wYWdlLT53ZWJQYWdlSUQoKSwgMV9zLCBJUEM6OldhaXRGb3JPcHRpb246Oklu
dGVycnVwdFdhaXRpbmdJZlN5bmNNZXNzYWdlQXJyaXZlcyk7Ci0KLSAgICBib29sIHJlY2VpdmVk
UmVzcG9uc2UgPSBfcGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2U6OkdldFBvc2l0aW9u
SW5mb3JtYXRpb24ocmVxdWVzdCksIE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRQb3NpdGlvbkluZm9y
bWF0aW9uOjpSZXBseShfcG9zaXRpb25JbmZvcm1hdGlvbiksIDFfcywgSVBDOjpTZW5kU3luY09w
dGlvbjo6Rm9yY2VEaXNwYXRjaFdoZW5EZXN0aW5hdGlvbklzV2FpdGluZ0ZvclVuYm91bmRlZFN5
bmNSZXBseSk7Ci0gICAgX2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbiA9IHJlY2VpdmVkUmVz
cG9uc2UgJiYgX3Bvc2l0aW9uSW5mb3JtYXRpb24uY2FuQmVWYWxpZDsKKyAgICBpZiAoX2lzV2Fp
dGluZ09uUG9zaXRpb25JbmZvcm1hdGlvbikKKyAgICAgICAgcmV0dXJuIE5POwogICAgIAotICAg
IC8vIEZJWE1FOiBXZSBuZWVkIHRvIGNsZWFuIHVwIHRoZXNlIGhhbmRsZXJzIGluIHRoZSBldmVu
dCB0aGF0IHdlIGFyZSBub3QgYWJsZSB0byBjb2xsZWN0IGRhdGEsIG9yIGlmIHRoZSBXZWJQcm9j
ZXNzIGNyYXNoZXMuCi0gICAgaWYgKF9oYXNWYWxpZFBvc2l0aW9uSW5mb3JtYXRpb24pCi0gICAg
ICAgIFtzZWxmIF9pbnZva2VBbmRSZW1vdmVQZW5kaW5nSGFuZGxlcnNWYWxpZEZvckN1cnJlbnRQ
b3NpdGlvbkluZm9ybWF0aW9uXTsKLQorICAgIF9pc1dhaXRpbmdPblBvc2l0aW9uSW5mb3JtYXRp
b24gPSBZRVM7CisgICAgaWYgKCFbc2VsZiBfaGFzVmFsaWRPdXRzdGFuZGluZ1Bvc2l0aW9uSW5m
b3JtYXRpb25SZXF1ZXN0OnJlcXVlc3RdKQorICAgICAgICBbc2VsZiByZXF1ZXN0QXN5bmNocm9u
b3VzUG9zaXRpb25JbmZvcm1hdGlvblVwZGF0ZTpyZXF1ZXN0XTsKKyAgICBib29sIHJlY2VpdmVk
UmVzcG9uc2UgPSBjb25uZWN0aW9uLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNz
YWdlczo6V2ViUGFnZVByb3h5OjpEaWRSZWNlaXZlUG9zaXRpb25JbmZvcm1hdGlvbj4oX3BhZ2Ut
PndlYlBhZ2VJRCgpLCAxX3MsIElQQzo6V2FpdEZvck9wdGlvbjo6SW50ZXJydXB0V2FpdGluZ0lm
U3luY01lc3NhZ2VBcnJpdmVzKTsKKyAgICBfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uID0g
cmVjZWl2ZWRSZXNwb25zZSAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5jYW5CZVZhbGlkOwogICAg
IHJldHVybiBfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uOwogfQogCkBAIC0yMjgzLDYgKzIy
ODIsNyBAQCAtICh2b2lkKV9pbnZva2VBbmRSZW1vdmVQZW5kaW5nSGFuZGxlcnNWYWxpZEZvckN1
cnJlbnRQb3NpdGlvbkluZm9ybWF0aW9uCiB7CiAgICAgQVNTRVJUKF9oYXNWYWxpZFBvc2l0aW9u
SW5mb3JtYXRpb24pOwogCisgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gY2xlYW4gdXAgdGhlc2Ug
aGFuZGxlcnMgaW4gdGhlIGV2ZW50IHRoYXQgd2UgYXJlIG5vdCBhYmxlIHRvIGNvbGxlY3QgZGF0
YSwgb3IgaWYgdGhlIFdlYlByb2Nlc3MgY3Jhc2hlcy4KICAgICArK19wb3NpdGlvbkluZm9ybWF0
aW9uQ2FsbGJhY2tEZXB0aDsKICAgICBhdXRvIHVwZGF0ZWRQb3NpdGlvbkluZm9ybWF0aW9uID0g
X3Bvc2l0aW9uSW5mb3JtYXRpb247CiAKQEAgLTI4NjUsNiArMjg2NSw3IEBAIC0gKHZvaWQpY2xl
YXJTZWxlY3Rpb24KIC0gKHZvaWQpX3Bvc2l0aW9uSW5mb3JtYXRpb25EaWRDaGFuZ2U6KGNvbnN0
IFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24mKWluZm8KIHsKICAgICBf
b3V0c3RhbmRpbmdQb3NpdGlvbkluZm9ybWF0aW9uUmVxdWVzdCA9IFdURjo6bnVsbG9wdDsKKyAg
ICBfaXNXYWl0aW5nT25Qb3NpdGlvbkluZm9ybWF0aW9uID0gTk87CiAKICAgICBXZWJLaXQ6Oklu
dGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIG5ld0luZm8gPSBpbmZvOwogICAgIG5ld0lu
Zm8ubWVyZ2VDb21wYXRpYmxlT3B0aW9uYWxJbmZvcm1hdGlvbihfcG9zaXRpb25JbmZvcm1hdGlv
bik7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>400493</attachid>
            <date>2020-05-28 12:28:30 -0700</date>
            <delta_ts>2020-05-28 13:10:17 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-212289-20200528122830.patch</filename>
            <type>text/plain</type>
            <size>5073</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiNTQzNjdlYWFlOTM4YzJk
M2IxOGIxOGM1Nzk0MzFjOWMyNzA0NDYuLjBjZjE2MDVmYThlMmE5NGM5N2Q1Y2QxZjQyMDQ3NmNl
ZWZlNjdiZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDUtMjcgIE1lZ2FuIEdh
cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3Qgc2VuZCBh
IHNlY29uZCBzeW5jIHJlcXVlc3QgZm9yIHBvc2l0aXRpb24gaW5mb3JtYXRpb24gdG8gdGhlIHdl
YiBwcm9jZXNzIGlmIHdlIGhhdmUgbm90IHJlY2lldmVkIGluZm9ybWF0aW9uIHNpbmNlIHRoZSBw
cmV2aW91cyBzeW5jIHJlcXVlc3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMTIyODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4NDk0NTc4Pgor
CisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgSWYgd2UgaGF2ZSBz
ZW50IGEgc3luYyByZXF1ZXN0cyB0byB0aGUgd2ViIHByb2Nlc3MgZm9yIHBvc2l0aW9uIGluZm9y
bWF0aW9uLCBhbmQgdGltZWQgb3V0LCBhbmQgaGF2ZSBub3QKKyAgICAgICAgcmVjZWl2ZWQgYSBt
ZXNzYWdlIHdpdGggcG9zaXRpb24gaW5mb3JtYXRpb24gaW4gdGhlIGludGVyaW0sIGRvIG5vdCBz
ZW5kIGFub3RoZXIgc3luYyByZXF1ZXN0LiBUaGUgd2ViCisgICAgICAgIHByb2Nlc3MgaXMgbGlr
ZWx5IHN0aWxsIGh1bmcsIGFuZCB0aGVyZSBpcyBubyByZWFzb24gdG8gaGFuZyB0aGUgVUlQcm9j
ZXNzIGFnYWluIGlmIHdlIHN1c3BlY3QgdGhhdCBpdAorICAgICAgICBpcyB1bmxpa2VseSB0aGF0
IHdlIHdpbGwgcmVjZWl2ZSBhIHJlcGx5LgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv
bnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVu
dFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjbGVhblVwSW50
ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBlbnN1cmVQb3NpdGlvbkluZm9y
bWF0aW9uSXNVcFRvRGF0ZTpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfcG9zaXRpb25J
bmZvcm1hdGlvbkRpZENoYW5nZTpdKToKKwogMjAyMC0wNS0yNiAgQW5keSBFc3RlcyAgPGFlc3Rl
c0BhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSBlbmdpbmVlcmluZyBidWlsZCBvbiBpbnRl
cm5hbCBTREtzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250
ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250
ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggY2M0ZDM2NzUyYTY4NDU5MGZjMzBhYzQxZWNiOWJj
N2Y1ZGJiMzg3Ni4uNmZkMDcyYzNjYWQ0NDZlOTMxNmZiNTRiNGY1NTFmNWM3ODBjNDQ5OCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj
dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50
ZXJhY3Rpb24uaApAQCAtMzU5LDYgKzM1OSw3IEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0
YSB7CiAgICAgQk9PTCBfc2hvd0RlYnVnVGFwSGlnaGxpZ2h0c0ZvckZhc3RDbGlja2luZzsKICAg
ICBCT09MIF90ZXh0SW50ZXJhY3Rpb25EaWRDaGFuZ2VGb2N1c2VkRWxlbWVudDsKICAgICBCT09M
IF90ZXh0SW50ZXJhY3Rpb25Jc0hhcHBlbmluZzsKKyAgICBib29sIF9pc1dhaXRpbmdPblBvc2l0
aW9uSW5mb3JtYXRpb247CiAKICAgICBXZWJDb3JlOjpQb2ludGVySUQgbV9jb21taXRQb3RlbnRp
YWxUYXBQb2ludGVySWQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv
cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p
b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGRmZmU3OWFmY2Q4ZDYzZmFhMWZl
NGMzNzUwZWQ4MzBkNGU2Mzc5Y2QuLjcwNWI3NTdiZGU3NjM0MGQ3NWE1MWMwN2E1ZjE3ZjE0ZTZi
YzFkNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW
aWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u
dGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtOTIwLDYgKzkyMCw3IEBAIC0gKHZvaWQpY2xlYW5V
cEludGVyYWN0aW9uCiAgICAgX2Zvcm1JbnB1dFNlc3Npb24gPSBuaWw7CiAgICAgW19oaWdobGln
aHRWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOwogICAgIF9vdXRzdGFuZGluZ1Bvc2l0aW9uSW5m
b3JtYXRpb25SZXF1ZXN0ID0gV1RGOjpudWxsb3B0OworICAgIF9pc1dhaXRpbmdPblBvc2l0aW9u
SW5mb3JtYXRpb24gPSBOTzsKIAogICAgIF9mb2N1c1JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Np
c3RhbmNlID0gTk87CiAgICAgX2FkZGl0aW9uYWxDb250ZXh0Rm9yU3Ryb25nUGFzc3dvcmRBc3Np
c3RhbmNlID0gbmlsOwpAQCAtMjI0MSwxNiArMjI0MiwxNCBAQCAtIChCT09MKWVuc3VyZVBvc2l0
aW9uSW5mb3JtYXRpb25Jc1VwVG9EYXRlOihXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25S
ZXF1ZQogICAgIGlmICghY29ubmVjdGlvbikKICAgICAgICAgcmV0dXJuIE5POwogCi0gICAgaWYg
KFtzZWxmIF9oYXNWYWxpZE91dHN0YW5kaW5nUG9zaXRpb25JbmZvcm1hdGlvblJlcXVlc3Q6cmVx
dWVzdF0pCi0gICAgICAgIHJldHVybiBjb25uZWN0aW9uLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1l
ZGlhdGVseTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRSZWNlaXZlUG9zaXRpb25JbmZvcm1h
dGlvbj4oX3BhZ2UtPndlYlBhZ2VJRCgpLCAxX3MsIElQQzo6V2FpdEZvck9wdGlvbjo6SW50ZXJy
dXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJpdmVzKTsKLQotICAgIGJvb2wgcmVjZWl2ZWRSZXNw
b25zZSA9IF9wYWdlLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZTo6R2V0UG9zaXRpb25JbmZv
cm1hdGlvbihyZXF1ZXN0KSwgTWVzc2FnZXM6OldlYlBhZ2U6OkdldFBvc2l0aW9uSW5mb3JtYXRp
b246OlJlcGx5KF9wb3NpdGlvbkluZm9ybWF0aW9uKSwgMV9zLCBJUEM6OlNlbmRTeW5jT3B0aW9u
OjpGb3JjZURpc3BhdGNoV2hlbkRlc3RpbmF0aW9uSXNXYWl0aW5nRm9yVW5ib3VuZGVkU3luY1Jl
cGx5KTsKLSAgICBfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uID0gcmVjZWl2ZWRSZXNwb25z
ZSAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5jYW5CZVZhbGlkOworICAgIGlmIChfaXNXYWl0aW5n
T25Qb3NpdGlvbkluZm9ybWF0aW9uKQorICAgICAgICByZXR1cm4gTk87CiAgICAgCi0gICAgLy8g
RklYTUU6IFdlIG5lZWQgdG8gY2xlYW4gdXAgdGhlc2UgaGFuZGxlcnMgaW4gdGhlIGV2ZW50IHRo
YXQgd2UgYXJlIG5vdCBhYmxlIHRvIGNvbGxlY3QgZGF0YSwgb3IgaWYgdGhlIFdlYlByb2Nlc3Mg
Y3Jhc2hlcy4KLSAgICBpZiAoX2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbikKLSAgICAgICAg
W3NlbGYgX2ludm9rZUFuZFJlbW92ZVBlbmRpbmdIYW5kbGVyc1ZhbGlkRm9yQ3VycmVudFBvc2l0
aW9uSW5mb3JtYXRpb25dOwotCisgICAgX2lzV2FpdGluZ09uUG9zaXRpb25JbmZvcm1hdGlvbiA9
IFlFUzsKKyAgICBpZiAoIVtzZWxmIF9oYXNWYWxpZE91dHN0YW5kaW5nUG9zaXRpb25JbmZvcm1h
dGlvblJlcXVlc3Q6cmVxdWVzdF0pCisgICAgICAgIFtzZWxmIHJlcXVlc3RBc3luY2hyb25vdXNQ
b3NpdGlvbkluZm9ybWF0aW9uVXBkYXRlOnJlcXVlc3RdOworICAgIGJvb2wgcmVjZWl2ZWRSZXNw
b25zZSA9IGNvbm5lY3Rpb24tPndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2Vz
OjpXZWJQYWdlUHJveHk6OkRpZFJlY2VpdmVQb3NpdGlvbkluZm9ybWF0aW9uPihfcGFnZS0+d2Vi
UGFnZUlEKCksIDFfcywgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0aW5nSWZTeW5j
TWVzc2FnZUFycml2ZXMpOworICAgIF9oYXNWYWxpZFBvc2l0aW9uSW5mb3JtYXRpb24gPSByZWNl
aXZlZFJlc3BvbnNlICYmIF9wb3NpdGlvbkluZm9ybWF0aW9uLmNhbkJlVmFsaWQ7CiAgICAgcmV0
dXJuIF9oYXNWYWxpZFBvc2l0aW9uSW5mb3JtYXRpb247CiB9CiAKQEAgLTIyODMsNiArMjI4Miw3
IEBAIC0gKHZvaWQpX2ludm9rZUFuZFJlbW92ZVBlbmRpbmdIYW5kbGVyc1ZhbGlkRm9yQ3VycmVu
dFBvc2l0aW9uSW5mb3JtYXRpb24KIHsKICAgICBBU1NFUlQoX2hhc1ZhbGlkUG9zaXRpb25JbmZv
cm1hdGlvbik7CiAKKyAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBjbGVhbiB1cCB0aGVzZSBoYW5k
bGVycyBpbiB0aGUgZXZlbnQgdGhhdCB3ZSBhcmUgbm90IGFibGUgdG8gY29sbGVjdCBkYXRhLCBv
ciBpZiB0aGUgV2ViUHJvY2VzcyBjcmFzaGVzLgogICAgICsrX3Bvc2l0aW9uSW5mb3JtYXRpb25D
YWxsYmFja0RlcHRoOwogICAgIGF1dG8gdXBkYXRlZFBvc2l0aW9uSW5mb3JtYXRpb24gPSBfcG9z
aXRpb25JbmZvcm1hdGlvbjsKIApAQCAtMjg2NSw2ICsyODY1LDcgQEAgLSAodm9pZCljbGVhclNl
bGVjdGlvbgogLSAodm9pZClfcG9zaXRpb25JbmZvcm1hdGlvbkRpZENoYW5nZTooY29uc3QgV2Vi
S2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiYpaW5mbwogewogICAgIF9vdXRz
dGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0ID0gV1RGOjpudWxsb3B0OworICAgIF9p
c1dhaXRpbmdPblBvc2l0aW9uSW5mb3JtYXRpb24gPSBOTzsKIAogICAgIFdlYktpdDo6SW50ZXJh
Y3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24gbmV3SW5mbyA9IGluZm87CiAgICAgbmV3SW5mby5t
ZXJnZUNvbXBhdGlibGVPcHRpb25hbEluZm9ybWF0aW9uKF9wb3NpdGlvbkluZm9ybWF0aW9uKTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>