<?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>229169</bug_id>
          
          <creation_ts>2021-08-16 16:06:32 -0700</creation_ts>
          <short_desc>LayoutTests imported/w3c/web-platform-tests/html/canvas/element/imagebitmap/createImageBitmap-* are flakey</short_desc>
          <delta_ts>2021-08-17 00:22:25 -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>Media</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="Jer Noble">jer.noble</reporter>
          <assigned_to name="Jer Noble">jer.noble</assigned_to>
          <cc>eric.carlson</cc>
    
    <cc>jean-yves.avenard</cc>
    
    <cc>peng.liu6</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1784678</commentid>
    <comment_count>0</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-08-16 16:06:32 -0700</bug_when>
    <thetext>LayoutTests imported/w3c/web-platform-tests/html/canvas/element/imagebitmap/createImageBitmap-* are flakey</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784683</commentid>
    <comment_count>1</comment_count>
      <attachid>435641</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-08-16 16:20:26 -0700</bug_when>
    <thetext>Created attachment 435641
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784684</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-08-16 16:24:57 -0700</bug_when>
    <thetext>&lt;rdar://problem/82003606&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784741</commentid>
    <comment_count>3</comment_count>
      <attachid>435641</attachid>
    <who name="Peng Liu">peng.liu6</who>
    <bug_when>2021-08-16 21:43:41 -0700</bug_when>
    <thetext>Comment on attachment 435641
Patch

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

&gt; Source/WebCore/ChangeLog:9
&gt; +        which in turn relies on a PlatformMediaResourceLoader to turn the data URL into a data bufer. However, in the

Nit. s/bufer/buffer/g</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784747</commentid>
    <comment_count>4</comment_count>
      <attachid>435666</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-08-16 23:24:00 -0700</bug_when>
    <thetext>Created attachment 435666
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784759</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-17 00:22:23 -0700</bug_when>
    <thetext>Committed r281132 (240586@main): &lt;https://commits.webkit.org/240586@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 435666.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435641</attachid>
            <date>2021-08-16 16:20:26 -0700</date>
            <delta_ts>2021-08-16 23:23:58 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229169-20210816162026.patch</filename>
            <type>text/plain</type>
            <size>6817</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwOTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkzMzhhN2YzYzc4YWJk
