<?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>226588</bug_id>
          
          <creation_ts>2021-06-03 10:28:30 -0700</creation_ts>
          <short_desc>[macOS] Image extraction preview panel should automatically close when the web view is unparented</short_desc>
          <delta_ts>2021-06-03 16:08:13 -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>Platform</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="Wenson Hsieh">wenson_hsieh</reporter>
          <assigned_to name="Wenson Hsieh">wenson_hsieh</assigned_to>
          <cc>aestes</cc>
    
    <cc>hi</cc>
    
    <cc>megan_gardner</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1766432</commentid>
    <comment_count>0</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-06-03 10:28:30 -0700</bug_when>
    <thetext>rdar://77062762</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1766438</commentid>
    <comment_count>1</comment_count>
      <attachid>430482</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-06-03 10:51:01 -0700</bug_when>
    <thetext>Created attachment 430482
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1766456</commentid>
    <comment_count>2</comment_count>
      <attachid>430486</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-06-03 11:12:14 -0700</bug_when>
    <thetext>Created attachment 430486
Handle WP termination as well</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1766458</commentid>
    <comment_count>3</comment_count>
      <attachid>430486</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-06-03 11:14:09 -0700</bug_when>
    <thetext>Comment on attachment 430486
Handle WP termination as well

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

&gt; Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:2408
&gt; +        m_page-&gt;closeSharedPreviewPanelIfNecessary();

maybe stick this right next to dismissContentRelativeChildWindowsWithAnimation above?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1766460</commentid>
    <comment_count>4</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-06-03 11:15:02 -0700</bug_when>
    <thetext>Thanks for the review!

