<?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>213694</bug_id>
          
          <creation_ts>2020-06-27 22:16:25 -0700</creation_ts>
          <short_desc>[GTK] [Win] Build callOnMainThread on WTF::RunLoop rather than on a timer</short_desc>
          <delta_ts>2020-06-29 22:33:43 -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="Geoffrey Garen">ggaren</reporter>
          <assigned_to name="Geoffrey Garen">ggaren</assigned_to>
          <cc>achristensen</cc>
    
    <cc>benjamin</cc>
    
    <cc>bfulgham</cc>
    
    <cc>cdumez</cc>
    
    <cc>cgarcia</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1666843</commentid>
    <comment_count>0</comment_count>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-27 22:16:25 -0700</bug_when>
    <thetext>[GTK] [Win] Build callOnMainThread on WTF::RunLoop rather than on a timer</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666845</commentid>
    <comment_count>1</comment_count>
      <attachid>402986</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-27 22:17:04 -0700</bug_when>
    <thetext>Created attachment 402986
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666846</commentid>
    <comment_count>2</comment_count>
      <attachid>402987</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-27 22:21:16 -0700</bug_when>
    <thetext>Created attachment 402987
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666992</commentid>
    <comment_count>3</comment_count>
      <attachid>402987</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2020-06-29 00:19:18 -0700</bug_when>
    <thetext>Comment on attachment 402987
Patch

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

&gt; Source/WTF/wtf/glib/RunLoopSourcePriority.h:-53
&gt; -    // callOnMainThread.
&gt; -    MainThreadDispatcherTimer = 100,
&gt; -

You should remove the WPE definition below too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1667453</commentid>
    <comment_count>4</comment_count>
      <attachid>403169</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-29 20:52:56 -0700</bug_when>
    <thetext>Created attachment 403169
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1667460</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-29 21:25:55 -0700</bug_when>
    <thetext>Committed r263723: &lt;https://trac.webkit.org/changeset/263723&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 403169.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1667461</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-29 21:26:17 -0700</bug_when>
    <thetext>&lt;rdar://problem/64922555&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1667469</commentid>
    <comment_count>7</comment_count>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-29 21:50:56 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1667470</commentid>
    <comment_count>8</comment_count>
      <attachid>403173</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-29 21:50:57 -0700</bug_when>
    <thetext>Created attachment 403173
Patch for landing 2</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1667475</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-29 22:33:41 -0700</bug_when>
    <thetext>Committed r263726: &lt;https://trac.webkit.org/changeset/263726&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 403173.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402986</attachid>
            <date>2020-06-27 22:17:04 -0700</date>
            <delta_ts>2020-06-27 22:21:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213694-20200627221703.patch</filename>
            <type>text/plain</type>
            <size>4802</size>
            <attacher name="Geoffrey Garen">ggaren</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjM2MzApCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA2LTI3ICBHZW9mZnJleSBHYXJlbiAgPGdn
YXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0dUS10gW1dpbl0gQnVpbGQgY2FsbE9uTWFpblRo
cmVhZCBvbiBXVEY6OlJ1bkxvb3AgcmF0aGVyIHRoYW4gb24gYSB0aW1lcgorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNjk0CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvZ2VuZXJpYy9NYWluVGhy
ZWFkR2VuZXJpYy5jcHA6CisgICAgICAgIChXVEY6OnNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNP
bk1haW5UaHJlYWQpOgorICAgICAgICAoV1RGOjpNYWluVGhyZWFkRGlzcGF0Y2hlcjo6TWFpblRo
cmVhZERpc3BhdGNoZXIpOiBEZWxldGVkLgorICAgICAgICAoV1RGOjpNYWluVGhyZWFkRGlzcGF0
Y2hlcjo6c2NoZWR1bGUpOiBEZWxldGVkLgorICAgICAgICAoV1RGOjpNYWluVGhyZWFkRGlzcGF0
Y2hlcjo6ZmlyZWQpOiBEZWxldGVkLgorICAgICAgICAqIHd0Zi9nbGliL1J1bkxvb3BTb3VyY2VQ
cmlvcml0eS5oOgorICAgICAgICAqIHd0Zi93aW4vTWFpblRocmVhZFdpbi5jcHA6CisgICAgICAg
IChXVEY6OmluaXRpYWxpemVNYWluVGhyZWFkUGxhdGZvcm0pOgorICAgICAgICAoV1RGOjpzY2hl
ZHVsZURpc3BhdGNoRnVuY3Rpb25zT25NYWluVGhyZWFkKToKKyAgICAgICAgKFdURjo6VGhyZWFk
aW5nV2luZG93V25kUHJvYyk6IERlbGV0ZWQuCisKIDIwMjAtMDYtMjcgIFNhbSBXZWluaWcgIDx3
ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIEltcHJvdmUgYXNzZXJ0aW9ucyBpbiBTdHJpbmdQ
YXJzaW5nQnVmZmVyIApJbmRleDogU291cmNlL1dURi93dGYvZ2VuZXJpYy9NYWluVGhyZWFkR2Vu
ZXJpYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvZ2VuZXJpYy9NYWluVGhyZWFk
R2VuZXJpYy5jcHAJKHJldmlzaW9uIDI2MzYzMCkKKysrIFNvdXJjZS9XVEYvd3RmL2dlbmVyaWMv
TWFpblRocmVhZEdlbmVyaWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNywxMCArMzcsNiBAQAog
I2VuZGlmCiAKICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgotI2luY2x1ZGUgPHd0Zi9OZXZlckRl
c3Ryb3llZC5oPgotI2lmIFVTRShHTElCKQotI2luY2x1ZGUgPHd0Zi9nbGliL1J1bkxvb3BTb3Vy
Y2VQcmlvcml0eS5oPgotI2VuZGlmCiAKIG5hbWVzcGFjZSBXVEYgewogCkBAIC00OCwzMSArNDQs
NiBAQCBuYW1lc3BhY2UgV1RGIHsKIHN0YXRpYyBwdGhyZWFkX3QgbWFpblRocmVhZDsKICNlbmRp
ZgogCi1jbGFzcyBNYWluVGhyZWFkRGlzcGF0Y2hlciB7Ci0gICAgV1RGX01BS0VfRkFTVF9BTExP
Q0FURUQ7Ci1wdWJsaWM6Ci0gICAgTWFpblRocmVhZERpc3BhdGNoZXIoKQotICAgICAgICA6IG1f
dGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmTWFpblRocmVhZERpc3BhdGNoZXI6OmZpcmVk
KQotICAgIHsKLSNpZiBVU0UoR0xJQikKLSAgICAgICAgbV90aW1lci5zZXRQcmlvcml0eShSdW5M
b29wU291cmNlUHJpb3JpdHk6Ok1haW5UaHJlYWREaXNwYXRjaGVyVGltZXIpOwotI2VuZGlmCi0g
ICAgfQotCi0gICAgdm9pZCBzY2hlZHVsZSgpCi0gICAgewotICAgICAgICBtX3RpbWVyLnN0YXJ0
T25lU2hvdCgwX3MpOwotICAgIH0KLQotcHJpdmF0ZToKLSAgICB2b2lkIGZpcmVkKCkKLSAgICB7
Ci0gICAgICAgIGRpc3BhdGNoRnVuY3Rpb25zRnJvbU1haW5UaHJlYWQoKTsKLSAgICB9Ci0KLSAg
ICBSdW5Mb29wOjpUaW1lcjxNYWluVGhyZWFkRGlzcGF0Y2hlcj4gbV90aW1lcjsKLX07Ci0KIHZv
aWQgaW5pdGlhbGl6ZU1haW5UaHJlYWRQbGF0Zm9ybSgpCiB7CiAjaWYgIUhBVkUoUFRIUkVBRF9N
QUlOX05QKQpAQCAtOTEsMTAgKzYyLDcgQEAgYm9vbCBpc01haW5UaHJlYWQoKQogCiB2b2lkIHNj
aGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQoKQogewotICAgIC8vIFVzZSBhIFJ1
bkxvb3A6OlRpbWVyIGluc3RlYWQgb2YgUnVuTG9vcDo6ZGlzcGF0Y2goKSB0byBiZSBhYmxlIHRv
IHVzZSBhIGRpZmZlcmVudCBwcmlvcml0eSBhbmQKLSAgICAvLyBhdm9pZCB0aGUgZG91YmxlIHF1
ZXVlIGJlY2F1c2UgZGlzcGF0Y2hPbk1haW5UaHJlYWQgYWxzbyBxdWV1ZXMgdGhlIGZ1bmN0aW9u
cy4KLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8TWFpblRocmVhZERpc3BhdGNoZXI+IGRpc3Bh
dGNoZXI7Ci0gICAgZGlzcGF0Y2hlci5nZXQoKS5zY2hlZHVsZSgpOworICAgIFJ1bkxvb3A6Om1h
aW4oKS5kaXNwYXRjaChkaXNwYXRjaEZ1bmN0aW9uc0Zyb21NYWluVGhyZWFkKTsKIH0KIAogfSAv
LyBuYW1lc3BhY2UgV1RGCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9nbGliL1J1bkxvb3BTb3VyY2VQ
cmlvcml0eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL2dsaWIvUnVuTG9vcFNvdXJj
ZVByaW9yaXR5LmgJKHJldmlzaW9uIDI2MzYzMCkKKysrIFNvdXJjZS9XVEYvd3RmL2dsaWIvUnVu
TG9vcFNvdXJjZVByaW9yaXR5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDkgKzQ4LDYgQEAgZW51
bSBSdW5Mb29wU291cmNlUHJpb3JpdHkgewogICAgIC8vIEdhcmJhZ2UgY29sbGVjdG9yIHRpbWVy
cy4KICAgICBKYXZhc2NyaXB0VGltZXIgPSAyMDAsCiAKLSAgICAvLyBjYWxsT25NYWluVGhyZWFk
LgotICAgIE1haW5UaHJlYWREaXNwYXRjaGVyVGltZXIgPSAxMDAsCi0KICAgICAvLyBNZW1vcnkg
cHJlc3N1cmUgbW9uaXRvci4KICAgICBNZW1vcnlQcmVzc3VyZUhhbmRsZXJUaW1lciA9IC0xMDAs
CiAKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3dpbi9NYWluVGhyZWFkV2luLmNwcAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV1RGL3d0Zi93aW4vTWFpblRocmVhZFdpbi5jcHAJKHJldmlzaW9uIDI2MzYz
MCkKKysrIFNvdXJjZS9XVEYvd3RmL3dpbi9NYWluVGhyZWFkV2luLmNwcAkod29ya2luZyBjb3B5
KQpAQCAtMzcsMzcgKzM3LDExIEBACiAKIG5hbWVzcGFjZSBXVEYgewogCi1zdGF0aWMgSFdORCB0
aHJlYWRpbmdXaW5kb3dIYW5kbGU7Ci1zdGF0aWMgVUlOVCB0aHJlYWRpbmdGaXJlZE1lc3NhZ2U7
Ci1jb25zdCBMUENXU1RSIGtUaHJlYWRpbmdXaW5kb3dDbGFzc05hbWUgPSBMIlRocmVhZGluZ1dp
bmRvd0NsYXNzIjsKIHN0YXRpYyBUaHJlYWRJZGVudGlmaWVyIG1haW5UaHJlYWQgeyAwIH07CiAK
LUxSRVNVTFQgQ0FMTEJBQ0sgVGhyZWFkaW5nV2luZG93V25kUHJvYyhIV05EIGhXbmQsIFVJTlQg
bWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKLXsKLSAgICBpZiAobWVzc2Fn
ZSA9PSB0aHJlYWRpbmdGaXJlZE1lc3NhZ2UpCi0gICAgICAgIGRpc3BhdGNoRnVuY3Rpb25zRnJv
bU1haW5UaHJlYWQoKTsKLSAgICBlbHNlCi0gICAgICAgIHJldHVybiBEZWZXaW5kb3dQcm9jKGhX
bmQsIG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsKLSAgICByZXR1cm4gMDsKLX0KLQogdm9pZCBp
bml0aWFsaXplTWFpblRocmVhZFBsYXRmb3JtKCkKIHsKLSAgICBpZiAodGhyZWFkaW5nV2luZG93
SGFuZGxlKQotICAgICAgICByZXR1cm47Ci0KLSAgICBXTkRDTEFTU1cgd2NleDsKLSAgICBtZW1z
ZXQoJndjZXgsIDAsIHNpemVvZihXTkRDTEFTU1cpKTsKLSAgICB3Y2V4LmxwZm5XbmRQcm9jICAg
ID0gVGhyZWFkaW5nV2luZG93V25kUHJvYzsKLSAgICB3Y2V4Lmxwc3pDbGFzc05hbWUgID0ga1Ro
cmVhZGluZ1dpbmRvd0NsYXNzTmFtZTsKLSAgICBSZWdpc3RlckNsYXNzVygmd2NleCk7Ci0KLSAg
ICB0aHJlYWRpbmdXaW5kb3dIYW5kbGUgPSBDcmVhdGVXaW5kb3dXKGtUaHJlYWRpbmdXaW5kb3dD
bGFzc05hbWUsIG51bGxwdHIsIDAsCi0gICAgICAgIENXX1VTRURFRkFVTFQsIDAsIENXX1VTRURF
RkFVTFQsIDAsIEhXTkRfTUVTU0FHRSwgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0cik7Ci0gICAg
dGhyZWFkaW5nRmlyZWRNZXNzYWdlID0gUmVnaXN0ZXJXaW5kb3dNZXNzYWdlVyhMImNvbS5hcHBs
ZS5XZWJLaXQuTWFpblRocmVhZEZpcmVkIik7Ci0KICAgICBtYWluVGhyZWFkID0gVGhyZWFkOjpj
dXJyZW50SUQoKTsKLQogICAgIFRocmVhZDo6aW5pdGlhbGl6ZUN1cnJlbnRUaHJlYWRJbnRlcm5h
bCgiTWFpbiBUaHJlYWQiKTsKICAgICBSdW5Mb29wOjpyZWdpc3RlclJ1bkxvb3BNZXNzYWdlV2lu
ZG93Q2xhc3MoKTsKIH0KQEAgLTc5LDggKzUzLDcgQEAgYm9vbCBpc01haW5UaHJlYWQoKQogCiB2
b2lkIHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQoKQogewotICAgIEFTU0VS
VCh0aHJlYWRpbmdXaW5kb3dIYW5kbGUpOwotICAgIFBvc3RNZXNzYWdlKHRocmVhZGluZ1dpbmRv
d0hhbmRsZSwgdGhyZWFkaW5nRmlyZWRNZXNzYWdlLCAwLCAwKTsKKyAgICBSdW5Mb29wOjptYWlu
KCkuZGlzcGF0Y2goZGlzcGF0Y2hGdW5jdGlvbnNGcm9tTWFpblRocmVhZCk7CiB9CiAKIH0gLy8g
bmFtZXNwYWNlIFdURgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402987</attachid>
            <date>2020-06-27 22:21:16 -0700</date>
            <delta_ts>2020-06-29 00:19:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213694-20200627222115.patch</filename>
            <type>text/plain</type>
            <size>4978</size>
            <attacher name="Geoffrey Garen">ggaren</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjM2MzApCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTI3ICBHZW9mZnJleSBHYXJlbiAgPGdn
YXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0dUS10gW1dpbl0gQnVpbGQgY2FsbE9uTWFpblRo
cmVhZCBvbiBXVEY6OlJ1bkxvb3AgcmF0aGVyIHRoYW4gb24gYSB0aW1lcgorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNjk0CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgb2YgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzA2MywgRGFyd2luIHBsYXRmb3JtcworICAgICAg
ICB1c2UgdGhlIFJ1bkxvb3AuIExldCdzIG1hdGNoIHRoZW0gZm9yIGNvbnNpc3RlbmN5LCBhbmQg
dG8gZGVsZXRlIHNvbWUKKyAgICAgICAgY29kZS4KKworICAgICAgICAqIHd0Zi9nZW5lcmljL01h
aW5UaHJlYWRHZW5lcmljLmNwcDoKKyAgICAgICAgKFdURjo6c2NoZWR1bGVEaXNwYXRjaEZ1bmN0
aW9uc09uTWFpblRocmVhZCk6CisgICAgICAgIChXVEY6Ok1haW5UaHJlYWREaXNwYXRjaGVyOjpN
YWluVGhyZWFkRGlzcGF0Y2hlcik6IERlbGV0ZWQuCisgICAgICAgIChXVEY6Ok1haW5UaHJlYWRE
aXNwYXRjaGVyOjpzY2hlZHVsZSk6IERlbGV0ZWQuCisgICAgICAgIChXVEY6Ok1haW5UaHJlYWRE
aXNwYXRjaGVyOjpmaXJlZCk6IERlbGV0ZWQuCisgICAgICAgICogd3RmL2dsaWIvUnVuTG9vcFNv
dXJjZVByaW9yaXR5Lmg6CisgICAgICAgICogd3RmL3dpbi9NYWluVGhyZWFkV2luLmNwcDoKKyAg
ICAgICAgKFdURjo6aW5pdGlhbGl6ZU1haW5UaHJlYWRQbGF0Zm9ybSk6CisgICAgICAgIChXVEY6
OnNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQpOgorICAgICAgICAoV1RGOjpU
aHJlYWRpbmdXaW5kb3dXbmRQcm9jKTogRGVsZXRlZC4KKwogMjAyMC0wNi0yNyAgU2FtIFdlaW5p
ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgSW1wcm92ZSBhc3NlcnRpb25zIGluIFN0
cmluZ1BhcnNpbmdCdWZmZXIgCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9nZW5lcmljL01haW5UaHJl
YWRHZW5lcmljLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9nZW5lcmljL01haW5U
aHJlYWRHZW5lcmljLmNwcAkocmV2aXNpb24gMjYzNjMwKQorKysgU291cmNlL1dURi93dGYvZ2Vu
ZXJpYy9NYWluVGhyZWFkR2VuZXJpYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3LDEwICszNyw2
IEBACiAjZW5kaWYKIAogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+Ci0jaW5jbHVkZSA8d3RmL05l
dmVyRGVzdHJveWVkLmg+Ci0jaWYgVVNFKEdMSUIpCi0jaW5jbHVkZSA8d3RmL2dsaWIvUnVuTG9v
cFNvdXJjZVByaW9yaXR5Lmg+Ci0jZW5kaWYKIAogbmFtZXNwYWNlIFdURiB7CiAKQEAgLTQ4LDMx
ICs0NCw2IEBAIG5hbWVzcGFjZSBXVEYgewogc3RhdGljIHB0aHJlYWRfdCBtYWluVGhyZWFkOwog
I2VuZGlmCiAKLWNsYXNzIE1haW5UaHJlYWREaXNwYXRjaGVyIHsKLSAgICBXVEZfTUFLRV9GQVNU
X0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAgICBNYWluVGhyZWFkRGlzcGF0Y2hlcigpCi0gICAgICAg
IDogbV90aW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZNYWluVGhyZWFkRGlzcGF0Y2hlcjo6
ZmlyZWQpCi0gICAgewotI2lmIFVTRShHTElCKQotICAgICAgICBtX3RpbWVyLnNldFByaW9yaXR5
KFJ1bkxvb3BTb3VyY2VQcmlvcml0eTo6TWFpblRocmVhZERpc3BhdGNoZXJUaW1lcik7Ci0jZW5k
aWYKLSAgICB9Ci0KLSAgICB2b2lkIHNjaGVkdWxlKCkKLSAgICB7Ci0gICAgICAgIG1fdGltZXIu
c3RhcnRPbmVTaG90KDBfcyk7Ci0gICAgfQotCi1wcml2YXRlOgotICAgIHZvaWQgZmlyZWQoKQot
ICAgIHsKLSAgICAgICAgZGlzcGF0Y2hGdW5jdGlvbnNGcm9tTWFpblRocmVhZCgpOwotICAgIH0K
LQotICAgIFJ1bkxvb3A6OlRpbWVyPE1haW5UaHJlYWREaXNwYXRjaGVyPiBtX3RpbWVyOwotfTsK
LQogdm9pZCBpbml0aWFsaXplTWFpblRocmVhZFBsYXRmb3JtKCkKIHsKICNpZiAhSEFWRShQVEhS
RUFEX01BSU5fTlApCkBAIC05MSwxMCArNjIsNyBAQCBib29sIGlzTWFpblRocmVhZCgpCiAKIHZv
aWQgc2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRocmVhZCgpCiB7Ci0gICAgLy8gVXNl
IGEgUnVuTG9vcDo6VGltZXIgaW5zdGVhZCBvZiBSdW5Mb29wOjpkaXNwYXRjaCgpIHRvIGJlIGFi
bGUgdG8gdXNlIGEgZGlmZmVyZW50IHByaW9yaXR5IGFuZAotICAgIC8vIGF2b2lkIHRoZSBkb3Vi
bGUgcXVldWUgYmVjYXVzZSBkaXNwYXRjaE9uTWFpblRocmVhZCBhbHNvIHF1ZXVlcyB0aGUgZnVu
Y3Rpb25zLgotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxNYWluVGhyZWFkRGlzcGF0Y2hlcj4g
ZGlzcGF0Y2hlcjsKLSAgICBkaXNwYXRjaGVyLmdldCgpLnNjaGVkdWxlKCk7CisgICAgUnVuTG9v
cDo6bWFpbigpLmRpc3BhdGNoKGRpc3BhdGNoRnVuY3Rpb25zRnJvbU1haW5UaHJlYWQpOwogfQog
CiB9IC8vIG5hbWVzcGFjZSBXVEYKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL2dsaWIvUnVuTG9vcFNv
dXJjZVByaW9yaXR5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvZ2xpYi9SdW5Mb29w
U291cmNlUHJpb3JpdHkuaAkocmV2aXNpb24gMjYzNjMwKQorKysgU291cmNlL1dURi93dGYvZ2xp
Yi9SdW5Mb29wU291cmNlUHJpb3JpdHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsOSArNDgsNiBA
QCBlbnVtIFJ1bkxvb3BTb3VyY2VQcmlvcml0eSB7CiAgICAgLy8gR2FyYmFnZSBjb2xsZWN0b3Ig
dGltZXJzLgogICAgIEphdmFzY3JpcHRUaW1lciA9IDIwMCwKIAotICAgIC8vIGNhbGxPbk1haW5U
aHJlYWQuCi0gICAgTWFpblRocmVhZERpc3BhdGNoZXJUaW1lciA9IDEwMCwKLQogICAgIC8vIE1l
bW9yeSBwcmVzc3VyZSBtb25pdG9yLgogICAgIE1lbW9yeVByZXNzdXJlSGFuZGxlclRpbWVyID0g
LTEwMCwKIApJbmRleDogU291cmNlL1dURi93dGYvd2luL01haW5UaHJlYWRXaW4uY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3dpbi9NYWluVGhyZWFkV2luLmNwcAkocmV2aXNpb24g
MjYzNjMwKQorKysgU291cmNlL1dURi93dGYvd2luL01haW5UaHJlYWRXaW4uY3BwCSh3b3JraW5n
IGNvcHkpCkBAIC0zNywzNyArMzcsMTEgQEAKIAogbmFtZXNwYWNlIFdURiB7CiAKLXN0YXRpYyBI
V05EIHRocmVhZGluZ1dpbmRvd0hhbmRsZTsKLXN0YXRpYyBVSU5UIHRocmVhZGluZ0ZpcmVkTWVz
c2FnZTsKLWNvbnN0IExQQ1dTVFIga1RocmVhZGluZ1dpbmRvd0NsYXNzTmFtZSA9IEwiVGhyZWFk
aW5nV2luZG93Q2xhc3MiOwogc3RhdGljIFRocmVhZElkZW50aWZpZXIgbWFpblRocmVhZCB7IDAg
fTsKIAotTFJFU1VMVCBDQUxMQkFDSyBUaHJlYWRpbmdXaW5kb3dXbmRQcm9jKEhXTkQgaFduZCwg
VUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQotewotICAgIGlmICht
ZXNzYWdlID09IHRocmVhZGluZ0ZpcmVkTWVzc2FnZSkKLSAgICAgICAgZGlzcGF0Y2hGdW5jdGlv
bnNGcm9tTWFpblRocmVhZCgpOwotICAgIGVsc2UKLSAgICAgICAgcmV0dXJuIERlZldpbmRvd1By
b2MoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOwotICAgIHJldHVybiAwOwotfQotCiB2
b2lkIGluaXRpYWxpemVNYWluVGhyZWFkUGxhdGZvcm0oKQogewotICAgIGlmICh0aHJlYWRpbmdX
aW5kb3dIYW5kbGUpCi0gICAgICAgIHJldHVybjsKLQotICAgIFdORENMQVNTVyB3Y2V4OwotICAg
IG1lbXNldCgmd2NleCwgMCwgc2l6ZW9mKFdORENMQVNTVykpOwotICAgIHdjZXgubHBmblduZFBy
b2MgICAgPSBUaHJlYWRpbmdXaW5kb3dXbmRQcm9jOwotICAgIHdjZXgubHBzekNsYXNzTmFtZSAg
PSBrVGhyZWFkaW5nV2luZG93Q2xhc3NOYW1lOwotICAgIFJlZ2lzdGVyQ2xhc3NXKCZ3Y2V4KTsK
LQotICAgIHRocmVhZGluZ1dpbmRvd0hhbmRsZSA9IENyZWF0ZVdpbmRvd1coa1RocmVhZGluZ1dp
bmRvd0NsYXNzTmFtZSwgbnVsbHB0ciwgMCwKLSAgICAgICAgQ1dfVVNFREVGQVVMVCwgMCwgQ1df
VVNFREVGQVVMVCwgMCwgSFdORF9NRVNTQUdFLCBudWxscHRyLCBudWxscHRyLCBudWxscHRyKTsK
LSAgICB0aHJlYWRpbmdGaXJlZE1lc3NhZ2UgPSBSZWdpc3RlcldpbmRvd01lc3NhZ2VXKEwiY29t
LmFwcGxlLldlYktpdC5NYWluVGhyZWFkRmlyZWQiKTsKLQogICAgIG1haW5UaHJlYWQgPSBUaHJl
YWQ6OmN1cnJlbnRJRCgpOwotCiAgICAgVGhyZWFkOjppbml0aWFsaXplQ3VycmVudFRocmVhZElu
dGVybmFsKCJNYWluIFRocmVhZCIpOwogICAgIFJ1bkxvb3A6OnJlZ2lzdGVyUnVuTG9vcE1lc3Nh
Z2VXaW5kb3dDbGFzcygpOwogfQpAQCAtNzksOCArNTMsNyBAQCBib29sIGlzTWFpblRocmVhZCgp
CiAKIHZvaWQgc2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRocmVhZCgpCiB7Ci0gICAg
QVNTRVJUKHRocmVhZGluZ1dpbmRvd0hhbmRsZSk7Ci0gICAgUG9zdE1lc3NhZ2UodGhyZWFkaW5n
V2luZG93SGFuZGxlLCB0aHJlYWRpbmdGaXJlZE1lc3NhZ2UsIDAsIDApOworICAgIFJ1bkxvb3A6
Om1haW4oKS5kaXNwYXRjaChkaXNwYXRjaEZ1bmN0aW9uc0Zyb21NYWluVGhyZWFkKTsKIH0KIAog
fSAvLyBuYW1lc3BhY2UgV1RGCg==
</data>
<flag name="review"
          id="418380"
          type_id="1"
          status="+"
          setter="cgarcia"
    />
    <flag name="commit-queue"
          id="418393"
          type_id="3"
          status="-"
          setter="cgarcia"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>403169</attachid>
            <date>2020-06-29 20:52:56 -0700</date>
            <delta_ts>2020-06-29 21:25:56 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-213694-20200629205255.patch</filename>
            <type>text/plain</type>
            <size>5840</size>
            <attacher name="Geoffrey Garen">ggaren</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjM3MjEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTI5ICBHZW9mZnJleSBHYXJlbiAgPGdn
YXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0dUS10gW1dpbl0gQnVpbGQgY2FsbE9uTWFpblRo
cmVhZCBvbiBXVEY6OlJ1bkxvb3AgcmF0aGVyIHRoYW4gb24gYSB0aW1lcgorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNjk0CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgQ2FybG9zIEdhcmNpYSBDYW1wb3MuCisKKyAgICAgICAgQXMgb2YgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzA2MywgRGFyd2luIHBsYXRmb3Jtcwor
ICAgICAgICB1c2UgdGhlIFJ1bkxvb3AuIExldCdzIG1hdGNoIHRoZW0gZm9yIGNvbnNpc3RlbmN5
LCBhbmQgdG8gZGVsZXRlIHNvbWUKKyAgICAgICAgY29kZS4KKworICAgICAgICAqIHd0Zi9nZW5l
cmljL01haW5UaHJlYWRHZW5lcmljLmNwcDoKKyAgICAgICAgKFdURjo6c2NoZWR1bGVEaXNwYXRj
aEZ1bmN0aW9uc09uTWFpblRocmVhZCk6CisgICAgICAgIChXVEY6Ok1haW5UaHJlYWREaXNwYXRj
aGVyOjpNYWluVGhyZWFkRGlzcGF0Y2hlcik6IERlbGV0ZWQuCisgICAgICAgIChXVEY6Ok1haW5U
aHJlYWREaXNwYXRjaGVyOjpzY2hlZHVsZSk6IERlbGV0ZWQuCisgICAgICAgIChXVEY6Ok1haW5U
aHJlYWREaXNwYXRjaGVyOjpmaXJlZCk6IERlbGV0ZWQuCisgICAgICAgICogd3RmL2dsaWIvUnVu
TG9vcFNvdXJjZVByaW9yaXR5Lmg6CisgICAgICAgICogd3RmL3dpbi9NYWluVGhyZWFkV2luLmNw
cDoKKyAgICAgICAgKFdURjo6aW5pdGlhbGl6ZU1haW5UaHJlYWRQbGF0Zm9ybSk6CisgICAgICAg
IChXVEY6OnNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQpOgorICAgICAgICAo
V1RGOjpUaHJlYWRpbmdXaW5kb3dXbmRQcm9jKTogRGVsZXRlZC4KKwogMjAyMC0wNi0yOSAgR3Vv
d2VpIFlhbmcgIDxndW93ZWlfeWFuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkaW5nIEV4cGVy
aW1lbnRhbCBGZWF0dXJlIEZsYWdzIGZvciBDb3JlSW1hZ2UgYmFja2VkIFNWRy9DU1MgRmlsdGVy
cwpJbmRleDogU291cmNlL1dURi93dGYvY2YvUnVuTG9vcENGLmNwcAo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT
b3VyY2UvV1RGL3d0Zi9jZi9SdW5Mb29wQ0YuY3BwCShyZXZpc2lvbiAyNjM3MjEpCisrKyBTb3Vy
Y2UvV1RGL3d0Zi9jZi9SdW5Mb29wQ0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MywxMSArODMs
MTUgQEAgdm9pZCBSdW5Mb29wOjpzdG9wKCkKIAogLy8gUnVuTG9vcDo6VGltZXIKIAotdm9pZCBS
dW5Mb29wOjpUaW1lckJhc2U6OnRpbWVyRmlyZWQoQ0ZSdW5Mb29wVGltZXJSZWYsIHZvaWQqIGNv
bnRleHQpCit2b2lkIFJ1bkxvb3A6OlRpbWVyQmFzZTo6dGltZXJGaXJlZChDRlJ1bkxvb3BUaW1l
clJlZiBjZlRpbWVyLCB2b2lkKiBjb250ZXh0KQogewogICAgIFRpbWVyQmFzZSogdGltZXIgPSBz
dGF0aWNfY2FzdDxUaW1lckJhc2UqPihjb250ZXh0KTsKIAogICAgIEF1dG9kcmFpbmVkUG9vbCBw
b29sOworCisgICAgaWYgKCFDRlJ1bkxvb3BUaW1lckRvZXNSZXBlYXQoY2ZUaW1lcikpCisgICAg
ICAgIHRpbWVyLT5zdG9wKCk7CisKICAgICB0aW1lci0+ZmlyZWQoKTsKIH0KIApJbmRleDogU291
cmNlL1dURi93dGYvZ2VuZXJpYy9NYWluVGhyZWFkR2VuZXJpYy5jcHAKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dURi93dGYvZ2VuZXJpYy9NYWluVGhyZWFkR2VuZXJpYy5jcHAJKHJldmlzaW9uIDI2
MzcyMSkKKysrIFNvdXJjZS9XVEYvd3RmL2dlbmVyaWMvTWFpblRocmVhZEdlbmVyaWMuY3BwCSh3
b3JraW5nIGNvcHkpCkBAIC0zNywxMCArMzcsNiBAQAogI2VuZGlmCiAKICNpbmNsdWRlIDx3dGYv
UnVuTG9vcC5oPgotI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgotI2lmIFVTRShHTElC
KQotI2luY2x1ZGUgPHd0Zi9nbGliL1J1bkxvb3BTb3VyY2VQcmlvcml0eS5oPgotI2VuZGlmCiAK
IG5hbWVzcGFjZSBXVEYgewogCkBAIC00OCwzMSArNDQsNiBAQCBuYW1lc3BhY2UgV1RGIHsKIHN0
YXRpYyBwdGhyZWFkX3QgbWFpblRocmVhZDsKICNlbmRpZgogCi1jbGFzcyBNYWluVGhyZWFkRGlz
cGF0Y2hlciB7Ci0gICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7Ci1wdWJsaWM6Ci0gICAgTWFp
blRocmVhZERpc3BhdGNoZXIoKQotICAgICAgICA6IG1fdGltZXIoUnVuTG9vcDo6bWFpbigpLCB0
aGlzLCAmTWFpblRocmVhZERpc3BhdGNoZXI6OmZpcmVkKQotICAgIHsKLSNpZiBVU0UoR0xJQikK
LSAgICAgICAgbV90aW1lci5zZXRQcmlvcml0eShSdW5Mb29wU291cmNlUHJpb3JpdHk6Ok1haW5U
aHJlYWREaXNwYXRjaGVyVGltZXIpOwotI2VuZGlmCi0gICAgfQotCi0gICAgdm9pZCBzY2hlZHVs
ZSgpCi0gICAgewotICAgICAgICBtX3RpbWVyLnN0YXJ0T25lU2hvdCgwX3MpOwotICAgIH0KLQot
cHJpdmF0ZToKLSAgICB2b2lkIGZpcmVkKCkKLSAgICB7Ci0gICAgICAgIGRpc3BhdGNoRnVuY3Rp
b25zRnJvbU1haW5UaHJlYWQoKTsKLSAgICB9Ci0KLSAgICBSdW5Mb29wOjpUaW1lcjxNYWluVGhy
ZWFkRGlzcGF0Y2hlcj4gbV90aW1lcjsKLX07Ci0KIHZvaWQgaW5pdGlhbGl6ZU1haW5UaHJlYWRQ
bGF0Zm9ybSgpCiB7CiAjaWYgIUhBVkUoUFRIUkVBRF9NQUlOX05QKQpAQCAtOTEsMTAgKzYyLDcg
QEAgYm9vbCBpc01haW5UaHJlYWQoKQogCiB2b2lkIHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNP
bk1haW5UaHJlYWQoKQogewotICAgIC8vIFVzZSBhIFJ1bkxvb3A6OlRpbWVyIGluc3RlYWQgb2Yg
UnVuTG9vcDo6ZGlzcGF0Y2goKSB0byBiZSBhYmxlIHRvIHVzZSBhIGRpZmZlcmVudCBwcmlvcml0
eSBhbmQKLSAgICAvLyBhdm9pZCB0aGUgZG91YmxlIHF1ZXVlIGJlY2F1c2UgZGlzcGF0Y2hPbk1h
aW5UaHJlYWQgYWxzbyBxdWV1ZXMgdGhlIGZ1bmN0aW9ucy4KLSAgICBzdGF0aWMgTmV2ZXJEZXN0
cm95ZWQ8TWFpblRocmVhZERpc3BhdGNoZXI+IGRpc3BhdGNoZXI7Ci0gICAgZGlzcGF0Y2hlci5n
ZXQoKS5zY2hlZHVsZSgpOworICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChkaXNwYXRjaEZ1
bmN0aW9uc0Zyb21NYWluVGhyZWFkKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV1RGCkluZGV4OiBT
b3VyY2UvV1RGL3d0Zi9nbGliL1J1bkxvb3BTb3VyY2VQcmlvcml0eS5oCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFNvdXJjZS9XVEYvd3RmL2dsaWIvUnVuTG9vcFNvdXJjZVByaW9yaXR5LmgJKHJldmlzaW9uIDI2
MzcyMSkKKysrIFNvdXJjZS9XVEYvd3RmL2dsaWIvUnVuTG9vcFNvdXJjZVByaW9yaXR5LmgJKHdv
cmtpbmcgY29weSkKQEAgLTQ4LDkgKzQ4LDYgQEAgZW51bSBSdW5Mb29wU291cmNlUHJpb3JpdHkg
ewogICAgIC8vIEdhcmJhZ2UgY29sbGVjdG9yIHRpbWVycy4KICAgICBKYXZhc2NyaXB0VGltZXIg
PSAyMDAsCiAKLSAgICAvLyBjYWxsT25NYWluVGhyZWFkLgotICAgIE1haW5UaHJlYWREaXNwYXRj
aGVyVGltZXIgPSAxMDAsCi0KICAgICAvLyBNZW1vcnkgcHJlc3N1cmUgbW9uaXRvci4KICAgICBN
ZW1vcnlQcmVzc3VyZUhhbmRsZXJUaW1lciA9IC0xMDAsCiAKQEAgLTg4LDggKzg1LDYgQEAgZW51
bSBSdW5Mb29wU291cmNlUHJpb3JpdHkgewogICAgIFJ1bkxvb3BEaXNwYXRjaGVyID0gMCwKICAg
ICBSdW5Mb29wVGltZXIgPSAwLAogCi0gICAgTWFpblRocmVhZERpc3BhdGNoZXJUaW1lciA9IDEw
LAotCiAgICAgTWVtb3J5UHJlc3N1cmVIYW5kbGVyVGltZXIgPSAtMTAsCiAKICAgICBKYXZhc2Ny
aXB0VGltZXIgPSAxMCwKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3dpbi9NYWluVGhyZWFkV2luLmNw
cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi93aW4vTWFpblRocmVhZFdpbi5jcHAJKHJl
dmlzaW9uIDI2MzcyMSkKKysrIFNvdXJjZS9XVEYvd3RmL3dpbi9NYWluVGhyZWFkV2luLmNwcAko
d29ya2luZyBjb3B5KQpAQCAtMzcsMzcgKzM3LDExIEBACiAKIG5hbWVzcGFjZSBXVEYgewogCi1z
dGF0aWMgSFdORCB0aHJlYWRpbmdXaW5kb3dIYW5kbGU7Ci1zdGF0aWMgVUlOVCB0aHJlYWRpbmdG
aXJlZE1lc3NhZ2U7Ci1jb25zdCBMUENXU1RSIGtUaHJlYWRpbmdXaW5kb3dDbGFzc05hbWUgPSBM
IlRocmVhZGluZ1dpbmRvd0NsYXNzIjsKIHN0YXRpYyBUaHJlYWRJZGVudGlmaWVyIG1haW5UaHJl
YWQgeyAwIH07CiAKLUxSRVNVTFQgQ0FMTEJBQ0sgVGhyZWFkaW5nV2luZG93V25kUHJvYyhIV05E
IGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKLXsKLSAg
ICBpZiAobWVzc2FnZSA9PSB0aHJlYWRpbmdGaXJlZE1lc3NhZ2UpCi0gICAgICAgIGRpc3BhdGNo
RnVuY3Rpb25zRnJvbU1haW5UaHJlYWQoKTsKLSAgICBlbHNlCi0gICAgICAgIHJldHVybiBEZWZX
aW5kb3dQcm9jKGhXbmQsIG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsKLSAgICByZXR1cm4gMDsK
LX0KLQogdm9pZCBpbml0aWFsaXplTWFpblRocmVhZFBsYXRmb3JtKCkKIHsKLSAgICBpZiAodGhy
ZWFkaW5nV2luZG93SGFuZGxlKQotICAgICAgICByZXR1cm47Ci0KLSAgICBXTkRDTEFTU1cgd2Nl
eDsKLSAgICBtZW1zZXQoJndjZXgsIDAsIHNpemVvZihXTkRDTEFTU1cpKTsKLSAgICB3Y2V4Lmxw
Zm5XbmRQcm9jICAgID0gVGhyZWFkaW5nV2luZG93V25kUHJvYzsKLSAgICB3Y2V4Lmxwc3pDbGFz
c05hbWUgID0ga1RocmVhZGluZ1dpbmRvd0NsYXNzTmFtZTsKLSAgICBSZWdpc3RlckNsYXNzVygm
d2NleCk7Ci0KLSAgICB0aHJlYWRpbmdXaW5kb3dIYW5kbGUgPSBDcmVhdGVXaW5kb3dXKGtUaHJl
YWRpbmdXaW5kb3dDbGFzc05hbWUsIG51bGxwdHIsIDAsCi0gICAgICAgIENXX1VTRURFRkFVTFQs
IDAsIENXX1VTRURFRkFVTFQsIDAsIEhXTkRfTUVTU0FHRSwgbnVsbHB0ciwgbnVsbHB0ciwgbnVs
bHB0cik7Ci0gICAgdGhyZWFkaW5nRmlyZWRNZXNzYWdlID0gUmVnaXN0ZXJXaW5kb3dNZXNzYWdl
VyhMImNvbS5hcHBsZS5XZWJLaXQuTWFpblRocmVhZEZpcmVkIik7Ci0KICAgICBtYWluVGhyZWFk
ID0gVGhyZWFkOjpjdXJyZW50SUQoKTsKLQogICAgIFRocmVhZDo6aW5pdGlhbGl6ZUN1cnJlbnRU
aHJlYWRJbnRlcm5hbCgiTWFpbiBUaHJlYWQiKTsKICAgICBSdW5Mb29wOjpyZWdpc3RlclJ1bkxv
b3BNZXNzYWdlV2luZG93Q2xhc3MoKTsKIH0KQEAgLTc5LDggKzUzLDcgQEAgYm9vbCBpc01haW5U
aHJlYWQoKQogCiB2b2lkIHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQoKQog
ewotICAgIEFTU0VSVCh0aHJlYWRpbmdXaW5kb3dIYW5kbGUpOwotICAgIFBvc3RNZXNzYWdlKHRo
cmVhZGluZ1dpbmRvd0hhbmRsZSwgdGhyZWFkaW5nRmlyZWRNZXNzYWdlLCAwLCAwKTsKKyAgICBS
dW5Mb29wOjptYWluKCkuZGlzcGF0Y2goZGlzcGF0Y2hGdW5jdGlvbnNGcm9tTWFpblRocmVhZCk7
CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdURgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>403173</attachid>
            <date>2020-06-29 21:50:57 -0700</date>
            <delta_ts>2020-06-29 22:33:42 -0700</delta_ts>
            <desc>Patch for landing 2</desc>
            <filename>bug-213694-20200629215056.patch</filename>
            <type>text/plain</type>
            <size>1201</size>
            <attacher name="Geoffrey Garen">ggaren</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNjM3MjQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDEwIEBACisyMDIwLTA2LTI5ICBHZW9mZnJleSBHYXJlbiAgPGdn
YXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgYW4gYWNj
aWRlbnRhbCBjaGFuZ2UgZnJvbSByMjYzNzIzLgorCisgICAgICAgICogd3RmL2NmL1J1bkxvb3BD
Ri5jcHA6CisgICAgICAgIChXVEY6OlJ1bkxvb3A6OlRpbWVyQmFzZTo6dGltZXJGaXJlZCk6CisK
IDIwMjAtMDYtMjkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4K
IAogICAgICAgICBNYWtlIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIFNQSSBmb3Ig
SFNUUyBzdG9yYWdlIHRvIHJlcGxhY2UgX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmhzdHNT
dG9yYWdlRGlyZWN0b3J5CkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9jZi9SdW5Mb29wQ0YuY3BwCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL2NmL1J1bkxvb3BDRi5jcHAJKHJldmlzaW9uIDI2
MzcyNCkKKysrIFNvdXJjZS9XVEYvd3RmL2NmL1J1bkxvb3BDRi5jcHAJKHdvcmtpbmcgY29weSkK
QEAgLTgzLDE1ICs4MywxMSBAQCB2b2lkIFJ1bkxvb3A6OnN0b3AoKQogCiAvLyBSdW5Mb29wOjpU
aW1lcgogCi12b2lkIFJ1bkxvb3A6OlRpbWVyQmFzZTo6dGltZXJGaXJlZChDRlJ1bkxvb3BUaW1l
clJlZiBjZlRpbWVyLCB2b2lkKiBjb250ZXh0KQordm9pZCBSdW5Mb29wOjpUaW1lckJhc2U6OnRp
bWVyRmlyZWQoQ0ZSdW5Mb29wVGltZXJSZWYsIHZvaWQqIGNvbnRleHQpCiB7CiAgICAgVGltZXJC
YXNlKiB0aW1lciA9IHN0YXRpY19jYXN0PFRpbWVyQmFzZSo+KGNvbnRleHQpOwogCiAgICAgQXV0
b2RyYWluZWRQb29sIHBvb2w7Ci0KLSAgICBpZiAoIUNGUnVuTG9vcFRpbWVyRG9lc1JlcGVhdChj
ZlRpbWVyKSkKLSAgICAgICAgdGltZXItPnN0b3AoKTsKLQogICAgIHRpbWVyLT5maXJlZCgpOwog
fQogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>