NWM4Y2Y1ZTk2YTc2M2Y2OWU1N2VjNDdmNy4uZDVkNDRhZTUzZjI5ZDMxYWYzM2YyZDhiMmEwNmZi
ODdlMmUxYmNhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA4LTE2ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIExheW91dFRlc3RzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9pbWFnZWJpdG1h
cC9jcmVhdGVJbWFnZUJpdG1hcC0qIGFyZSBmbGFrZXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTE2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gYSBkYXRhOi8vIFVSTCBpcyBwYXNzZWQgdG8g
QVZGb3VuZGF0aW9uLCB0aGUgbG9hZGluZyBvZiB0aGF0IFVSTCBpcyBoYW5kbGVkIGJ5IFdlYkNv
cmVBVkZSZXNvdXJjZUxvYWRlciwKKyAgICAgICAgd2hpY2ggaW4gdHVybiByZWxpZXMgb24gYSBQ
bGF0Zm9ybU1lZGlhUmVzb3VyY2VMb2FkZXIgdG8gdHVybiB0aGUgZGF0YSBVUkwgaW50byBhIGRh
dGEgYnVmZXIuIEhvd2V2ZXIsIGluIHRoZQorICAgICAgICBjYXNlIG9mIHRoZSBHUFUgcHJvY2Vz
cywgdGhpcyBtZWFucyBkaXNwYXRjaGluZyB0aGUgcmVxdWVzdCBmcm9tIEdQVSwgdG8gV2ViQ29u
dGVudCwgdG8gTmV0d29yayBwcm9jZXNzIGFuZCB0bworICAgICAgICBzZW5kIHRoZSBkYXRhIGJh
Y2sgZnJvbSB0aGUgTmV0d29yaywgdG8gV2ViQ29udGVudCwgdG8gR1BVIHByb2Nlc3MuIElmIGEg
c3luY2hyb25vdXMgb3BlcmF0aW9uIChsaWtlIHBhaW50aW5nKQorICAgICAgICBpcyB1bmRlcndh
eSwgdGhlIGRhdGEgcmVzcG9uc2UgY2FuIGJsb2NrIHVudGlsIHRoYXQgc3luY2hyb25vdXMgb3Bl
cmF0aW9uIGNvbXBsZXRlcy4gSWYgdGhhdCBvcGVyYXRpb24gaXMgYQorICAgICAgICBwYWludCwg
YW5kIHRoZSBkYXRhIHJlcXVlc3RlZCBpcyByZXF1aXJlZCB0byBjb21wbGV0ZSB0aGF0IHBhaW50
LCB0aGUgcGFpbnQgd2lsbCBmYWlsLgorCisgICAgICAgIEZvciB0aGUgbmFycm93IGNhc2Ugb2Yg
YSBkYXRhOi8vIFVSTCwgaXQncyBub3QgbmVjZXNzYXJ5IHRvIGRpc3BhdGNoIHRvIGFub3RoZXIg
cHJvY2VzcyB0byB0dXJuIHRoYXQgVVJMIGludG8KKyAgICAgICAgZGF0YTsgaXQgY2FuIGhhcHBl
biBsb2NhbGx5LCBhdm9pZGluZyB0aGUgaG9wIHRvIGFub3RoZXIgcHJvY2VzcyBhbmQgdGhlIHN1
YnNlcXVlbnQgZGVhZGxvY2suCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k
YXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6
OldlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6bG9nZ2VyIGNvbnN0KToKKyAgICAgICAgKiBwbGF0
Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIu
bW06CisgICAgICAgIChXZWJDb3JlOjpEYXRhVVJMUmVzb3VyY2VNZWRpYUxvYWRlcjo6RGF0YVVS
TFJlc291cmNlTWVkaWFMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZUFWRlJlc291
cmNlTG9hZGVyOjp+V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyKToKKyAgICAgICAgKFdlYkNvcmU6
OldlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6c3RhcnRMb2FkaW5nKToKKwogMjAyMS0wOC0xMiAg
SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIEVudGVy
IGZ1bGxzY3JlZW4gYW5pbWF0aW9uIGludGVyZmVyZXMgd2l0aCBhdXRvLWhpZGluZyBtZW51IGJh
cgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0
aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIu
aAppbmRleCBkZTBlZjdhMWJhMzk1YTg2NmNhZDAwNmRjMmJmZDZlZTg1NzE0NTBjLi5mMGQ4ZTcx
MTMyZjZjMjg3YTJlNjI5YTRiODhhNTM5ZGZkNTNjYmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3Vy
Y2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k
YXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIuaApAQCAtMzgsNiArMzgsNyBAQCBP
QkpDX0NMQVNTIEFWQXNzZXRSZXNvdXJjZUxvYWRpbmdSZXF1ZXN0OwogbmFtZXNwYWNlIFdlYkNv
cmUgewogCiBjbGFzcyBDYWNoZWRSZXNvdXJjZU1lZGlhTG9hZGVyOworY2xhc3MgRGF0YVVSTFJl
c291cmNlTWVkaWFMb2FkZXI7CiBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P
YmpDOwogY2xhc3MgUGxhdGZvcm1SZXNvdXJjZU1lZGlhTG9hZGVyOwogY2xhc3MgUmVzb3VyY2VF
cnJvcjsKQEAgLTU4LDYgKzU5LDcgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlQVZGUmVzb3VyY2VM
b2FkZXIoTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQyogcGFyZW50LCBBVkFzc2V0
UmVzb3VyY2VMb2FkaW5nUmVxdWVzdCAqKTsKIAogICAgIGZyaWVuZCBjbGFzcyBDYWNoZWRSZXNv
dXJjZU1lZGlhTG9hZGVyOworICAgIGZyaWVuZCBjbGFzcyBEYXRhVVJMUmVzb3VyY2VNZWRpYUxv
YWRlcjsKICAgICBmcmllbmQgY2xhc3MgUGxhdGZvcm1SZXNvdXJjZU1lZGlhTG9hZGVyOwogCiAg
ICAgdm9pZCByZXNwb25zZVJlY2VpdmVkKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKQEAgLTY3
LDYgKzY5LDcgQEAgcHJpdmF0ZToKIAogICAgIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv
bk9iakMqIG1fcGFyZW50OwogICAgIFJldGFpblB0cjxBVkFzc2V0UmVzb3VyY2VMb2FkaW5nUmVx
dWVzdD4gbV9hdlJlcXVlc3Q7CisgICAgc3RkOjp1bmlxdWVfcHRyPERhdGFVUkxSZXNvdXJjZU1l
ZGlhTG9hZGVyPiBtX2RhdGFVUkxNZWRpYUxvYWRlcjsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Q2Fj
aGVkUmVzb3VyY2VNZWRpYUxvYWRlcj4gbV9yZXNvdXJjZU1lZGlhTG9hZGVyOwogICAgIFdlYWtQ
dHI8UGxhdGZvcm1SZXNvdXJjZU1lZGlhTG9hZGVyPiBtX3BsYXRmb3JtTWVkaWFMb2FkZXI7CiAg
ICAgc2l6ZV90IG1fcmVzcG9uc2VPZmZzZXQgeyAwIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3Vy
Y2VMb2FkZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp
b24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0KaW5kZXggMjQ3NzI4ZTZjYmMwN2Yy
ODJmYTU4ZjUxN2I4YTZmZTA2ZTViMDY2YS4uNmRiOGY4N2RiZjhkYWNmYmEzNzM2OTQ2Yjg1MzE5
NGEyYmM4MzY5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
YXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZS
ZXNvdXJjZUxvYWRlci5tbQpAQCAtMjE4LDYgKzIxOCw1MCBAQCB2b2lkIFBsYXRmb3JtUmVzb3Vy
Y2VNZWRpYUxvYWRlcjo6ZGF0YVJlY2VpdmVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIGNvbnN0
IHVpbgogICAgIG1fcGFyZW50Lm5ld0RhdGFTdG9yZWRJblNoYXJlZEJ1ZmZlcigqbV9idWZmZXIp
OwogfQogCitjbGFzcyBEYXRhVVJMUmVzb3VyY2VNZWRpYUxvYWRlciA6IHB1YmxpYyBDYW5NYWtl
V2Vha1B0cjxEYXRhVVJMUmVzb3VyY2VNZWRpYUxvYWRlcj4geworICAgIFdURl9NQUtFX0ZBU1Rf
QUxMT0NBVEVEOworcHVibGljOgorICAgIERhdGFVUkxSZXNvdXJjZU1lZGlhTG9hZGVyKFdlYkNv
cmVBVkZSZXNvdXJjZUxvYWRlciYsIFJlc291cmNlUmVxdWVzdCYmKTsKKworcHJpdmF0ZToKKyAg
ICBXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXImIG1fcGFyZW50OworICAgIHN0ZDo6dW5pcXVlX3B0
cjxSZXNvdXJjZVJlc3BvbnNlPiBtX3Jlc3BvbnNlOworICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+
IG1fYnVmZmVyOworfTsKKworRGF0YVVSTFJlc291cmNlTWVkaWFMb2FkZXI6OkRhdGFVUkxSZXNv
dXJjZU1lZGlhTG9hZGVyKFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlciYgcGFyZW50LCBSZXNvdXJj
ZVJlcXVlc3QmJiByZXF1ZXN0KQorICAgIDogbV9wYXJlbnQocGFyZW50KQoreworICAgIEFTU0VS
VChyZXF1ZXN0LnVybCgpLnByb3RvY29sSXNEYXRhKCkpOworCisgICAgaWYgKHJlcXVlc3QudXJs
KCkucHJvdG9jb2xJc0RhdGEoKSkgeworICAgICAgICBhdXRvIG1pbWVUeXBlID0gbWltZVR5cGVG
cm9tRGF0YVVSTChyZXF1ZXN0LnVybCgpLnN0cmluZygpKTsKKyAgICAgICAgYXV0byBuc0RhdGEg
PSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aENvbnRlbnRzT2ZVUkw6cmVxdWVzdC51
cmwoKV0pOworICAgICAgICBBU1NFUlQobnNEYXRhKTsKKyAgICAgICAgbV9idWZmZXIgPSBTaGFy
ZWRCdWZmZXI6OmNyZWF0ZShuc0RhdGEuZ2V0KCkpOworICAgICAgICBtX3Jlc3BvbnNlID0gV1RG
OjptYWtlVW5pcXVlPFJlc291cmNlUmVzcG9uc2U+KHJlcXVlc3QudXJsKCksIG1pbWVUeXBlLCBt
X2J1ZmZlci0+c2l6ZSgpLCBlbXB0eVN0cmluZygpKTsKKyAgICB9CisKKyAgICBjYWxsT25NYWlu
VGhyZWFkKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0geworICAgICAgICBp
ZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICghbV9idWZm
ZXIgfHwgIW1fcmVzcG9uc2UpIHsKKyAgICAgICAgICAgIG1fcGFyZW50LmxvYWRGYWlsZWQoUmVz
b3VyY2VFcnJvcihSZXNvdXJjZUVycm9yOjpUeXBlOjpHZW5lcmFsKSk7CisgICAgICAgICAgICBy
ZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgbV9wYXJlbnQucmVzcG9uc2VSZWNlaXZlZCgqbV9y
ZXNwb25zZSk7CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm47CisK
KyAgICAgICAgbV9wYXJlbnQubmV3RGF0YVN0b3JlZEluU2hhcmVkQnVmZmVyKCptX2J1ZmZlcik7
CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAg
bV9wYXJlbnQubG9hZEZpbmlzaGVkKCk7CisgICAgfSk7Cit9CisKIFJlZjxXZWJDb3JlQVZGUmVz
b3VyY2VMb2FkZXI+IFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKE1lZGlhUGxheWVy
UHJpdmF0ZUFWRm91bmRhdGlvbk9iakMqIHBhcmVudCwgQVZBc3NldFJlc291cmNlTG9hZGluZ1Jl
cXVlc3QgKmF2UmVxdWVzdCkKIHsKICAgICBBU1NFUlQoYXZSZXF1ZXN0KTsKQEAgLTIzOCw3ICsy
ODIsNyBAQCBXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI6On5XZWJDb3JlQVZGUmVzb3VyY2VMb2Fk
ZXIoKQogCiB2b2lkIFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6c3RhcnRMb2FkaW5nKCkKIHsK
LSAgICBpZiAobV9yZXNvdXJjZU1lZGlhTG9hZGVyIHx8IG1fcGxhdGZvcm1NZWRpYUxvYWRlciB8
fCAhbV9wYXJlbnQpCisgICAgaWYgKG1fZGF0YVVSTE1lZGlhTG9hZGVyIHx8IG1fcmVzb3VyY2VN
ZWRpYUxvYWRlciB8fCBtX3BsYXRmb3JtTWVkaWFMb2FkZXIgfHwgIW1fcGFyZW50KQogICAgICAg
ICByZXR1cm47CiAKICAgICBOU1VSTFJlcXVlc3QgKm5zUmVxdWVzdCA9IFttX2F2UmVxdWVzdC5n
ZXQoKSByZXF1ZXN0XTsKQEAgLTI1Myw2ICsyOTcsMTEgQEAgdm9pZCBXZWJDb3JlQVZGUmVzb3Vy
Y2VMb2FkZXI6OnN0YXJ0TG9hZGluZygpCiAgICAgICAgIHJlcXVlc3QuYWRkSFRUUEhlYWRlckZp
ZWxkKEhUVFBIZWFkZXJOYW1lOjpSYW5nZSwgbWFrZVN0cmluZygiYnl0ZXM9IiwgZGF0YVJlcXVl
c3QucmVxdWVzdGVkT2Zmc2V0LCAnLScsIHJhbmdlRW5kKSk7CiAgICAgfQogCisgICAgaWYgKHJl
cXVlc3QudXJsKCkucHJvdG9jb2xJc0RhdGEoKSkgeworICAgICAgICBtX2RhdGFVUkxNZWRpYUxv
YWRlciA9IFdURjo6bWFrZVVuaXF1ZTxEYXRhVVJMUmVzb3VyY2VNZWRpYUxvYWRlcj4oKnRoaXMs
IFdURk1vdmUocmVxdWVzdCkpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgaWYgKGF1
dG8qIGxvYWRlciA9IG1fcGFyZW50LT5wbGF5ZXIoKS0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKSkg
ewogICAgICAgICBtX3Jlc291cmNlTWVkaWFMb2FkZXIgPSBDYWNoZWRSZXNvdXJjZU1lZGlhTG9h
ZGVyOjpjcmVhdGUoKnRoaXMsICpsb2FkZXIsIFJlc291cmNlUmVxdWVzdChyZXF1ZXN0KSk7CiAg
ICAgICAgIGlmIChtX3Jlc291cmNlTWVkaWFMb2FkZXIpCkBAIC0yNzEsNiArMzIwLDcgQEAgdm9p
ZCBXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TG9hZGluZygpCiAKIHZvaWQgV2ViQ29y
ZUFWRlJlc291cmNlTG9hZGVyOjpzdG9wTG9hZGluZygpCiB7CisgICAgbV9kYXRhVVJMTWVkaWFM
b2FkZXIgPSBudWxscHRyOwogICAgIG1fcmVzb3VyY2VNZWRpYUxvYWRlciA9IG51bGxwdHI7CiAK
ICAgICBpZiAobV9wbGF0Zm9ybU1lZGlhTG9hZGVyKSB7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435666</attachid>
            <date>2021-08-16 23:24:00 -0700</date>
            <delta_ts>2021-08-17 00:22:24 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-229169-20210816232400.patch</filename>
            <type>text/plain</type>
            <size>6816</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwOTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkzMzhhN2YzYzc4YWJk