(In reply to Tim Horton from comment #3)
&gt; Comment on attachment 430486 [details]
&gt; Handle WP termination as well
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=430486&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:2408
&gt; &gt; +        m_page-&gt;closeSharedPreviewPanelIfNecessary();
&gt; 
&gt; maybe stick this right next to
&gt; dismissContentRelativeChildWindowsWithAnimation above?

Makes sense — moved to right after the `dismissContentRelativeChildWindowsWithAnimation(false);`.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1766462</commentid>
    <comment_count>5</comment_count>
      <attachid>430488</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-06-03 11:16:31 -0700</bug_when>
    <thetext>Created attachment 430488
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1766480</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-03 12:40:06 -0700</bug_when>
    <thetext>Committed r278414 (238439@main): &lt;https://commits.webkit.org/238439@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 430488.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430482</attachid>
            <date>2021-06-03 10:51:01 -0700</date>
            <delta_ts>2021-06-03 11:12:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226588-20210603105100.patch</filename>
            <type>text/plain</type>
            <size>10840</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4Mzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFlMGU3ZDNlYTM1MGNjMmNl
YzFiNjEwMWI5ZGI1MTAwM2FjYWZmNmYuLjAxODBhOWJjNzI3YzNiMzk2NWJiZDc5NGE0NTlkMjMz
N2ZlYThiOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTIgQEAKKzIwMjEtMDYtMDMgIFdlbnNvbiBI
c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBJbWFnZSBl
eHRyYWN0aW9uIHByZXZpZXcgcGFuZWwgc2hvdWxkIGF1dG9tYXRpY2FsbHkgY2xvc2Ugd2hlbiB0
aGUgd2ViIHZpZXcgaXMgdW5wYXJlbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NTg4CisgICAgICAgIHJkYXI6Ly83NzA2Mjc2MgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIHNvbWUg
bG9naWMgZm9yIHByZXNlbnRpbmcgdGhlIHByZXZpZXcgcGFuZWwuIFNlZSBiZWxvdyBmb3IgbW9y
ZSBkZXRhaWxzLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tOgor
ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dmlld0RpZE1vdmVUb1dpbmRvdyk6CisKKyAg
ICAgICAgV2hlbiB0aGUgd2ViIHZpZXcgaXMgcmVtb3ZlZCBmcm9tIHRoZSB2aWV3IGhpZXJhcmNo
eSAoaS5lLiB3aGVuIHRoZSB2aWV3IGlzIG1vdmVkIHRvIGEgYG5pbGAgd2luZG93KSwgY2FsbCBp
bnRvCisgICAgICAgIGBjbG9zZVNoYXJlZFByZXZpZXdQYW5lbElmTmVjZXNzYXJ5YCB0byBkaXNt
aXNzIHRoZSBzaGFyZWQgcHJldmlldyBwYW5lbCBpZiB3ZSdyZSBjdXJyZW50bHkgY29udHJvbGxp
bmcgaXRzCisgICAgICAgIHByZXNlbnRhdGlvbiBmb3IgdGhlIHB1cnBvc2VzIG9mIGltYWdlIGV4
dHJhY3Rpb24uCisKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmJlZ2luUHJldmlld1Bh
bmVsQ29udHJvbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjplbmRQcmV2aWV3UGFu
ZWxDb250cm9sKToKKworICAgICAgICBBZGQgbW9yZSBwbHVtYmluZyBpbnRvIFdlYlBhZ2VQcm94
eSB0byBiZWdpbiBhbmQgZW5kIHByZXZpZXcgcGFuZWwgY29udHJvbDsgdGhpcyBhbGxvd3MgdXMg
dG8gYXZvaWQgaGF2aW5nIHRvCisgICAgICAgIGV4cG9zZSBhIHNlcGFyYXRlIG1ldGhvZCB0byBy
ZXNldCBXZWJQYWdlUHJveHkncyBgbV9pbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlcmAg
YW5kIGNhbGwgaXQgZnJvbQorICAgICAgICBXZWJWaWV3SW1wbC4KKworICAgICAgICAqIFVJUHJv
Y2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp
ZENvbW1pdExvYWRGb3JGcmFtZSk6CisKKyAgICAgICAgQWRkaXRpb25hbGx5IGNhbGwgaW50byBg
Y2xvc2VTaGFyZWRQcmV2aWV3UGFuZWxJZk5lY2Vzc2FyeWAgd2hlbiBjb21taXR0aW5nIG1haW4g
ZnJhbWUgbmF2aWdhdGlvbi4gV2UgYWxzbworICAgICAgICByZWZhY3RvciBhIGJpdCBvZiBsb2dp
YyBoZXJlIHNvIHRoYXQgd2UgZm9sZCBzZXZlcmFsIHBpZWNlcyBvZiBzaW1pbGFyICJyZXNldCIg
bG9naWMgaW50byBhIHNpbmdsZSBpZiBzdGF0ZW1lbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv
V2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlv
blByZXZpZXdDb250cm9sbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0
cmFjdGlvblByZXZpZXdDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS0ltYWdlRXh0cmFjdGlv
blByZXZpZXdDb250cm9sbGVyIGJlZ2luQ29udHJvbDpdKToKKyAgICAgICAgKC1bV0tJbWFnZUV4
dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlciBlbmRDb250cm9sOl0pOgorICAgICAgICAoLVtXS0lt
YWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGNsb3NlUGFuZWxJZk5lY2Vzc2FyeV0pOgor
ICAgICAgICAoLVtXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGlzQ29udHJvbGxp
bmc6XSk6CisKKyAgICAgICAgTW92ZSBsb2dpYyBmb3IgYXNzaWduaW5nLCByZW1vdmluZywgYW5k
IGNoZWNraW5nIHRoZSBRTFByZXZpZXdQYW5lbCdzIGAtZGVsZWdhdGVgIGFuZCBgLWRhdGFTb3Vy
Y2VgIGludG8gaGVscGVyCisgICAgICAgIG1ldGhvZHMgb24gV0tJbWFnZUV4dHJhY3Rpb25QcmV2
aWV3Q29udHJvbGxlci4gRG9pbmcgdGhpcyBhbGxvd3MgdXMgdG8gY29uc29saWRhdGUgbW9yZSBv
ZiB0aGUgUXVpY2tMb29rVUktCisgICAgICAgIHNwZWNpZmljIGxvZ2ljIGluc2lkZSBXS0ltYWdl
RXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGFuZCBXZWJQYWdlUHJveHksIGJ1dCBhbHNvIChh
bmQgbW9yZSBpbXBvcnRhbnRseSkKKyAgICAgICAgcHJldmVudHMgdXMgZnJvbSBoYXZpbmcgdG8g
YCNpbXBvcnQgPHBhbC9zcGkvbWFjL1F1aWNrTG9va01hY1NQSS5oPmAgaW5zaWRlIGBXZWJQYWdl
UHJveHlNYWMubW1gLCB3aGljaCByZXN1bHRzCisgICAgICAgIGluIG51bGxhYmlsaXR5IGVycm9y
cyB3aGVuIGNhbGxpbmcgaW50byBgLVtOU0FwcGxpY2F0aW9uIHN0b3BTcGVha2luZzpdYC4KKwor
ICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tOgorICAgICAgICAoV2Vi
S2l0OjpXZWJQYWdlUHJveHk6OmJlZ2luUHJldmlld1BhbmVsQ29udHJvbCk6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZW5kUHJldmlld1BhbmVsQ29udHJvbCk6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2xvc2VTaGFyZWRQcmV2aWV3UGFuZWxJZk5lY2Vzc2FyeSk6
CisKIDIwMjEtMDYtMDIgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAK
ICAgICAgICAgW2lPU10gU2hvdyBkYXRhIGRldGVjdG9yIGNvbnRleHQgbWVudSBvbiBsb25nIHBy
ZXNzIGluc2lkZSBpbWFnZSBvdmVybGF5cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv
YS9XZWJWaWV3SW1wbC5tbQppbmRleCBiZTY3YjBmNDRmY2EyOTcyYzZjNTA0Y2NjMjY2MGZmODA4
MzRkNDA5Li5hZGU1MDc2ODcxYTNiNzcwZTRhNDIwNDU3NzEzYjcxYTQwNmEyMWIzIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQorKysgYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQpAQCAtMjQwMyw2ICsy
NDAzLDggQEAgdm9pZCBXZWJWaWV3SW1wbDo6dmlld0RpZE1vdmVUb1dpbmRvdygpCiAgICAgICAg
ICAgICBjYW5jZWxJbW1lZGlhdGVBY3Rpb25BbmltYXRpb24oKTsKICAgICAgICAgICAgIFttX3Zp
ZXcgcmVtb3ZlR2VzdHVyZVJlY29nbml6ZXI6bV9pbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2du
aXplci5nZXQoKV07CiAgICAgICAgIH0KKworICAgICAgICBtX3BhZ2UtPmNsb3NlU2hhcmVkUHJl
dmlld1BhbmVsSWZOZWNlc3NhcnkoKTsKICAgICB9CiAKICAgICBtX3BhZ2UtPnNldEludHJpbnNp
Y0RldmljZVNjYWxlRmFjdG9yKGludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yKCkpOwpAQCAtNTcy
NCwzNSArNTcyNiwxMiBAQCBib29sIFdlYlZpZXdJbXBsOjphY2NlcHRzUHJldmlld1BhbmVsQ29u
dHJvbChRTFByZXZpZXdQYW5lbCAqKQogCiB2b2lkIFdlYlZpZXdJbXBsOjpiZWdpblByZXZpZXdQ
YW5lbENvbnRyb2woUUxQcmV2aWV3UGFuZWwgKnBhbmVsKQogewotI2lmIEVOQUJMRShJTUFHRV9F
WFRSQUNUSU9OKQotICAgIGF1dG8gY29udHJvbGxlciA9IG1fcGFnZS0+aW1hZ2VFeHRyYWN0aW9u
UHJldmlld0NvbnRyb2xsZXIoKTsKLSAgICBpZiAoIWNvbnRyb2xsZXIpCi0gICAgICAgIHJldHVy
bjsKLQotICAgIHBhbmVsLmRhdGFTb3VyY2UgPSBjb250cm9sbGVyOwotICAgIHBhbmVsLmRlbGVn
YXRlID0gY29udHJvbGxlcjsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHBhbmVsKTsKLSNlbmRp
ZgorICAgIG1fcGFnZS0+YmVnaW5QcmV2aWV3UGFuZWxDb250cm9sKHBhbmVsKTsKIH0KIAogdm9p
ZCBXZWJWaWV3SW1wbDo6ZW5kUHJldmlld1BhbmVsQ29udHJvbChRTFByZXZpZXdQYW5lbCAqcGFu
ZWwpCiB7Ci0jaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCi0gICAgYXV0byBjb250cm9sbGVy
ID0gbV9wYWdlLT5pbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlcigpOwotICAgIGlmICgh
Y29udHJvbGxlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKHBhbmVsLmRhdGFTb3VyY2Ug
PT0gY29udHJvbGxlcikKLSAgICAgICAgcGFuZWwuZGF0YVNvdXJjZSA9IG5pbDsKLQotICAgIGlm
IChwYW5lbC5kZWxlZ2F0ZSA9PSBjb250cm9sbGVyKQotICAgICAgICBwYW5lbC5kZWxlZ2F0ZSA9
IG5pbDsKLQotICAgIG1fcGFnZS0+cmVzZXRJbWFnZUV4dHJhY3Rpb25QcmV2aWV3KCk7Ci0jZWxz
ZQotICAgIFVOVVNFRF9QQVJBTShwYW5lbCk7Ci0jZW5kaWYKKyAgICBtX3BhZ2UtPmVuZFByZXZp
ZXdQYW5lbENvbnRyb2wocGFuZWwpOwogfQogCiAjaWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzcyYmE4MzRhMTZm
NDk0NmEyNjg4Y2NmMmUzMGFkODQxM2Q3NTA1OC4uZGYyZmYxZDI3N2VlZTg1ZDgyNWNhNDk5MzQ1
Y2Q3YjQ3YWU2M2VhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn
ZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw
CkBAIC00ODgyLDE1ICs0ODgyLDE3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2Fk
Rm9yRnJhbWUoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIEZyYW1lSW5mb0RhdGEmCiAgICAgICAg
ICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZENvbW1pdE5hdmlnYXRpb24oKnRoaXMsIG5hdmln
YXRpb24uZ2V0KCksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0
YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZENvbW1p
dExvYWRGb3JGcmFtZSgqdGhpcywgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShmcmFtZUluZm8p
KTsKICAgICB9CisgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKSB7CiAjaWYgRU5BQkxFKEFU
VEFDSE1FTlRfRUxFTUVOVCkKLSAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAg
IGludmFsaWRhdGVBbGxBdHRhY2htZW50cygpOwogI2VuZGlmCi0KICNpZiBFTkFCTEUoUkVNT1RF
X0lOU1BFQ1RPUikKLSAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgIHJlbW90
ZUluc3BlY3RvckluZm9ybWF0aW9uRGlkQ2hhbmdlKCk7CiAjZW5kaWYKKyNpZiBVU0UoQVBQS0lU
KQorICAgICAgICBjbG9zZVNoYXJlZFByZXZpZXdQYW5lbElmTmVjZXNzYXJ5KCk7CisjZW5kaWYK
KyAgICB9CiAKICNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTl9DT09SRElOQVRPUikKICAgICBXRUJQ
QUdFUFJPWFlfRElEQ09NTUlUTE9BREZPUkZSQU1FX1dLQ09PUkRJTkFUT1JfQURESVRJT05TCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDdhZDNlMDhmOTVlOGMzYzk2
YjkxMjFlOWQ0ODA3MmViNDlhY2IxNGIuLmJhNjk5NDRjOWQzMGI4N2FjNTg1ZTJmMDQ5OWMzNTY2
NzM3Njg1ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94
eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0yMjks
NiArMjI5LDcgQEAgT0JKQ19DTEFTUyBOU0ZpbGVXcmFwcGVyOwogT0JKQ19DTEFTUyBOU01lbnU7
CiBPQkpDX0NMQVNTIE5TVGV4dEFsdGVybmF0aXZlczsKIE9CSkNfQ0xBU1MgTlNWaWV3OworT0JK
Q19DTEFTUyBRTFByZXZpZXdQYW5lbDsKIE9CSkNfQ0xBU1MgV0tRTFRodW1ibmFpbExvYWRPcGVy
YXRpb247CiBPQkpDX0NMQVNTIFdLV2ViVmlldzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0
UmVnaXN0cnk7CkBAIC0xOTEyLDcgKzE5MTMsMTIgQEAgcHVibGljOgogCiAjaWYgRU5BQkxFKElN
QUdFX0VYVFJBQ1RJT04pICYmIEVOQUJMRShDT05URVhUX01FTlVTKQogICAgIHZvaWQgaGFuZGxl
Q29udGV4dE1lbnVSZXZlYWxJbWFnZSgpOwotICAgIHZvaWQgcmVzZXRJbWFnZUV4dHJhY3Rpb25Q
cmV2aWV3KCk7CisjZW5kaWYKKworI2lmIFVTRShBUFBLSVQpCisgICAgdm9pZCBiZWdpblByZXZp
ZXdQYW5lbENvbnRyb2woUUxQcmV2aWV3UGFuZWwgKik7CisgICAgdm9pZCBlbmRQcmV2aWV3UGFu
ZWxDb250cm9sKFFMUHJldmlld1BhbmVsICopOworICAgIHZvaWQgY2xvc2VTaGFyZWRQcmV2aWV3
UGFuZWxJZk5lY2Vzc2FyeSgpOwogI2VuZGlmCiAKICNpZiBIQVZFKFRSQU5TTEFUSU9OX1VJX1NF
UlZJQ0VTKSAmJiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyLmggYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJv
bGxlci5oCmluZGV4IDVkZjE5MDFhNTY4YjBhYWU0NjRmMjA1Zjg4ZDI5YTIxODNkMDIyM2UuLmUz
NTgwMmRiODJjNjBjNDcxODE5OWM0ODZkNDU4N2ZjYThhNzgyODYgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVy
LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJl
dmlld0NvbnRyb2xsZXIuaApAQCAtMjcsMTQgKzI3LDIwIEBACiAKICNpZiBQTEFURk9STShNQUMp
ICYmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQogCi0jaW1wb3J0IDxwYWwvc3BpL21hYy9RdWlj
a0xvb2tNYWNTUEkuaD4KKyNpbXBvcnQgPEZvdW5kYXRpb24vRm91bmRhdGlvbi5oPgogCiBuYW1l
c3BhY2UgV2ViS2l0IHsKIGNsYXNzIFdlYlBhZ2VQcm94eTsKIH0KIAotQGludGVyZmFjZSBXS0lt
YWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIDogTlNPYmplY3QgPFFMUHJldmlld1BhbmVs
RGVsZWdhdGUsIFFMUHJldmlld1BhbmVsRGF0YVNvdXJjZT4KK0BjbGFzcyBRTFByZXZpZXdQYW5l
bDsKKworQGludGVyZmFjZSBXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIDogTlNP
YmplY3QKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBhZ2U6KFdlYktpdDo6V2ViUGFnZVByb3h5
JilwYWdlIGltYWdlRGF0YTooTlNEYXRhICopZGF0YSB0aXRsZTooTlNTdHJpbmcgKil0aXRsZSBp
bWFnZVVSTDooTlNVUkwgKilpbWFnZVVSTDsKKy0gKHZvaWQpYmVnaW5Db250cm9sOihRTFByZXZp
ZXdQYW5lbCAqKXBhbmVsOworLSAoQk9PTClpc0NvbnRyb2xsaW5nOihRTFByZXZpZXdQYW5lbCAq
KXBhbmVsOworLSAodm9pZCllbmRDb250cm9sOihRTFByZXZpZXdQYW5lbCAqKXBhbmVsOworLSAo
dm9pZCljbG9zZVBhbmVsSWZOZWNlc3Nhcnk7CiBAZW5kCiAKICNlbmRpZiAvLyBQTEFURk9STShN
QUMpICYmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIubW0gYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJv
bGxlci5tbQppbmRleCAzNzNlZGU2YjE0OWMyNDNjODczMDJhMzg1NzJlMjVlNjAyMzgxZDlkLi4y
ODRjM2RlMGZmMmFjOThhZGFlOTRhZWZjODBhMmZkMGY0MDM1YmU4IDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxl
ci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25Q
cmV2aWV3Q29udHJvbGxlci5tbQpAQCAtMzIsNiArMzIsOSBAQAogI2ltcG9ydCA8cGFsL21hYy9R
dWlja0xvb2tVSVNvZnRMaW5rLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKK0BpbnRl
cmZhY2UgV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlciAoKSA8UUxQcmV2aWV3UGFu
ZWxEZWxlZ2F0ZSwgUUxQcmV2aWV3UGFuZWxEYXRhU291cmNlPgorQGVuZAorCiBAaW1wbGVtZW50
YXRpb24gV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlciB7CiAgICAgUmV0YWluUHRy
PFFMSXRlbT4gX2l0ZW07CiAgICAgUmV0YWluUHRyPE5TRGF0YT4gX2ltYWdlRGF0YTsKQEAgLTU2
LDYgKzU5LDM1IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBhZ2U6KFdlYktpdDo6V2ViUGFn
ZVByb3h5JilwYWdlIGltYWdlRGF0YTooTlNEYXRhICopaW1hCiAgICAgcmV0dXJuIHNlbGY7CiB9
CiAKKy0gKHZvaWQpYmVnaW5Db250cm9sOihRTFByZXZpZXdQYW5lbCAqKXBhbmVsCit7CisgICAg
cGFuZWwuZGF0YVNvdXJjZSA9IHNlbGY7CisgICAgcGFuZWwuZGVsZWdhdGUgPSBzZWxmOworfQor
CistICh2b2lkKWVuZENvbnRyb2w6KFFMUHJldmlld1BhbmVsICopcGFuZWwKK3sKKyAgICBpZiAo
cGFuZWwuZGF0YVNvdXJjZSA9PSBzZWxmKQorICAgICAgICBwYW5lbC5kYXRhU291cmNlID0gbmls
OworCisgICAgaWYgKHBhbmVsLmRlbGVnYXRlID09IHNlbGYpCisgICAgICAgIHBhbmVsLmRlbGVn
YXRlID0gbmlsOworfQorCistICh2b2lkKWNsb3NlUGFuZWxJZk5lY2Vzc2FyeQoreworICAgIGlm
ICghUEFMOjppc1F1aWNrTG9va1VJRnJhbWV3b3JrQXZhaWxhYmxlKCkgfHwgIVtQQUw6OmdldFFM
UHJldmlld1BhbmVsQ2xhc3MoKSBzaGFyZWRQcmV2aWV3UGFuZWxFeGlzdHNdKQorICAgICAgICBy
ZXR1cm47CisKKyAgICBpZiAoYXV0byBwYW5lbCA9IFtQQUw6OmdldFFMUHJldmlld1BhbmVsQ2xh
c3MoKSBzaGFyZWRQcmV2aWV3UGFuZWxdOyBbc2VsZiBpc0NvbnRyb2xsaW5nOnBhbmVsXSkKKyAg
ICAgICAgW3BhbmVsIGNsb3NlXTsKK30KKworLSAoQk9PTClpc0NvbnRyb2xsaW5nOihRTFByZXZp
ZXdQYW5lbCAqKXBhbmVsCit7CisgICAgcmV0dXJuIHBhbmVsLmRhdGFTb3VyY2UgPT0gc2VsZiAm
JiBwYW5lbC5kZWxlZ2F0ZSA9PSBzZWxmOworfQorCiAjcHJhZ21hIG1hcmsgLSBRTFByZXZpZXdJ
dGVtRGF0YVByb3ZpZGVyCiAKIC0gKE5TRGF0YSAqKXByb3ZpZGVEYXRhRm9ySXRlbTooUUxJdGVt
ICopaXRlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQ
cm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMu
bW0KaW5kZXggNjU3ZWM0MDJjYmQxNTA3NWIxZjgyNDRiOTM4MzQ4ZmViY2EzOWU4Yi4uMDgzOTRl
ZDk3MjRjMWI1YWMyNjc1ZmI4ZmZjYmFlMDcwMWU2MzUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBAIC00NSw2ICs0NSw3IEBACiAjaW1w
b3J0ICJTdHJpbmdVdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRleHRDaGVja2VyLmgiCiAjaW1wb3J0
ICJXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJJbnRlcm5hbC5oIgorI2ltcG9ydCAiV0tJbWFn
ZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlci5oIgogI2ltcG9ydCAiV0tTaGFyaW5nU2Vydmlj
ZVBpY2tlckRlbGVnYXRlLmgiCiAjaW1wb3J0ICJXZWJDb250ZXh0TWVudVByb3h5TWFjLmgiCiAj
aW1wb3J0ICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTcxOSw2ICs3MjAsMjggQEAgQ29sb3IgV2Vi
UGFnZVByb3h5OjpwbGF0Zm9ybVVuZGVyUGFnZUJhY2tncm91bmRDb2xvcigpIGNvbnN0CiAjZW5k
aWYKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmJlZ2luUHJldmlld1BhbmVsQ29udHJvbChRTFBy
ZXZpZXdQYW5lbCAqcGFuZWwpCit7CisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCisgICAg
W21faW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIgYmVnaW5Db250cm9sOnBhbmVsXTsK
KyNlbmRpZgorfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZW5kUHJldmlld1BhbmVsQ29udHJvbChR
TFByZXZpZXdQYW5lbCAqcGFuZWwpCit7CisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCisg
ICAgaWYgKGF1dG8gY29udHJvbGxlciA9IHN0ZDo6ZXhjaGFuZ2UobV9pbWFnZUV4dHJhY3Rpb25Q
cmV2aWV3Q29udHJvbGxlciwgbmlsKSkKKyAgICAgICAgW2NvbnRyb2xsZXIgZW5kQ29udHJvbDpw
YW5lbF07CisjZW5kaWYKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OmNsb3NlU2hhcmVkUHJldmll
d1BhbmVsSWZOZWNlc3NhcnkoKQoreworI2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQorICAg
IFttX2ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGNsb3NlUGFuZWxJZk5lY2Vzc2Fy
eV07CisjZW5kaWYKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBQTEFU
Rk9STShNQUMpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430486</attachid>
            <date>2021-06-03 11:12:14 -0700</date>
            <delta_ts>2021-06-03 11:16:29 -0700</delta_ts>
            <desc>Handle WP termination as well</desc>
            <filename>bug-226588-20210603111213.patch</filename>
            <type>text/plain</type>
            <size>11166</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4Mzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFlMGU3ZDNlYTM1MGNjMmNl
YzFiNjEwMWI5ZGI1MTAwM2FjYWZmNmYuLjJmZWZhNmE3MjVlN2Q0ZmQwNjNiNDI5OWNkZTUzYWVi
ZDU5ZTI4ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTMgQEAKKzIwMjEtMDYtMDMgIFdlbnNvbiBI
c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBJbWFnZSBl
eHRyYWN0aW9uIHByZXZpZXcgcGFuZWwgc2hvdWxkIGF1dG9tYXRpY2FsbHkgY2xvc2Ugd2hlbiB0
aGUgd2ViIHZpZXcgaXMgdW5wYXJlbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NTg4CisgICAgICAgIHJkYXI6Ly83NzA2Mjc2MgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIHNvbWUg
bG9naWMgZm9yIHByZXNlbnRpbmcgdGhlIHByZXZpZXcgcGFuZWwuIFNlZSBiZWxvdyBmb3IgbW9y
ZSBkZXRhaWxzLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tOgor
ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlUHJvY2Vzc1N3YXBPckV4aXQpOgor
ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dmlld0RpZE1vdmVUb1dpbmRvdyk6CisKKyAg
ICAgICAgV2hlbiB0aGUgd2ViIHZpZXcgaXMgcmVtb3ZlZCBmcm9tIHRoZSB2aWV3IGhpZXJhcmNo
eSAoaS5lLiB3aGVuIHRoZSB2aWV3IGlzIG1vdmVkIHRvIGEgYG5pbGAgd2luZG93KSwgY2FsbCBp
bnRvCisgICAgICAgIGBjbG9zZVNoYXJlZFByZXZpZXdQYW5lbElmTmVjZXNzYXJ5YCB0byBkaXNt
aXNzIHRoZSBzaGFyZWQgcHJldmlldyBwYW5lbCBpZiB3ZSdyZSBjdXJyZW50bHkgY29udHJvbGxp
bmcgaXRzCisgICAgICAgIHByZXNlbnRhdGlvbiBmb3IgdGhlIHB1cnBvc2VzIG9mIGltYWdlIGV4
dHJhY3Rpb24uCisKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmJlZ2luUHJldmlld1Bh
bmVsQ29udHJvbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjplbmRQcmV2aWV3UGFu
ZWxDb250cm9sKToKKworICAgICAgICBBZGQgbW9yZSBwbHVtYmluZyBpbnRvIFdlYlBhZ2VQcm94
eSB0byBiZWdpbiBhbmQgZW5kIHByZXZpZXcgcGFuZWwgY29udHJvbDsgdGhpcyBhbGxvd3MgdXMg
dG8gYXZvaWQgaGF2aW5nIHRvCisgICAgICAgIGV4cG9zZSBhIHNlcGFyYXRlIG1ldGhvZCB0byBy
ZXNldCBXZWJQYWdlUHJveHkncyBgbV9pbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlcmAg
YW5kIGNhbGwgaXQgZnJvbQorICAgICAgICBXZWJWaWV3SW1wbC4KKworICAgICAgICAqIFVJUHJv
Y2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp
ZENvbW1pdExvYWRGb3JGcmFtZSk6CisKKyAgICAgICAgQWRkaXRpb25hbGx5IGNhbGwgaW50byBg
Y2xvc2VTaGFyZWRQcmV2aWV3UGFuZWxJZk5lY2Vzc2FyeWAgd2hlbiBjb21taXR0aW5nIG1haW4g
ZnJhbWUgbmF2aWdhdGlvbi4gV2UgYWxzbworICAgICAgICByZWZhY3RvciBhIGJpdCBvZiBsb2dp
YyBoZXJlIHNvIHRoYXQgd2UgZm9sZCBzZXZlcmFsIHBpZWNlcyBvZiBzaW1pbGFyICJyZXNldCIg
bG9naWMgaW50byBhIHNpbmdsZSBpZiBzdGF0ZW1lbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv
V2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlv
blByZXZpZXdDb250cm9sbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0
cmFjdGlvblByZXZpZXdDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS0ltYWdlRXh0cmFjdGlv
blByZXZpZXdDb250cm9sbGVyIGJlZ2luQ29udHJvbDpdKToKKyAgICAgICAgKC1bV0tJbWFnZUV4
dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlciBlbmRDb250cm9sOl0pOgorICAgICAgICAoLVtXS0lt
YWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGNsb3NlUGFuZWxJZk5lY2Vzc2FyeV0pOgor
ICAgICAgICAoLVtXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGlzQ29udHJvbGxp
bmc6XSk6CisKKyAgICAgICAgTW92ZSBsb2dpYyBmb3IgYXNzaWduaW5nLCByZW1vdmluZywgYW5k
IGNoZWNraW5nIHRoZSBRTFByZXZpZXdQYW5lbCdzIGAtZGVsZWdhdGVgIGFuZCBgLWRhdGFTb3Vy
Y2VgIGludG8gaGVscGVyCisgICAgICAgIG1ldGhvZHMgb24gV0tJbWFnZUV4dHJhY3Rpb25QcmV2
aWV3Q29udHJvbGxlci4gRG9pbmcgdGhpcyBhbGxvd3MgdXMgdG8gY29uc29saWRhdGUgbW9yZSBv
ZiB0aGUgUXVpY2tMb29rVUktCisgICAgICAgIHNwZWNpZmljIGxvZ2ljIGluc2lkZSBXS0ltYWdl
RXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGFuZCBXZWJQYWdlUHJveHksIGJ1dCBhbHNvIChh
bmQgbW9yZSBpbXBvcnRhbnRseSkKKyAgICAgICAgcHJldmVudHMgdXMgZnJvbSBoYXZpbmcgdG8g
YCNpbXBvcnQgPHBhbC9zcGkvbWFjL1F1aWNrTG9va01hY1NQSS5oPmAgaW5zaWRlIGBXZWJQYWdl
UHJveHlNYWMubW1gLCB3aGljaCByZXN1bHRzCisgICAgICAgIGluIG51bGxhYmlsaXR5IGVycm9y
cyB3aGVuIGNhbGxpbmcgaW50byBgLVtOU0FwcGxpY2F0aW9uIHN0b3BTcGVha2luZzpdYC4KKwor
ICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tOgorICAgICAgICAoV2Vi
S2l0OjpXZWJQYWdlUHJveHk6OmJlZ2luUHJldmlld1BhbmVsQ29udHJvbCk6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZW5kUHJldmlld1BhbmVsQ29udHJvbCk6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2xvc2VTaGFyZWRQcmV2aWV3UGFuZWxJZk5lY2Vzc2FyeSk6
CisKIDIwMjEtMDYtMDIgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAK
ICAgICAgICAgW2lPU10gU2hvdyBkYXRhIGRldGVjdG9yIGNvbnRleHQgbWVudSBvbiBsb25nIHBy
ZXNzIGluc2lkZSBpbWFnZSBvdmVybGF5cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv
YS9XZWJWaWV3SW1wbC5tbQppbmRleCBiZTY3YjBmNDRmY2EyOTcyYzZjNTA0Y2NjMjY2MGZmODA4
MzRkNDA5Li5lMGM5M2Q4MTcyNTk0ODc1YzUzZmE4MThjODAzNWZmOGY0MDVlNmRmIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQorKysgYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQpAQCAtMTUxNyw2ICsx
NTE3LDcgQEAgTlNXaW5kb3cgKldlYlZpZXdJbXBsOjp3aW5kb3coKQogdm9pZCBXZWJWaWV3SW1w
bDo6aGFuZGxlUHJvY2Vzc1N3YXBPckV4aXQoKQogewogICAgIGRpc21pc3NDb250ZW50UmVsYXRp
dmVDaGlsZFdpbmRvd3NXaXRoQW5pbWF0aW9uKHRydWUpOworICAgIG1fcGFnZS0+Y2xvc2VTaGFy
ZWRQcmV2aWV3UGFuZWxJZk5lY2Vzc2FyeSgpOwogCiAgICAgbm90aWZ5SW5wdXRDb250ZXh0QWJv
dXREaXNjYXJkZWRDb21wb3NpdGlvbigpOwogCkBAIC0yNDAzLDYgKzI0MDQsOCBAQCB2b2lkIFdl
YlZpZXdJbXBsOjp2aWV3RGlkTW92ZVRvV2luZG93KCkKICAgICAgICAgICAgIGNhbmNlbEltbWVk
aWF0ZUFjdGlvbkFuaW1hdGlvbigpOwogICAgICAgICAgICAgW21fdmlldyByZW1vdmVHZXN0dXJl
UmVjb2duaXplcjptX2ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKICAg
ICAgICAgfQorCisgICAgICAgIG1fcGFnZS0+Y2xvc2VTaGFyZWRQcmV2aWV3UGFuZWxJZk5lY2Vz
c2FyeSgpOwogICAgIH0KIAogICAgIG1fcGFnZS0+c2V0SW50cmluc2ljRGV2aWNlU2NhbGVGYWN0
b3IoaW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3IoKSk7CkBAIC01NzI0LDM1ICs1NzI3LDEyIEBA
IGJvb2wgV2ViVmlld0ltcGw6OmFjY2VwdHNQcmV2aWV3UGFuZWxDb250cm9sKFFMUHJldmlld1Bh
bmVsICopCiAKIHZvaWQgV2ViVmlld0ltcGw6OmJlZ2luUHJldmlld1BhbmVsQ29udHJvbChRTFBy
ZXZpZXdQYW5lbCAqcGFuZWwpCiB7Ci0jaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCi0gICAg
YXV0byBjb250cm9sbGVyID0gbV9wYWdlLT5pbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxl
cigpOwotICAgIGlmICghY29udHJvbGxlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcGFuZWwu
ZGF0YVNvdXJjZSA9IGNvbnRyb2xsZXI7Ci0gICAgcGFuZWwuZGVsZWdhdGUgPSBjb250cm9sbGVy
OwotI2Vsc2UKLSAgICBVTlVTRURfUEFSQU0ocGFuZWwpOwotI2VuZGlmCisgICAgbV9wYWdlLT5i
ZWdpblByZXZpZXdQYW5lbENvbnRyb2wocGFuZWwpOwogfQogCiB2b2lkIFdlYlZpZXdJbXBsOjpl
bmRQcmV2aWV3UGFuZWxDb250cm9sKFFMUHJldmlld1BhbmVsICpwYW5lbCkKIHsKLSNpZiBFTkFC
TEUoSU1BR0VfRVhUUkFDVElPTikKLSAgICBhdXRvIGNvbnRyb2xsZXIgPSBtX3BhZ2UtPmltYWdl
RXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyKCk7Ci0gICAgaWYgKCFjb250cm9sbGVyKQotICAg
ICAgICByZXR1cm47Ci0KLSAgICBpZiAocGFuZWwuZGF0YVNvdXJjZSA9PSBjb250cm9sbGVyKQot
ICAgICAgICBwYW5lbC5kYXRhU291cmNlID0gbmlsOwotCi0gICAgaWYgKHBhbmVsLmRlbGVnYXRl
ID09IGNvbnRyb2xsZXIpCi0gICAgICAgIHBhbmVsLmRlbGVnYXRlID0gbmlsOwotCi0gICAgbV9w
YWdlLT5yZXNldEltYWdlRXh0cmFjdGlvblByZXZpZXcoKTsKLSNlbHNlCi0gICAgVU5VU0VEX1BB
UkFNKHBhbmVsKTsKLSNlbmRpZgorICAgIG1fcGFnZS0+ZW5kUHJldmlld1BhbmVsQ29udHJvbChw
YW5lbCk7CiB9CiAKICNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJT04pCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAzNzJiYTgzNGExNmY0OTQ2YTI2ODhjY2YyZTMw
YWQ4NDEzZDc1MDU4Li5kZjJmZjFkMjc3ZWVlODVkODI1Y2E0OTkzNDVjZDdiNDdhZTYzZWE0IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTQ4ODIsMTUgKzQ4
ODIsMTcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZShGcmFtZUlk
ZW50aWZpZXIgZnJhbWVJRCwgRnJhbWVJbmZvRGF0YSYKICAgICAgICAgICAgIG1fbmF2aWdhdGlv
bkNsaWVudC0+ZGlkQ29tbWl0TmF2aWdhdGlvbigqdGhpcywgbmF2aWdhdGlvbi5nZXQoKSwgbV9w
cm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQo
KSk7CiAgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkQ29tbWl0TG9hZEZvckZyYW1lKCp0
aGlzLCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKGZyYW1lSW5mbykpOwogICAgIH0KKyAgICBp
ZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpIHsKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5U
KQotICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkKICAgICAgICAgaW52YWxpZGF0ZUFsbEF0
dGFjaG1lbnRzKCk7CiAjZW5kaWYKLQogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQotICAg
IGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkKICAgICAgICAgcmVtb3RlSW5zcGVjdG9ySW5mb3Jt
YXRpb25EaWRDaGFuZ2UoKTsKICNlbmRpZgorI2lmIFVTRShBUFBLSVQpCisgICAgICAgIGNsb3Nl
U2hhcmVkUHJldmlld1BhbmVsSWZOZWNlc3NhcnkoKTsKKyNlbmRpZgorICAgIH0KIAogI2lmIEVO
QUJMRShNRURJQV9TRVNTSU9OX0NPT1JESU5BVE9SKQogICAgIFdFQlBBR0VQUk9YWV9ESURDT01N
SVRMT0FERk9SRlJBTUVfV0tDT09SRElOQVRPUl9BRERJVElPTlMKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvV2ViUGFnZVByb3h5LmgKaW5kZXggN2FkM2UwOGY5NWU4YzNjOTZiOTEyMWU5ZDQ4MDcyZWI0
OWFjYjE0Yi4uYmE2OTk0NGM5ZDMwYjg3YWM1ODVlMmYwNDk5YzM1NjY3Mzc2ODVkMyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTIyOSw2ICsyMjksNyBAQCBPQkpD
X0NMQVNTIE5TRmlsZVdyYXBwZXI7CiBPQkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xBU1MgTlNU
ZXh0QWx0ZXJuYXRpdmVzOwogT0JKQ19DTEFTUyBOU1ZpZXc7CitPQkpDX0NMQVNTIFFMUHJldmll
d1BhbmVsOwogT0JKQ19DTEFTUyBXS1FMVGh1bWJuYWlsTG9hZE9wZXJhdGlvbjsKIE9CSkNfQ0xB
U1MgV0tXZWJWaWV3OwogT0JKQ19DTEFTUyBfV0tSZW1vdGVPYmplY3RSZWdpc3RyeTsKQEAgLTE5
MTIsNyArMTkxMywxMiBAQCBwdWJsaWM6CiAKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikg
JiYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAgICAgdm9pZCBoYW5kbGVDb250ZXh0TWVudVJldmVh
bEltYWdlKCk7Ci0gICAgdm9pZCByZXNldEltYWdlRXh0cmFjdGlvblByZXZpZXcoKTsKKyNlbmRp
ZgorCisjaWYgVVNFKEFQUEtJVCkKKyAgICB2b2lkIGJlZ2luUHJldmlld1BhbmVsQ29udHJvbChR
TFByZXZpZXdQYW5lbCAqKTsKKyAgICB2b2lkIGVuZFByZXZpZXdQYW5lbENvbnRyb2woUUxQcmV2
aWV3UGFuZWwgKik7CisgICAgdm9pZCBjbG9zZVNoYXJlZFByZXZpZXdQYW5lbElmTmVjZXNzYXJ5
KCk7CiAjZW5kaWYKIAogI2lmIEhBVkUoVFJBTlNMQVRJT05fVUlfU0VSVklDRVMpICYmIEVOQUJM
RShDT05URVhUX01FTlVTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj
L1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyLmgKaW5kZXggNWRm
MTkwMWE1NjhiMGFhZTQ2NGYyMDVmODhkMjlhMjE4M2QwMjIzZS4uZTM1ODAyZGI4MmM2MGM0NzE4
MTk5YzQ4NmQ0NTg3ZmNhOGE3ODI4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlci5o
CkBAIC0yNywxNCArMjcsMjAgQEAKIAogI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKElNQUdF
X0VYVFJBQ1RJT04pCiAKLSNpbXBvcnQgPHBhbC9zcGkvbWFjL1F1aWNrTG9va01hY1NQSS5oPgor
I2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewog
Y2xhc3MgV2ViUGFnZVByb3h5OwogfQogCi1AaW50ZXJmYWNlIFdLSW1hZ2VFeHRyYWN0aW9uUHJl
dmlld0NvbnRyb2xsZXIgOiBOU09iamVjdCA8UUxQcmV2aWV3UGFuZWxEZWxlZ2F0ZSwgUUxQcmV2
aWV3UGFuZWxEYXRhU291cmNlPgorQGNsYXNzIFFMUHJldmlld1BhbmVsOworCitAaW50ZXJmYWNl
IFdLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIgOiBOU09iamVjdAogLSAoaW5zdGFu
Y2V0eXBlKWluaXRXaXRoUGFnZTooV2ViS2l0OjpXZWJQYWdlUHJveHkmKXBhZ2UgaW1hZ2VEYXRh
OihOU0RhdGEgKilkYXRhIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIGltYWdlVVJMOihOU1VSTCAq
KWltYWdlVVJMOworLSAodm9pZCliZWdpbkNvbnRyb2w6KFFMUHJldmlld1BhbmVsICopcGFuZWw7
CistIChCT09MKWlzQ29udHJvbGxpbmc6KFFMUHJldmlld1BhbmVsICopcGFuZWw7CistICh2b2lk
KWVuZENvbnRyb2w6KFFMUHJldmlld1BhbmVsICopcGFuZWw7CistICh2b2lkKWNsb3NlUGFuZWxJ
Zk5lY2Vzc2FyeTsKIEBlbmQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKElN
QUdFX0VYVFJBQ1RJT04pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMv
V0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyLm1tCmluZGV4IDM3
M2VkZTZiMTQ5YzI0M2M4NzMwMmEzODU3MmUyNWU2MDIzODFkOWQuLjI4NGMzZGUwZmYyYWM5OGFk
YWU5NGFlZmM4MGEyZmQwZjQwMzViZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyLm1tCisrKyBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVy
Lm1tCkBAIC0zMiw2ICszMiw5IEBACiAjaW1wb3J0IDxwYWwvbWFjL1F1aWNrTG9va1VJU29mdExp
bmsuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAorQGludGVyZmFjZSBXS0ltYWdlRXh0
cmFjdGlvblByZXZpZXdDb250cm9sbGVyICgpIDxRTFByZXZpZXdQYW5lbERlbGVnYXRlLCBRTFBy
ZXZpZXdQYW5lbERhdGFTb3VyY2U+CitAZW5kCisKIEBpbXBsZW1lbnRhdGlvbiBXS0ltYWdlRXh0
cmFjdGlvblByZXZpZXdDb250cm9sbGVyIHsKICAgICBSZXRhaW5QdHI8UUxJdGVtPiBfaXRlbTsK
ICAgICBSZXRhaW5QdHI8TlNEYXRhPiBfaW1hZ2VEYXRhOwpAQCAtNTYsNiArNTksMzUgQEAgLSAo
aW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZTooV2ViS2l0OjpXZWJQYWdlUHJveHkmKXBhZ2UgaW1h
Z2VEYXRhOihOU0RhdGEgKilpbWEKICAgICByZXR1cm4gc2VsZjsKIH0KIAorLSAodm9pZCliZWdp
bkNvbnRyb2w6KFFMUHJldmlld1BhbmVsICopcGFuZWwKK3sKKyAgICBwYW5lbC5kYXRhU291cmNl
ID0gc2VsZjsKKyAgICBwYW5lbC5kZWxlZ2F0ZSA9IHNlbGY7Cit9CisKKy0gKHZvaWQpZW5kQ29u
dHJvbDooUUxQcmV2aWV3UGFuZWwgKilwYW5lbAoreworICAgIGlmIChwYW5lbC5kYXRhU291cmNl
ID09IHNlbGYpCisgICAgICAgIHBhbmVsLmRhdGFTb3VyY2UgPSBuaWw7CisKKyAgICBpZiAocGFu
ZWwuZGVsZWdhdGUgPT0gc2VsZikKKyAgICAgICAgcGFuZWwuZGVsZWdhdGUgPSBuaWw7Cit9CisK
Ky0gKHZvaWQpY2xvc2VQYW5lbElmTmVjZXNzYXJ5Cit7CisgICAgaWYgKCFQQUw6OmlzUXVpY2tM
b29rVUlGcmFtZXdvcmtBdmFpbGFibGUoKSB8fCAhW1BBTDo6Z2V0UUxQcmV2aWV3UGFuZWxDbGFz
cygpIHNoYXJlZFByZXZpZXdQYW5lbEV4aXN0c10pCisgICAgICAgIHJldHVybjsKKworICAgIGlm
IChhdXRvIHBhbmVsID0gW1BBTDo6Z2V0UUxQcmV2aWV3UGFuZWxDbGFzcygpIHNoYXJlZFByZXZp
ZXdQYW5lbF07IFtzZWxmIGlzQ29udHJvbGxpbmc6cGFuZWxdKQorICAgICAgICBbcGFuZWwgY2xv
c2VdOworfQorCistIChCT09MKWlzQ29udHJvbGxpbmc6KFFMUHJldmlld1BhbmVsICopcGFuZWwK
K3sKKyAgICByZXR1cm4gcGFuZWwuZGF0YVNvdXJjZSA9PSBzZWxmICYmIHBhbmVsLmRlbGVnYXRl
ID09IHNlbGY7Cit9CisKICNwcmFnbWEgbWFyayAtIFFMUHJldmlld0l0ZW1EYXRhUHJvdmlkZXIK
IAogLSAoTlNEYXRhICopcHJvdmlkZURhdGFGb3JJdGVtOihRTEl0ZW0gKilpdGVtCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tIGIvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQppbmRleCA2NTdlYzQw
MmNiZDE1MDc1YjFmODI0NGI5MzgzNDhmZWJjYTM5ZThiLi4wODM5NGVkOTcyNGMxYjVhYzI2NzVm
YjhmZmNiYWUwNzAxZTYzNTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9t
YWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9X
ZWJQYWdlUHJveHlNYWMubW0KQEAgLTQ1LDYgKzQ1LDcgQEAKICNpbXBvcnQgIlN0cmluZ1V0aWxp
dGllcy5oIgogI2ltcG9ydCAiVGV4dENoZWNrZXIuaCIKICNpbXBvcnQgIldLQnJvd3NpbmdDb250
ZXh0Q29udHJvbGxlckludGVybmFsLmgiCisjaW1wb3J0ICJXS0ltYWdlRXh0cmFjdGlvblByZXZp
ZXdDb250cm9sbGVyLmgiCiAjaW1wb3J0ICJXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUu
aCIKICNpbXBvcnQgIldlYkNvbnRleHRNZW51UHJveHlNYWMuaCIKICNpbXBvcnQgIldlYlBhZ2VN
ZXNzYWdlcy5oIgpAQCAtNzE5LDYgKzcyMCwyOCBAQCBDb2xvciBXZWJQYWdlUHJveHk6OnBsYXRm
b3JtVW5kZXJQYWdlQmFja2dyb3VuZENvbG9yKCkgY29uc3QKICNlbmRpZgogfQogCit2b2lkIFdl
YlBhZ2VQcm94eTo6YmVnaW5QcmV2aWV3UGFuZWxDb250cm9sKFFMUHJldmlld1BhbmVsICpwYW5l
bCkKK3sKKyNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKKyAgICBbbV9pbWFnZUV4dHJhY3Rp
b25QcmV2aWV3Q29udHJvbGxlciBiZWdpbkNvbnRyb2w6cGFuZWxdOworI2VuZGlmCit9CisKK3Zv
aWQgV2ViUGFnZVByb3h5OjplbmRQcmV2aWV3UGFuZWxDb250cm9sKFFMUHJldmlld1BhbmVsICpw
YW5lbCkKK3sKKyNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKKyAgICBpZiAoYXV0byBjb250
cm9sbGVyID0gc3RkOjpleGNoYW5nZShtX2ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVy
LCBuaWwpKQorICAgICAgICBbY29udHJvbGxlciBlbmRDb250cm9sOnBhbmVsXTsKKyNlbmRpZgor
fQorCit2b2lkIFdlYlBhZ2VQcm94eTo6Y2xvc2VTaGFyZWRQcmV2aWV3UGFuZWxJZk5lY2Vzc2Fy
eSgpCit7CisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCisgICAgW21faW1hZ2VFeHRyYWN0
aW9uUHJldmlld0NvbnRyb2xsZXIgY2xvc2VQYW5lbElmTmVjZXNzYXJ5XTsKKyNlbmRpZgorfQor
CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430488</attachid>
            <date>2021-06-03 11:16:31 -0700</date>
            <delta_ts>2021-06-03 16:08:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226588-20210603111630.patch</filename>
            <type>text/plain</type>
            <size>11188</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4Mzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFlMGU3ZDNlYTM1MGNjMmNl
YzFiNjEwMWI5ZGI1MTAwM2FjYWZmNmYuLjU4ZThhNmUwMTE4YmEwODQ0ZWZjZWExYzUwMGUzY2Fk
MGRmMDMwZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTMgQEAKKzIwMjEtMDYtMDMgIFdlbnNvbiBI
c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBJbWFnZSBl
eHRyYWN0aW9uIHByZXZpZXcgcGFuZWwgc2hvdWxkIGF1dG9tYXRpY2FsbHkgY2xvc2Ugd2hlbiB0
aGUgd2ViIHZpZXcgaXMgdW5wYXJlbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NTg4CisgICAgICAgIHJkYXI6Ly83NzA2Mjc2MgorCisgICAg
ICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgUmVmYWN0b3Igc29tZSBsb2dp
YyBmb3IgcHJlc2VudGluZyB0aGUgcHJldmlldyBwYW5lbC4gU2VlIGJlbG93IGZvciBtb3JlIGRl
dGFpbHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAg
ICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpoYW5kbGVQcm9jZXNzU3dhcE9yRXhpdCk6CisgICAg
ICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp2aWV3RGlkTW92ZVRvV2luZG93KToKKworICAgICAg
ICBXaGVuIHRoZSB3ZWIgdmlldyBpcyByZW1vdmVkIGZyb20gdGhlIHZpZXcgaGllcmFyY2h5IChp
LmUuIHdoZW4gdGhlIHZpZXcgaXMgbW92ZWQgdG8gYSBgbmlsYCB3aW5kb3cpLCBjYWxsIGludG8K
KyAgICAgICAgYGNsb3NlU2hhcmVkUHJldmlld1BhbmVsSWZOZWNlc3NhcnlgIHRvIGRpc21pc3Mg
dGhlIHNoYXJlZCBwcmV2aWV3IHBhbmVsIGlmIHdlJ3JlIGN1cnJlbnRseSBjb250cm9sbGluZyBp
dHMKKyAgICAgICAgcHJlc2VudGF0aW9uIGZvciB0aGUgcHVycG9zZXMgb2YgaW1hZ2UgZXh0cmFj
dGlvbi4KKworICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6YmVnaW5QcmV2aWV3UGFuZWxD
b250cm9sKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmVuZFByZXZpZXdQYW5lbENv
bnRyb2wpOgorCisgICAgICAgIEFkZCBtb3JlIHBsdW1iaW5nIGludG8gV2ViUGFnZVByb3h5IHRv
IGJlZ2luIGFuZCBlbmQgcHJldmlldyBwYW5lbCBjb250cm9sOyB0aGlzIGFsbG93cyB1cyB0byBh
dm9pZCBoYXZpbmcgdG8KKyAgICAgICAgZXhwb3NlIGEgc2VwYXJhdGUgbWV0aG9kIHRvIHJlc2V0
IFdlYlBhZ2VQcm94eSdzIGBtX2ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyYCBhbmQg
Y2FsbCBpdCBmcm9tCisgICAgICAgIFdlYlZpZXdJbXBsLgorCisgICAgICAgICogVUlQcm9jZXNz
L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ29t
bWl0TG9hZEZvckZyYW1lKToKKworICAgICAgICBBZGRpdGlvbmFsbHkgY2FsbCBpbnRvIGBjbG9z
ZVNoYXJlZFByZXZpZXdQYW5lbElmTmVjZXNzYXJ5YCB3aGVuIGNvbW1pdHRpbmcgbWFpbiBmcmFt
ZSBuYXZpZ2F0aW9uLiBXZSBhbHNvCisgICAgICAgIHJlZmFjdG9yIGEgYml0IG9mIGxvZ2ljIGhl
cmUgc28gdGhhdCB3ZSBmb2xkIHNldmVyYWwgcGllY2VzIG9mIHNpbWlsYXIgInJlc2V0IiBsb2dp
YyBpbnRvIGEgc2luZ2xlIGlmIHN0YXRlbWVudC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ
YWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJl
dmlld0NvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0
aW9uUHJldmlld0NvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dLSW1hZ2VFeHRyYWN0aW9uUHJl
dmlld0NvbnRyb2xsZXIgYmVnaW5Db250cm9sOl0pOgorICAgICAgICAoLVtXS0ltYWdlRXh0cmFj
dGlvblByZXZpZXdDb250cm9sbGVyIGVuZENvbnRyb2w6XSk6CisgICAgICAgICgtW1dLSW1hZ2VF
eHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIgY2xvc2VQYW5lbElmTmVjZXNzYXJ5XSk6CisgICAg
ICAgICgtW1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIgaXNDb250cm9sbGluZzpd
KToKKworICAgICAgICBNb3ZlIGxvZ2ljIGZvciBhc3NpZ25pbmcsIHJlbW92aW5nLCBhbmQgY2hl
Y2tpbmcgdGhlIFFMUHJldmlld1BhbmVsJ3MgYC1kZWxlZ2F0ZWAgYW5kIGAtZGF0YVNvdXJjZWAg
aW50byBoZWxwZXIKKyAgICAgICAgbWV0aG9kcyBvbiBXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdD
b250cm9sbGVyLiBEb2luZyB0aGlzIGFsbG93cyB1cyB0byBjb25zb2xpZGF0ZSBtb3JlIG9mIHRo
ZSBRdWlja0xvb2tVSS0KKyAgICAgICAgc3BlY2lmaWMgbG9naWMgaW5zaWRlIFdLSW1hZ2VFeHRy
YWN0aW9uUHJldmlld0NvbnRyb2xsZXIgYW5kIFdlYlBhZ2VQcm94eSwgYnV0IGFsc28gKGFuZCBt
b3JlIGltcG9ydGFudGx5KQorICAgICAgICBwcmV2ZW50cyB1cyBmcm9tIGhhdmluZyB0byBgI2lt
cG9ydCA8cGFsL3NwaS9tYWMvUXVpY2tMb29rTWFjU1BJLmg+YCBpbnNpZGUgYFdlYlBhZ2VQcm94
eU1hYy5tbWAsIHdoaWNoIHJlc3VsdHMKKyAgICAgICAgaW4gbnVsbGFiaWxpdHkgZXJyb3JzIHdo
ZW4gY2FsbGluZyBpbnRvIGAtW05TQXBwbGljYXRpb24gc3RvcFNwZWFraW5nOl1gLgorCisgICAg
ICAgICogVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6
OldlYlBhZ2VQcm94eTo6YmVnaW5QcmV2aWV3UGFuZWxDb250cm9sKToKKyAgICAgICAgKFdlYktp
dDo6V2ViUGFnZVByb3h5OjplbmRQcmV2aWV3UGFuZWxDb250cm9sKToKKyAgICAgICAgKFdlYktp
dDo6V2ViUGFnZVByb3h5OjpjbG9zZVNoYXJlZFByZXZpZXdQYW5lbElmTmVjZXNzYXJ5KToKKwog
MjAyMS0wNi0wMiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg
ICAgICBbaU9TXSBTaG93IGRhdGEgZGV0ZWN0b3IgY29udGV4dCBtZW51IG9uIGxvbmcgcHJlc3Mg
aW5zaWRlIGltYWdlIG92ZXJsYXlzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9Db2NvYS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl
YlZpZXdJbXBsLm1tCmluZGV4IGJlNjdiMGY0NGZjYTI5NzJjNmM1MDRjY2MyNjYwZmY4MDgzNGQ0
MDkuLjVmNTA3NmFmZmEyMWM3MmI0NmU2NjY2OGRlZDFhYTE1ZTc0ZDdmYzggMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCisrKyBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCkBAIC0xNTE3LDYgKzE1MTcs
NyBAQCBOU1dpbmRvdyAqV2ViVmlld0ltcGw6OndpbmRvdygpCiB2b2lkIFdlYlZpZXdJbXBsOjpo
YW5kbGVQcm9jZXNzU3dhcE9yRXhpdCgpCiB7CiAgICAgZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNo
aWxkV2luZG93c1dpdGhBbmltYXRpb24odHJ1ZSk7CisgICAgbV9wYWdlLT5jbG9zZVNoYXJlZFBy
ZXZpZXdQYW5lbElmTmVjZXNzYXJ5KCk7CiAKICAgICBub3RpZnlJbnB1dENvbnRleHRBYm91dERp
c2NhcmRlZENvbXBvc2l0aW9uKCk7CiAKQEAgLTIzOTcsNiArMjM5OCw3IEBAIHZvaWQgV2ViVmll
d0ltcGw6OnZpZXdEaWRNb3ZlVG9XaW5kb3coKQogICAgICAgICBtX2ZsYWdzQ2hhbmdlZEV2ZW50
TW9uaXRvciA9IG5pbDsKIAogICAgICAgICBkaXNtaXNzQ29udGVudFJlbGF0aXZlQ2hpbGRXaW5k
b3dzV2l0aEFuaW1hdGlvbihmYWxzZSk7CisgICAgICAgIG1fcGFnZS0+Y2xvc2VTaGFyZWRQcmV2
aWV3UGFuZWxJZk5lY2Vzc2FyeSgpOwogCiAgICAgICAgIGlmIChtX2ltbWVkaWF0ZUFjdGlvbkdl
c3R1cmVSZWNvZ25pemVyKSB7CiAgICAgICAgICAgICAvLyBXb3JrIGFyb3VuZCA8cmRhcjovL3By
b2JsZW0vMjI2NDY0MDQ+IGJ5IGV4cGxpY2l0bHkgY2FuY2VsbGluZyB0aGUgYW5pbWF0aW9uLgpA
QCAtNTcyNCwzNSArNTcyNiwxMiBAQCBib29sIFdlYlZpZXdJbXBsOjphY2NlcHRzUHJldmlld1Bh
bmVsQ29udHJvbChRTFByZXZpZXdQYW5lbCAqKQogCiB2b2lkIFdlYlZpZXdJbXBsOjpiZWdpblBy
ZXZpZXdQYW5lbENvbnRyb2woUUxQcmV2aWV3UGFuZWwgKnBhbmVsKQogewotI2lmIEVOQUJMRShJ
TUFHRV9FWFRSQUNUSU9OKQotICAgIGF1dG8gY29udHJvbGxlciA9IG1fcGFnZS0+aW1hZ2VFeHRy
YWN0aW9uUHJldmlld0NvbnRyb2xsZXIoKTsKLSAgICBpZiAoIWNvbnRyb2xsZXIpCi0gICAgICAg
IHJldHVybjsKLQotICAgIHBhbmVsLmRhdGFTb3VyY2UgPSBjb250cm9sbGVyOwotICAgIHBhbmVs
LmRlbGVnYXRlID0gY29udHJvbGxlcjsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHBhbmVsKTsK
LSNlbmRpZgorICAgIG1fcGFnZS0+YmVnaW5QcmV2aWV3UGFuZWxDb250cm9sKHBhbmVsKTsKIH0K
IAogdm9pZCBXZWJWaWV3SW1wbDo6ZW5kUHJldmlld1BhbmVsQ29udHJvbChRTFByZXZpZXdQYW5l
bCAqcGFuZWwpCiB7Ci0jaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCi0gICAgYXV0byBjb250
cm9sbGVyID0gbV9wYWdlLT5pbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlcigpOwotICAg
IGlmICghY29udHJvbGxlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKHBhbmVsLmRhdGFT
b3VyY2UgPT0gY29udHJvbGxlcikKLSAgICAgICAgcGFuZWwuZGF0YVNvdXJjZSA9IG5pbDsKLQot
ICAgIGlmIChwYW5lbC5kZWxlZ2F0ZSA9PSBjb250cm9sbGVyKQotICAgICAgICBwYW5lbC5kZWxl
Z2F0ZSA9IG5pbDsKLQotICAgIG1fcGFnZS0+cmVzZXRJbWFnZUV4dHJhY3Rpb25QcmV2aWV3KCk7
Ci0jZWxzZQotICAgIFVOVVNFRF9QQVJBTShwYW5lbCk7Ci0jZW5kaWYKKyAgICBtX3BhZ2UtPmVu
ZFByZXZpZXdQYW5lbENvbnRyb2wocGFuZWwpOwogfQogCiAjaWYgRU5BQkxFKERBVEFfREVURUNU
SU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw
cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzcyYmE4
MzRhMTZmNDk0NmEyNjg4Y2NmMmUzMGFkODQxM2Q3NTA1OC4uZGYyZmYxZDI3N2VlZTg1ZDgyNWNh
NDk5MzQ1Y2Q3YjQ3YWU2M2VhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv
eHkuY3BwCkBAIC00ODgyLDE1ICs0ODgyLDE3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDb21t
aXRMb2FkRm9yRnJhbWUoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIEZyYW1lSW5mb0RhdGEmCiAg
ICAgICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZENvbW1pdE5hdmlnYXRpb24oKnRoaXMs
IG5hdmlnYXRpb24uZ2V0KCksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1
c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRp
ZENvbW1pdExvYWRGb3JGcmFtZSgqdGhpcywgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShmcmFt
ZUluZm8pKTsKICAgICB9CisgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKSB7CiAjaWYgRU5B
QkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKLSAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAg
ICAgICAgIGludmFsaWRhdGVBbGxBdHRhY2htZW50cygpOwogI2VuZGlmCi0KICNpZiBFTkFCTEUo
UkVNT1RFX0lOU1BFQ1RPUikKLSAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAg
IHJlbW90ZUluc3BlY3RvckluZm9ybWF0aW9uRGlkQ2hhbmdlKCk7CiAjZW5kaWYKKyNpZiBVU0Uo
QVBQS0lUKQorICAgICAgICBjbG9zZVNoYXJlZFByZXZpZXdQYW5lbElmTmVjZXNzYXJ5KCk7Cisj
ZW5kaWYKKyAgICB9CiAKICNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTl9DT09SRElOQVRPUikKICAg
ICBXRUJQQUdFUFJPWFlfRElEQ09NTUlUTE9BREZPUkZSQU1FX1dLQ09PUkRJTkFUT1JfQURESVRJ
T05TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDdhZDNlMDhmOTVl
OGMzYzk2YjkxMjFlOWQ0ODA3MmViNDlhY2IxNGIuLmJhNjk5NDRjOWQzMGI4N2FjNTg1ZTJmMDQ5
OWMzNTY2NzM3Njg1ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh
Z2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBA
IC0yMjksNiArMjI5LDcgQEAgT0JKQ19DTEFTUyBOU0ZpbGVXcmFwcGVyOwogT0JKQ19DTEFTUyBO
U01lbnU7CiBPQkpDX0NMQVNTIE5TVGV4dEFsdGVybmF0aXZlczsKIE9CSkNfQ0xBU1MgTlNWaWV3
OworT0JKQ19DTEFTUyBRTFByZXZpZXdQYW5lbDsKIE9CSkNfQ0xBU1MgV0tRTFRodW1ibmFpbExv
YWRPcGVyYXRpb247CiBPQkpDX0NMQVNTIFdLV2ViVmlldzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3Rl
T2JqZWN0UmVnaXN0cnk7CkBAIC0xOTEyLDcgKzE5MTMsMTIgQEAgcHVibGljOgogCiAjaWYgRU5B
QkxFKElNQUdFX0VYVFJBQ1RJT04pICYmIEVOQUJMRShDT05URVhUX01FTlVTKQogICAgIHZvaWQg
aGFuZGxlQ29udGV4dE1lbnVSZXZlYWxJbWFnZSgpOwotICAgIHZvaWQgcmVzZXRJbWFnZUV4dHJh
Y3Rpb25QcmV2aWV3KCk7CisjZW5kaWYKKworI2lmIFVTRShBUFBLSVQpCisgICAgdm9pZCBiZWdp
blByZXZpZXdQYW5lbENvbnRyb2woUUxQcmV2aWV3UGFuZWwgKik7CisgICAgdm9pZCBlbmRQcmV2
aWV3UGFuZWxDb250cm9sKFFMUHJldmlld1BhbmVsICopOworICAgIHZvaWQgY2xvc2VTaGFyZWRQ
cmV2aWV3UGFuZWxJZk5lY2Vzc2FyeSgpOwogI2VuZGlmCiAKICNpZiBIQVZFKFRSQU5TTEFUSU9O
X1VJX1NFUlZJQ0VTKSAmJiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVy
LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3
Q29udHJvbGxlci5oCmluZGV4IDVkZjE5MDFhNTY4YjBhYWU0NjRmMjA1Zjg4ZDI5YTIxODNkMDIy
M2UuLmUzNTgwMmRiODJjNjBjNDcxODE5OWM0ODZkNDU4N2ZjYThhNzgyODYgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250
cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0
aW9uUHJldmlld0NvbnRyb2xsZXIuaApAQCAtMjcsMTQgKzI3LDIwIEBACiAKICNpZiBQTEFURk9S
TShNQUMpICYmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQogCi0jaW1wb3J0IDxwYWwvc3BpL21h
Yy9RdWlja0xvb2tNYWNTUEkuaD4KKyNpbXBvcnQgPEZvdW5kYXRpb24vRm91bmRhdGlvbi5oPgog
CiBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIFdlYlBhZ2VQcm94eTsKIH0KIAotQGludGVyZmFj
ZSBXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIDogTlNPYmplY3QgPFFMUHJldmll
d1BhbmVsRGVsZWdhdGUsIFFMUHJldmlld1BhbmVsRGF0YVNvdXJjZT4KK0BjbGFzcyBRTFByZXZp
ZXdQYW5lbDsKKworQGludGVyZmFjZSBXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVy
IDogTlNPYmplY3QKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBhZ2U6KFdlYktpdDo6V2ViUGFn
ZVByb3h5JilwYWdlIGltYWdlRGF0YTooTlNEYXRhICopZGF0YSB0aXRsZTooTlNTdHJpbmcgKil0
aXRsZSBpbWFnZVVSTDooTlNVUkwgKilpbWFnZVVSTDsKKy0gKHZvaWQpYmVnaW5Db250cm9sOihR
TFByZXZpZXdQYW5lbCAqKXBhbmVsOworLSAoQk9PTClpc0NvbnRyb2xsaW5nOihRTFByZXZpZXdQ
YW5lbCAqKXBhbmVsOworLSAodm9pZCllbmRDb250cm9sOihRTFByZXZpZXdQYW5lbCAqKXBhbmVs
OworLSAodm9pZCljbG9zZVBhbmVsSWZOZWNlc3Nhcnk7CiBAZW5kCiAKICNlbmRpZiAvLyBQTEFU
Rk9STShNQUMpICYmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIu
bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3
Q29udHJvbGxlci5tbQppbmRleCAzNzNlZGU2YjE0OWMyNDNjODczMDJhMzg1NzJlMjVlNjAyMzgx
ZDlkLi4yODRjM2RlMGZmMmFjOThhZGFlOTRhZWZjODBhMmZkMGY0MDM1YmU4IDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29u
dHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJh
Y3Rpb25QcmV2aWV3Q29udHJvbGxlci5tbQpAQCAtMzIsNiArMzIsOSBAQAogI2ltcG9ydCA8cGFs
L21hYy9RdWlja0xvb2tVSVNvZnRMaW5rLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAK
K0BpbnRlcmZhY2UgV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlciAoKSA8UUxQcmV2
aWV3UGFuZWxEZWxlZ2F0ZSwgUUxQcmV2aWV3UGFuZWxEYXRhU291cmNlPgorQGVuZAorCiBAaW1w
bGVtZW50YXRpb24gV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlciB7CiAgICAgUmV0
YWluUHRyPFFMSXRlbT4gX2l0ZW07CiAgICAgUmV0YWluUHRyPE5TRGF0YT4gX2ltYWdlRGF0YTsK
QEAgLTU2LDYgKzU5LDM1IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBhZ2U6KFdlYktpdDo6
V2ViUGFnZVByb3h5JilwYWdlIGltYWdlRGF0YTooTlNEYXRhICopaW1hCiAgICAgcmV0dXJuIHNl
bGY7CiB9CiAKKy0gKHZvaWQpYmVnaW5Db250cm9sOihRTFByZXZpZXdQYW5lbCAqKXBhbmVsCit7
CisgICAgcGFuZWwuZGF0YVNvdXJjZSA9IHNlbGY7CisgICAgcGFuZWwuZGVsZWdhdGUgPSBzZWxm
OworfQorCistICh2b2lkKWVuZENvbnRyb2w6KFFMUHJldmlld1BhbmVsICopcGFuZWwKK3sKKyAg
ICBpZiAocGFuZWwuZGF0YVNvdXJjZSA9PSBzZWxmKQorICAgICAgICBwYW5lbC5kYXRhU291cmNl
ID0gbmlsOworCisgICAgaWYgKHBhbmVsLmRlbGVnYXRlID09IHNlbGYpCisgICAgICAgIHBhbmVs
LmRlbGVnYXRlID0gbmlsOworfQorCistICh2b2lkKWNsb3NlUGFuZWxJZk5lY2Vzc2FyeQorewor
ICAgIGlmICghUEFMOjppc1F1aWNrTG9va1VJRnJhbWV3b3JrQXZhaWxhYmxlKCkgfHwgIVtQQUw6
OmdldFFMUHJldmlld1BhbmVsQ2xhc3MoKSBzaGFyZWRQcmV2aWV3UGFuZWxFeGlzdHNdKQorICAg
ICAgICByZXR1cm47CisKKyAgICBpZiAoYXV0byBwYW5lbCA9IFtQQUw6OmdldFFMUHJldmlld1Bh
bmVsQ2xhc3MoKSBzaGFyZWRQcmV2aWV3UGFuZWxdOyBbc2VsZiBpc0NvbnRyb2xsaW5nOnBhbmVs
XSkKKyAgICAgICAgW3BhbmVsIGNsb3NlXTsKK30KKworLSAoQk9PTClpc0NvbnRyb2xsaW5nOihR
TFByZXZpZXdQYW5lbCAqKXBhbmVsCit7CisgICAgcmV0dXJuIHBhbmVsLmRhdGFTb3VyY2UgPT0g
c2VsZiAmJiBwYW5lbC5kZWxlZ2F0ZSA9PSBzZWxmOworfQorCiAjcHJhZ21hIG1hcmsgLSBRTFBy
ZXZpZXdJdGVtRGF0YVByb3ZpZGVyCiAKIC0gKE5TRGF0YSAqKXByb3ZpZGVEYXRhRm9ySXRlbToo
UUxJdGVtICopaXRlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dl
YlBhZ2VQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJv
eHlNYWMubW0KaW5kZXggNjU3ZWM0MDJjYmQxNTA3NWIxZjgyNDRiOTM4MzQ4ZmViY2EzOWU4Yi4u
MDgzOTRlZDk3MjRjMWI1YWMyNjc1ZmI4ZmZjYmFlMDcwMWU2MzUwYyAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQorKysgYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBAIC00NSw2ICs0NSw3IEBA
CiAjaW1wb3J0ICJTdHJpbmdVdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRleHRDaGVja2VyLmgiCiAj
aW1wb3J0ICJXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJJbnRlcm5hbC5oIgorI2ltcG9ydCAi
V0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlci5oIgogI2ltcG9ydCAiV0tTaGFyaW5n
U2VydmljZVBpY2tlckRlbGVnYXRlLmgiCiAjaW1wb3J0ICJXZWJDb250ZXh0TWVudVByb3h5TWFj
LmgiCiAjaW1wb3J0ICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTcxOSw2ICs3MjAsMjggQEAgQ29s
b3IgV2ViUGFnZVByb3h5OjpwbGF0Zm9ybVVuZGVyUGFnZUJhY2tncm91bmRDb2xvcigpIGNvbnN0
CiAjZW5kaWYKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmJlZ2luUHJldmlld1BhbmVsQ29udHJv
bChRTFByZXZpZXdQYW5lbCAqcGFuZWwpCit7CisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04p
CisgICAgW21faW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIgYmVnaW5Db250cm9sOnBh
bmVsXTsKKyNlbmRpZgorfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZW5kUHJldmlld1BhbmVsQ29u
dHJvbChRTFByZXZpZXdQYW5lbCAqcGFuZWwpCit7CisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJ
T04pCisgICAgaWYgKGF1dG8gY29udHJvbGxlciA9IHN0ZDo6ZXhjaGFuZ2UobV9pbWFnZUV4dHJh
Y3Rpb25QcmV2aWV3Q29udHJvbGxlciwgbmlsKSkKKyAgICAgICAgW2NvbnRyb2xsZXIgZW5kQ29u
dHJvbDpwYW5lbF07CisjZW5kaWYKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OmNsb3NlU2hhcmVk
UHJldmlld1BhbmVsSWZOZWNlc3NhcnkoKQoreworI2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9O
KQorICAgIFttX2ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGNsb3NlUGFuZWxJZk5l
Y2Vzc2FyeV07CisjZW5kaWYKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAv
LyBQTEFURk9STShNQUMpCg==
</data>
<flag name="commit-queue"
          id="451978"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
      

    </bug>

</bugzilla>