NWM4Y2Y1ZTk2YTc2M2Y2OWU1N2VjNDdmNy4uM2M1Yzg2NjUyM2RlYjY3YTA0Mzg0NmU3Yjk1YTcx
YWE3YzM2NzNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA4LTE2ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIExheW91dFRlc3RzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9pbWFnZWJpdG1h
cC9jcmVhdGVJbWFnZUJpdG1hcC0qIGFyZSBmbGFrZXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTE2OQorCisgICAgICAgIFJldmlld2VkIGJ5IEVy
aWMgQ2FybHNvbi4KKworICAgICAgICBXaGVuIGEgZGF0YTovLyBVUkwgaXMgcGFzc2VkIHRvIEFW
Rm91bmRhdGlvbiwgdGhlIGxvYWRpbmcgb2YgdGhhdCBVUkwgaXMgaGFuZGxlZCBieSBXZWJDb3Jl
QVZGUmVzb3VyY2VMb2FkZXIsCisgICAgICAgIHdoaWNoIGluIHR1cm4gcmVsaWVzIG9uIGEgUGxh
dGZvcm1NZWRpYVJlc291cmNlTG9hZGVyIHRvIHR1cm4gdGhlIGRhdGEgVVJMIGludG8gYSBkYXRh
IGJ1ZmZlci4gSG93ZXZlciwgaW4gdGhlCisgICAgICAgIGNhc2Ugb2YgdGhlIEdQVSBwcm9jZXNz
LCB0aGlzIG1lYW5zIGRpc3BhdGNoaW5nIHRoZSByZXF1ZXN0IGZyb20gR1BVLCB0byBXZWJDb250
ZW50LCB0byBOZXR3b3JrIHByb2Nlc3MgYW5kIHRvCisgICAgICAgIHNlbmQgdGhlIGRhdGEgYmFj
ayBmcm9tIHRoZSBOZXR3b3JrLCB0byBXZWJDb250ZW50LCB0byBHUFUgcHJvY2Vzcy4gSWYgYSBz
eW5jaHJvbm91cyBvcGVyYXRpb24gKGxpa2UgcGFpbnRpbmcpCisgICAgICAgIGlzIHVuZGVyd2F5
LCB0aGUgZGF0YSByZXNwb25zZSBjYW4gYmxvY2sgdW50aWwgdGhhdCBzeW5jaHJvbm91cyBvcGVy
YXRpb24gY29tcGxldGVzLiBJZiB0aGF0IG9wZXJhdGlvbiBpcyBhCisgICAgICAgIHBhaW50LCBh
bmQgdGhlIGRhdGEgcmVxdWVzdGVkIGlzIHJlcXVpcmVkIHRvIGNvbXBsZXRlIHRoYXQgcGFpbnQs
IHRoZSBwYWludCB3aWxsIGZhaWwuCisKKyAgICAgICAgRm9yIHRoZSBuYXJyb3cgY2FzZSBvZiBh
IGRhdGE6Ly8gVVJMLCBpdCdzIG5vdCBuZWNlc3NhcnkgdG8gZGlzcGF0Y2ggdG8gYW5vdGhlciBw
cm9jZXNzIHRvIHR1cm4gdGhhdCBVUkwgaW50bworICAgICAgICBkYXRhOyBpdCBjYW4gaGFwcGVu
IGxvY2FsbHksIGF2b2lkaW5nIHRoZSBob3AgdG8gYW5vdGhlciBwcm9jZXNzIGFuZCB0aGUgc3Vi
c2VxdWVudCBkZWFkbG9jay4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh
dGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6
V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyOjpsb2dnZXIgY29uc3QpOgorICAgICAgICAqIHBsYXRm
b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5t
bToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFVUkxSZXNvdXJjZU1lZGlhTG9hZGVyOjpEYXRhVVJM
UmVzb3VyY2VNZWRpYUxvYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlQVZGUmVzb3Vy
Y2VMb2FkZXI6On5XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6
V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcpOgorCiAyMDIxLTA4LTEyICBK
ZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gRW50ZXIg
ZnVsbHNjcmVlbiBhbmltYXRpb24gaW50ZXJmZXJlcyB3aXRoIGF1dG8taGlkaW5nIG1lbnUgYmFy
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp
b24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5o
CmluZGV4IGRlMGVmN2ExYmEzOTVhODY2Y2FkMDA2ZGMyYmZkNmVlODU3MTQ1MGMuLmYwZDhlNzEx
MzJmNmMyODdhMmU2MjlhNGI4OGE1MzlkZmQ1M2NiZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJj
ZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh
dGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5oCkBAIC0zOCw2ICszOCw3IEBAIE9C
SkNfQ0xBU1MgQVZBc3NldFJlc291cmNlTG9hZGluZ1JlcXVlc3Q7CiBuYW1lc3BhY2UgV2ViQ29y
ZSB7CiAKIGNsYXNzIENhY2hlZFJlc291cmNlTWVkaWFMb2FkZXI7CitjbGFzcyBEYXRhVVJMUmVz
b3VyY2VNZWRpYUxvYWRlcjsKIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i
akM7CiBjbGFzcyBQbGF0Zm9ybVJlc291cmNlTWVkaWFMb2FkZXI7CiBjbGFzcyBSZXNvdXJjZUVy
cm9yOwpAQCAtNTgsNiArNTksNyBAQCBwcml2YXRlOgogICAgIFdlYkNvcmVBVkZSZXNvdXJjZUxv
YWRlcihNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDKiBwYXJlbnQsIEFWQXNzZXRS
ZXNvdXJjZUxvYWRpbmdSZXF1ZXN0ICopOwogCiAgICAgZnJpZW5kIGNsYXNzIENhY2hlZFJlc291
cmNlTWVkaWFMb2FkZXI7CisgICAgZnJpZW5kIGNsYXNzIERhdGFVUkxSZXNvdXJjZU1lZGlhTG9h
ZGVyOwogICAgIGZyaWVuZCBjbGFzcyBQbGF0Zm9ybVJlc291cmNlTWVkaWFMb2FkZXI7CiAKICAg
ICB2b2lkIHJlc3BvbnNlUmVjZWl2ZWQoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwpAQCAtNjcs
NiArNjksNyBAQCBwcml2YXRlOgogCiAgICAgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u
T2JqQyogbV9wYXJlbnQ7CiAgICAgUmV0YWluUHRyPEFWQXNzZXRSZXNvdXJjZUxvYWRpbmdSZXF1
ZXN0PiBtX2F2UmVxdWVzdDsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RGF0YVVSTFJlc291cmNlTWVk
aWFMb2FkZXI+IG1fZGF0YVVSTE1lZGlhTG9hZGVyOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxDYWNo
ZWRSZXNvdXJjZU1lZGlhTG9hZGVyPiBtX3Jlc291cmNlTWVkaWFMb2FkZXI7CiAgICAgV2Vha1B0
cjxQbGF0Zm9ybVJlc291cmNlTWVkaWFMb2FkZXI+IG1fcGxhdGZvcm1NZWRpYUxvYWRlcjsKICAg
ICBzaXplX3QgbV9yZXNwb25zZU9mZnNldCB7IDAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJj
ZUxvYWRlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv
bi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbQppbmRleCAyNDc3MjhlNmNiYzA3ZjI4
MmZhNThmNTE3YjhhNmZlMDZlNWIwNjZhLi42ZGI4Zjg3ZGJmOGRhY2ZiYTM3MzY5NDZiODUzMTk0
YTJiYzgzNjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h
dmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0KKysrIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJl
c291cmNlTG9hZGVyLm1tCkBAIC0yMTgsNiArMjE4LDUwIEBAIHZvaWQgUGxhdGZvcm1SZXNvdXJj
ZU1lZGlhTG9hZGVyOjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiwgY29uc3Qg
dWluCiAgICAgbV9wYXJlbnQubmV3RGF0YVN0b3JlZEluU2hhcmVkQnVmZmVyKCptX2J1ZmZlcik7
CiB9CiAKK2NsYXNzIERhdGFVUkxSZXNvdXJjZU1lZGlhTG9hZGVyIDogcHVibGljIENhbk1ha2VX
ZWFrUHRyPERhdGFVUkxSZXNvdXJjZU1lZGlhTG9hZGVyPiB7CisgICAgV1RGX01BS0VfRkFTVF9B
TExPQ0FURUQ7CitwdWJsaWM6CisgICAgRGF0YVVSTFJlc291cmNlTWVkaWFMb2FkZXIoV2ViQ29y
ZUFWRlJlc291cmNlTG9hZGVyJiwgUmVzb3VyY2VSZXF1ZXN0JiYpOworCitwcml2YXRlOgorICAg
IFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlciYgbV9wYXJlbnQ7CisgICAgc3RkOjp1bmlxdWVfcHRy
PFJlc291cmNlUmVzcG9uc2U+IG1fcmVzcG9uc2U7CisgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4g
bV9idWZmZXI7Cit9OworCitEYXRhVVJMUmVzb3VyY2VNZWRpYUxvYWRlcjo6RGF0YVVSTFJlc291
cmNlTWVkaWFMb2FkZXIoV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyJiBwYXJlbnQsIFJlc291cmNl
UmVxdWVzdCYmIHJlcXVlc3QpCisgICAgOiBtX3BhcmVudChwYXJlbnQpCit7CisgICAgQVNTRVJU
KHJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0RhdGEoKSk7CisKKyAgICBpZiAocmVxdWVzdC51cmwo
KS5wcm90b2NvbElzRGF0YSgpKSB7CisgICAgICAgIGF1dG8gbWltZVR5cGUgPSBtaW1lVHlwZUZy
b21EYXRhVVJMKHJlcXVlc3QudXJsKCkuc3RyaW5nKCkpOworICAgICAgICBhdXRvIG5zRGF0YSA9
IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQ29udGVudHNPZlVSTDpyZXF1ZXN0LnVy
bCgpXSk7CisgICAgICAgIEFTU0VSVChuc0RhdGEpOworICAgICAgICBtX2J1ZmZlciA9IFNoYXJl
ZEJ1ZmZlcjo6Y3JlYXRlKG5zRGF0YS5nZXQoKSk7CisgICAgICAgIG1fcmVzcG9uc2UgPSBXVEY6
Om1ha2VVbmlxdWU8UmVzb3VyY2VSZXNwb25zZT4ocmVxdWVzdC51cmwoKSwgbWltZVR5cGUsIG1f
YnVmZmVyLT5zaXplKCksIGVtcHR5U3RyaW5nKCkpOworICAgIH0KKworICAgIGNhbGxPbk1haW5U
aHJlYWQoW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSB7CisgICAgICAgIGlm
ICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKCFtX2J1ZmZl
ciB8fCAhbV9yZXNwb25zZSkgeworICAgICAgICAgICAgbV9wYXJlbnQubG9hZEZhaWxlZChSZXNv
dXJjZUVycm9yKFJlc291cmNlRXJyb3I6OlR5cGU6OkdlbmVyYWwpKTsKKyAgICAgICAgICAgIHJl
dHVybjsKKyAgICAgICAgfQorICAgICAgICBtX3BhcmVudC5yZXNwb25zZVJlY2VpdmVkKCptX3Jl
c3BvbnNlKTsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJldHVybjsKKwor
ICAgICAgICBtX3BhcmVudC5uZXdEYXRhU3RvcmVkSW5TaGFyZWRCdWZmZXIoKm1fYnVmZmVyKTsK
KyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBt
X3BhcmVudC5sb2FkRmluaXNoZWQoKTsKKyAgICB9KTsKK30KKwogUmVmPFdlYkNvcmVBVkZSZXNv
dXJjZUxvYWRlcj4gV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyOjpjcmVhdGUoTWVkaWFQbGF5ZXJQ
cml2YXRlQVZGb3VuZGF0aW9uT2JqQyogcGFyZW50LCBBVkFzc2V0UmVzb3VyY2VMb2FkaW5nUmVx
dWVzdCAqYXZSZXF1ZXN0KQogewogICAgIEFTU0VSVChhdlJlcXVlc3QpOwpAQCAtMjM4LDcgKzI4
Miw3IEBAIFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6fldlYkNvcmVBVkZSZXNvdXJjZUxvYWRl
cigpCiAKIHZvaWQgV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyOjpzdGFydExvYWRpbmcoKQogewot
ICAgIGlmIChtX3Jlc291cmNlTWVkaWFMb2FkZXIgfHwgbV9wbGF0Zm9ybU1lZGlhTG9hZGVyIHx8
ICFtX3BhcmVudCkKKyAgICBpZiAobV9kYXRhVVJMTWVkaWFMb2FkZXIgfHwgbV9yZXNvdXJjZU1l
ZGlhTG9hZGVyIHx8IG1fcGxhdGZvcm1NZWRpYUxvYWRlciB8fCAhbV9wYXJlbnQpCiAgICAgICAg
IHJldHVybjsKIAogICAgIE5TVVJMUmVxdWVzdCAqbnNSZXF1ZXN0ID0gW21fYXZSZXF1ZXN0Lmdl
dCgpIHJlcXVlc3RdOwpAQCAtMjUzLDYgKzI5NywxMSBAQCB2b2lkIFdlYkNvcmVBVkZSZXNvdXJj
ZUxvYWRlcjo6c3RhcnRMb2FkaW5nKCkKICAgICAgICAgcmVxdWVzdC5hZGRIVFRQSGVhZGVyRmll
bGQoSFRUUEhlYWRlck5hbWU6OlJhbmdlLCBtYWtlU3RyaW5nKCJieXRlcz0iLCBkYXRhUmVxdWVz
dC5yZXF1ZXN0ZWRPZmZzZXQsICctJywgcmFuZ2VFbmQpKTsKICAgICB9CiAKKyAgICBpZiAocmVx
dWVzdC51cmwoKS5wcm90b2NvbElzRGF0YSgpKSB7CisgICAgICAgIG1fZGF0YVVSTE1lZGlhTG9h
ZGVyID0gV1RGOjptYWtlVW5pcXVlPERhdGFVUkxSZXNvdXJjZU1lZGlhTG9hZGVyPigqdGhpcywg
V1RGTW92ZShyZXF1ZXN0KSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBpZiAoYXV0
byogbG9hZGVyID0gbV9wYXJlbnQtPnBsYXllcigpLT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpKSB7
CiAgICAgICAgIG1fcmVzb3VyY2VNZWRpYUxvYWRlciA9IENhY2hlZFJlc291cmNlTWVkaWFMb2Fk
ZXI6OmNyZWF0ZSgqdGhpcywgKmxvYWRlciwgUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpKTsKICAg
ICAgICAgaWYgKG1fcmVzb3VyY2VNZWRpYUxvYWRlcikKQEAgLTI3MSw2ICszMjAsNyBAQCB2b2lk
IFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6c3RhcnRMb2FkaW5nKCkKIAogdm9pZCBXZWJDb3Jl
QVZGUmVzb3VyY2VMb2FkZXI6OnN0b3BMb2FkaW5nKCkKIHsKKyAgICBtX2RhdGFVUkxNZWRpYUxv
YWRlciA9IG51bGxwdHI7CiAgICAgbV9yZXNvdXJjZU1lZGlhTG9hZGVyID0gbnVsbHB0cjsKIAog
ICAgIGlmIChtX3BsYXRmb3JtTWVkaWFMb2FkZXIpIHsK
</data>

          </attachment>
      

    </bug>

</bugzilla>