<?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>225406</bug_id>
          
          <creation_ts>2021-05-05 12:43:52 -0700</creation_ts>
          <short_desc>Add WebKitAdditions stubs for new NetworkLoadMetrics</short_desc>
          <delta_ts>2021-05-05 13:35:01 -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="Alex Christensen">achristensen</reporter>
          <assigned_to name="Alex Christensen">achristensen</assigned_to>
          <cc>jer.noble</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1757044</commentid>
    <comment_count>0</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-05-05 12:43:52 -0700</bug_when>
    <thetext>Add WebKitAdditions stubs for new NetworkLoadMetrics</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1757046</commentid>
    <comment_count>1</comment_count>
      <attachid>427791</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-05-05 12:45:24 -0700</bug_when>
    <thetext>Created attachment 427791
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1757047</commentid>
    <comment_count>2</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-05-05 12:45:27 -0700</bug_when>
    <thetext>&lt;rdar://problem/77563372&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1757072</commentid>
    <comment_count>3</comment_count>
      <attachid>427796</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-05-05 13:21:38 -0700</bug_when>
    <thetext>Created attachment 427796
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1757078</commentid>
    <comment_count>4</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-05-05 13:35:01 -0700</bug_when>
    <thetext>r277038</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427791</attachid>
            <date>2021-05-05 12:45:24 -0700</date>
            <delta_ts>2021-05-05 13:21:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225406-20210505124523.patch</filename>
            <type>text/plain</type>
            <size>9111</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDBhYzc1YzU1OTFjMWQz
MzU3NTZkNjMyZmFhMWM3MzAxZDQxNmY4Ny4uNzllMTRmZTVkMjc5N2QyNjgzMzMyYmYzNWI4NWRi
M2JmZGM5YzU0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA1LTA1ICBBbGV4
IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdl
YktpdEFkZGl0aW9ucyBzdHVicyBmb3IgbmV3IE5ldHdvcmtMb2FkTWV0cmljcworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NDA2CisgICAgICAgIDxy
ZGFyOi8vNzc1NjMzNzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgSSBhbHNvIHJlbW92ZWQgc29tZSBkZWFkIGNvZGUgYW5kIGFkZGVkIHN0YXRpYyBh
c3NlcnRzIHRoYXQgZG8gd2hhdCB0aGUgZGVhZCBjb2RlIHdhcyBpbnRlbmRlZCB0byBkby4KKwor
ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmg6CisgICAgICAg
IChXZWJDb3JlOjpOZXR3b3JrTG9hZE1ldHJpY3M6Omlzb2xhdGVkQ29weSBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpOZXR3b3JrTG9hZE1ldHJpY3M6Om9wZXJhdG9yPT0gY29uc3QpOgorICAg
ICAgICAoV2ViQ29yZTo6TmV0d29ya0xvYWRNZXRyaWNzOjplbmNvZGUgY29uc3QpOgorICAgICAg
ICAoV2ViQ29yZTo6TmV0d29ya0xvYWRNZXRyaWNzOjpkZWNvZGUpOgorICAgICAgICAoV1RGOjpQ
ZXJzaXN0ZW5jZTo6Q29kZXI8T3B0aW9uYWw8V2ViQ29yZTo6TmV0d29ya0xvYWRQcmlvcml0eT4+
OjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoV1RGOjpQZXJzaXN0ZW5jZTo6Q29kZXI8T3B0
aW9uYWw8V2ViQ29yZTo6TmV0d29ya0xvYWRQcmlvcml0eT4+OjpkZWNvZGUpOiBEZWxldGVkLgor
ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbToK
KwogMjAyMS0wNS0wNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg
ICAgU2FtcGxlZCBQYWdlIFRvcCBDb2xvcjogdGFrZSBhZGRpdGlvbmFsIHNuYXBzaG90cyBmdXJ0
aGVyIGRvd24gdGhlIHBhZ2UgdG8gc2VlIGlmIHRoZSBzYW1wbGVkIHRvcCBjb2xvciBpcyBtb3Jl
IHRoYW4ganVzdCBhIHRpbnkgc3RyaXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMTYyMDc5N2YxM2IwM2NlYzg2MjRj
YmRlM2Y0OGVlNmE2ZTllYTczMy4uZjczODg0ZTNlOTU0MmVjNTJjYzZjZmNhZGMwZmY3NjYxNzg3
OWRlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNS0wNSAgQWxleCBDaHJpc3Rl
bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBXZWJLaXRBZGRp
dGlvbnMgc3R1YnMgZm9yIG5ldyBOZXR3b3JrTG9hZE1ldHJpY3MKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTQwNgorICAgICAgICA8cmRhcjovLzc3
NTYzMzcyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAg
KC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246dGFzazpkaWRGaW5pc2hDb2xs
ZWN0aW5nTWV0cmljczpdKToKKwogMjAyMS0wNS0wNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh
cHBsZS5jb20+CiAKICAgICAgICAgU2FtcGxlZCBQYWdlIFRvcCBDb2xvcjogdGFrZSBhZGRpdGlv
bmFsIHNuYXBzaG90cyBmdXJ0aGVyIGRvd24gdGhlIHBhZ2UgdG8gc2VlIGlmIHRoZSBzYW1wbGVk
IHRvcCBjb2xvciBpcyBtb3JlIHRoYW4ganVzdCBhIHRpbnkgc3RyaXAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmggYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtMb2FkTWV0cmljcy5oCmluZGV4IDY1
OWYwY2E5NjA4ZWFiZDM3MWU1ZThiY2Q4NWIxODFjZGQwMjE0NjYuLmI1ZTNhMmJmMDIwODU2NDU2
MWVjZTJiMGNmMmVlYmFjZTcxYzFlZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vbmV0d29yay9OZXR3b3JrTG9hZE1ldHJpY3MuaApAQCAtMzMsNiArMzMsMTggQEAKICNp
bmNsdWRlIDx3dGYvcGVyc2lzdGVuY2UvUGVyc2lzdGVudENvZGVyLmg+CiAjaW5jbHVkZSA8d3Rm
L3RleHQvV1RGU3RyaW5nLmg+CiAKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorI2luY2x1
ZGUgPFdlYktpdEFkZGl0aW9ucy9OZXR3b3JrTG9hZE1ldHJpY3NBZGRpdGlvbnMuaD4KKyNlbHNl
CisjZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNTX0FERElUSU9OU18xCisjZGVmaW5lIE5FVFdP
UktfTE9BRF9NRVRSSUNTX0FERElUSU9OU18yCisjZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNT
X0FERElUSU9OU18zCisjZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNTX0FERElUSU9OU180Cisj
ZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNTX0FERElUSU9OU181CisjZGVmaW5lIE5FVFdPUktf
TE9BRF9NRVRSSUNTX0FERElUSU9OU182CisjZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNTX0FE
RElUSU9OU183CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKENPQ09BKQogT0JKQ19DTEFTUyBOU0Rp
Y3Rpb25hcnk7CiAjZW5kaWYKQEAgLTQ2LDYgKzU4LDggQEAgZW51bSBjbGFzcyBOZXR3b3JrTG9h
ZFByaW9yaXR5IDogdWludDhfdCB7CiAgICAgVW5rbm93biwKIH07CiAKK05FVFdPUktfTE9BRF9N
RVRSSUNTX0FERElUSU9OU18xOworCiBjbGFzcyBOZXR3b3JrTG9hZE1ldHJpY3NXaXRob3V0Tm9u
VGltaW5nRGF0YSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQoTmV0d29ya0xvYWRNZXRy
aWNzV2l0aG91dE5vblRpbWluZ0RhdGEpOwogcHVibGljOgpAQCAtMTExLDYgKzEyNSw3IEBAIHB1
YmxpYzoKICAgICAgICAgY29weS50bHNQcm90b2NvbCA9IHRsc1Byb3RvY29sLmlzb2xhdGVkQ29w
eSgpOwogICAgICAgICBjb3B5LnRsc0NpcGhlciA9IHRsc0NpcGhlci5pc29sYXRlZENvcHkoKTsK
ICAgICAgICAgY29weS5wcmlvcml0eSA9IHByaW9yaXR5OworICAgICAgICBORVRXT1JLX0xPQURf
TUVUUklDU19BRERJVElPTlNfMjsKICAgICAgICAgY29weS5yZXF1ZXN0SGVhZGVycyA9IHJlcXVl
c3RIZWFkZXJzLmlzb2xhdGVkQ29weSgpOwogCiAgICAgICAgIGNvcHkucmVxdWVzdEhlYWRlckJ5
dGVzU2VudCA9IHJlcXVlc3RIZWFkZXJCeXRlc1NlbnQ7CkBAIC0xNDUsNiArMTYwLDcgQEAgcHVi
bGljOgogICAgICAgICAgICAgJiYgdGxzUHJvdG9jb2wgPT0gb3RoZXIudGxzUHJvdG9jb2wKICAg
ICAgICAgICAgICYmIHRsc0NpcGhlciA9PSBvdGhlci50bHNDaXBoZXIKICAgICAgICAgICAgICYm
IHByaW9yaXR5ID09IG90aGVyLnByaW9yaXR5CisgICAgICAgICAgICBORVRXT1JLX0xPQURfTUVU
UklDU19BRERJVElPTlNfMwogICAgICAgICAgICAgJiYgcmVxdWVzdEhlYWRlcnMgPT0gb3RoZXIu
cmVxdWVzdEhlYWRlcnMKICAgICAgICAgICAgICYmIHJlcXVlc3RIZWFkZXJCeXRlc1NlbnQgPT0g
b3RoZXIucmVxdWVzdEhlYWRlckJ5dGVzU2VudAogICAgICAgICAgICAgJiYgcmVxdWVzdEJvZHlC
eXRlc1NlbnQgPT0gb3RoZXIucmVxdWVzdEJvZHlCeXRlc1NlbnQKQEAgLTE2OCw2ICsxODQsNyBA
QCBwdWJsaWM6CiAgICAgU3RyaW5nIHRsc0NpcGhlcjsKIAogICAgIE5ldHdvcmtMb2FkUHJpb3Jp
dHkgcHJpb3JpdHkgeyBOZXR3b3JrTG9hZFByaW9yaXR5OjpVbmtub3duIH07CisgICAgTkVUV09S
S19MT0FEX01FVFJJQ1NfQURESVRJT05TXzQ7CiAKICAgICBIVFRQSGVhZGVyTWFwIHJlcXVlc3RI
ZWFkZXJzOwogCkBAIC0xODUsNiArMjAyLDggQEAgV0VCQ09SRV9FWFBPUlQgQm94PE5ldHdvcmtM
b2FkTWV0cmljcz4gY29weVRpbWluZ0RhdGEoTlNEaWN0aW9uYXJ5ICp0aW1pbmdEYXRhKTsKIHRl
bXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIE5ldHdvcmtMb2FkTWV0cmljczo6ZW5jb2RlKEVu
Y29kZXImIGVuY29kZXIpIGNvbnN0CiB7CisgICAgc3RhdGljX2Fzc2VydChFbmNvZGVyOjppc0lQ
Q0VuY29kZXIsICJOZXR3b3JrTG9hZE1ldHJpY3Mgc2hvdWxkIG5vdCBiZSBzdG9yZWQgYnkgdGhl
IFdURjo6UGVyc2lzdGVuY2U6OkVuY29kZXIiKTsKKwogICAgIGVuY29kZXIgPDwgZmV0Y2hTdGFy
dDsKICAgICBlbmNvZGVyIDw8IGRvbWFpbkxvb2t1cFN0YXJ0OwogICAgIGVuY29kZXIgPDwgZG9t
YWluTG9va3VwRW5kOwpAQCAtMjA2LDYgKzIyNSw3IEBAIHZvaWQgTmV0d29ya0xvYWRNZXRyaWNz
OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IHRsc1Byb3Rv
Y29sOwogICAgIGVuY29kZXIgPDwgdGxzQ2lwaGVyOwogICAgIGVuY29kZXIgPDwgcHJpb3JpdHk7
CisgICAgTkVUV09SS19MT0FEX01FVFJJQ1NfQURESVRJT05TXzU7CiAgICAgZW5jb2RlciA8PCBy
ZXF1ZXN0SGVhZGVyczsKICAgICBlbmNvZGVyIDw8IHJlcXVlc3RIZWFkZXJCeXRlc1NlbnQ7CiAg
ICAgZW5jb2RlciA8PCByZXF1ZXN0Qm9keUJ5dGVzU2VudDsKQEAgLTIxNyw2ICsyMzcsOCBAQCB2
b2lkIE5ldHdvcmtMb2FkTWV0cmljczo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB0
ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPgogYm9vbCBOZXR3b3JrTG9hZE1ldHJpY3M6OmRlY29kZShE
ZWNvZGVyJiBkZWNvZGVyLCBOZXR3b3JrTG9hZE1ldHJpY3MmIG1ldHJpY3MpCiB7CisgICAgc3Rh
dGljX2Fzc2VydChEZWNvZGVyOjppc0lQQ0RlY29kZXIsICJOZXR3b3JrTG9hZE1ldHJpY3Mgc2hv
dWxkIG5vdCBiZSBzdG9yZWQgYnkgdGhlIFdURjo6UGVyc2lzdGVuY2U6OkVuY29kZXIiKTsKKwog
ICAgIHJldHVybiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLmZldGNoU3RhcnQpCiAgICAgICAgICYm
IGRlY29kZXIuZGVjb2RlKG1ldHJpY3MuZG9tYWluTG9va3VwU3RhcnQpCiAgICAgICAgICYmIGRl
Y29kZXIuZGVjb2RlKG1ldHJpY3MuZG9tYWluTG9va3VwRW5kKQpAQCAtMjM4LDYgKzI2MCw3IEBA
IGJvb2wgTmV0d29ya0xvYWRNZXRyaWNzOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwgTmV0d29y
a0xvYWRNZXRyaWNzJiBtZXRyaWNzKQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNz
LnRsc1Byb3RvY29sKQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLnRsc0NpcGhl
cikKICAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0cmljcy5wcmlvcml0eSkKKyAgICAgICAg
TkVUV09SS19MT0FEX01FVFJJQ1NfQURESVRJT05TXzYKICAgICAgICAgJiYgZGVjb2Rlci5kZWNv
ZGUobWV0cmljcy5yZXF1ZXN0SGVhZGVycykKICAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0
cmljcy5yZXF1ZXN0SGVhZGVyQnl0ZXNTZW50KQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZSht
ZXRyaWNzLnJlcXVlc3RCb2R5Qnl0ZXNTZW50KQpAQCAtMjQ4LDIxICsyNzEsNCBAQCBib29sIE5l
dHdvcmtMb2FkTWV0cmljczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIE5ldHdvcmtMb2FkTWV0
cmljcyYgbWV0cmljcykKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCi0vLyBOZXR3b3JrTG9h
ZE1ldHJpY3Mgc2hvdWxkIG5vdCBiZSBzdG9yZWQgYnkgdGhlIFdURjo6UGVyc2lzdGVuY2U6OkRl
Y29kZXIuCi1uYW1lc3BhY2UgV1RGIHsKLW5hbWVzcGFjZSBQZXJzaXN0ZW5jZSB7Ci0KLXRlbXBs
YXRlPD4gc3RydWN0IENvZGVyPE9wdGlvbmFsPFdlYkNvcmU6Ok5ldHdvcmtMb2FkUHJpb3JpdHk+
PiB7Ci0gICAgc3RhdGljIE5PX1JFVFVSTl9EVUVfVE9fQVNTRVJUIHZvaWQgZW5jb2RlKEVuY29k
ZXImLCBjb25zdCBPcHRpb25hbDxXZWJDb3JlOjpOZXR3b3JrTG9hZFByaW9yaXR5PiYpCi0gICAg
ewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgYm9v
bCBkZWNvZGUoRGVjb2RlciYsIE9wdGlvbmFsPFdlYkNvcmU6Ok5ldHdvcmtMb2FkUHJpb3JpdHk+
JikKLSAgICB7Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4g
ZmFsc2U7Ci0gICAgfQotfTsKLQotfX0gLy8gbmFtZXNwYWNlIFdURjo6UGVyc2lzdGVuY2UKK05F
VFdPUktfTE9BRF9NRVRSSUNTX0FERElUSU9OU183CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0gYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0KaW5k
ZXggNTI5Njk1ZjcxYzZhYjFmNDNjY2U0ZmIxMzBiODQ0MjJlNjBmNWYxOS4uZDAxNWRmNjI0NDY0
OTJjNjVhYmFlZjgxZGMwYzIxZDY2YWRhNjdlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbQpA
QCAtMzAsMTEgKzMwLDE5IEBACiAjaW1wb3J0ICJQYXJzZWRSZXF1ZXN0UmFuZ2UuaCIKICNpbXBv
cnQgIlBsYXRmb3JtTWVkaWFSZXNvdXJjZUxvYWRlci5oIgogI2ltcG9ydCAiU3VicmVzb3VyY2VM
b2FkZXIuaCIKKyNpbXBvcnQgPHBhbC9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmg+CiAjaW1wb3J0IDx3
dGYvQmxvY2tQdHIuaD4KICNpbXBvcnQgPHd0Zi9Db21wbGV0aW9uSGFuZGxlci5oPgogI2ltcG9y
dCA8d3RmL1dlYWtPYmpDUHRyLmg+CiAjaW1wb3J0IDx3dGYvY29jb2EvVmVjdG9yQ29jb2EuaD4K
IAorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25z
L1dlYkNvcmVOU1VSTFNlc3Npb25BZGRpdGlvbnMuaD4KKyNlbHNlCisjZGVmaW5lIFdFQkNPUkVf
U0VTU0lPTl9BRERJVElPTlNfMQorI2RlZmluZSBXRUJDT1JFX1NFU1NJT05fQURESVRJT05TXzIK
KyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogI3ByYWdtYSBtYXJrIC0gUHJp
dmF0ZSBkZWNsYXJhdGlvbnMKQEAgLTY3LDYgKzc1LDcgQEAgc3RhdGljIE5TRGF0ZSAqIF9fbnVs
bGFibGUgbmV0d29ya0xvYWRNZXRyaWNzRGF0ZShTZWNvbmRzIGZldGNoU3RhcnQsIFNlY29uZHMg
ZGUKIEBwcm9wZXJ0eSAocmVhZG9ubHksIGdldHRlcj1pc0V4cGVuc2l2ZSkgQk9PTCBleHBlbnNp
dmU7CiBAcHJvcGVydHkgKHJlYWRvbmx5LCBnZXR0ZXI9aXNDb25zdHJhaW5lZCkgQk9PTCBjb25z
dHJhaW5lZDsKIEBwcm9wZXJ0eSAocmVhZG9ubHksIGdldHRlcj1pc011bHRpcGF0aCkgQk9PTCBt
dWx0aXBhdGg7CitXRUJDT1JFX1NFU1NJT05fQURESVRJT05TXzE7CiBAZW5kCiAKIEBpbXBsZW1l
bnRhdGlvbiBXZWJDb3JlTlNVUkxTZXNzaW9uVGFza1RyYW5zYWN0aW9uTWV0cmljcyB7CkBAIC0x
NDcsNiArMTU2LDggQEAgc3RhdGljIE5TRGF0ZSAqIF9fbnVsbGFibGUgbmV0d29ya0xvYWRNZXRy
aWNzRGF0ZShTZWNvbmRzIGZldGNoU3RhcnQsIFNlY29uZHMgZGUKICAgICByZXR1cm4gX21ldHJp
Y3MuaXNSZXVzZWRDb25uZWN0aW9uOwogfQogCitXRUJDT1JFX1NFU1NJT05fQURESVRJT05TXzIK
KwogQGR5bmFtaWMgY2VsbHVsYXI7CiAtIChCT09MKWNlbGx1bGFyCiB7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0g
Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2Eu
bW0KaW5kZXggYTdjMmM3ZGUwNGM2ZWM1MDdlMWM3NGY3NDdmZTZmMjY4YzE1ZGExZS4uYjA4OTY3
OGMwZDUxYjA1YTc4ODBlNzk3MDI2YzgwYzE1YWI5OTAzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1Nv
dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpA
QCAtMTIwLDYgKzEyMCw4IEBAIHN0YXRpYyBXZWJDb3JlOjpOZXR3b3JrTG9hZFByaW9yaXR5IHRv
TmV0d29ya0xvYWRQcmlvcml0eShmbG9hdCBwcmlvcml0eSkKICAgICByZXR1cm4gV2ViQ29yZTo6
TmV0d29ya0xvYWRQcmlvcml0eTo6TWVkaXVtOwogfQogCitORVRXT1JLX1NFU1NJT05fQ09DT0Ff
QURESVRJT05TXzIKKwogI2lmIEhBVkUoQ0ZORVRXT1JLX05FR09USUFURURfU1NMX1BST1RPQ09M
X0NJUEhFUikKICNpZiBIQVZFKENGTkVUV09SS19NRVRSSUNTX0FQSVNfVjQpCiBzdGF0aWMgU3Ry
aW5nIHN0cmluZ0ZvclRMU1Byb3RvY29sVmVyc2lvbih0bHNfcHJvdG9jb2xfdmVyc2lvbl90IHBy
b3RvY29sKQpAQCAtODAxLDYgKzgwMyw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwcm9jZXNzU2Vy
dmVyVHJ1c3RFdmFsdWF0aW9uKE5ldHdvcmtTZXNzaW9uQ29jb2EmIHNlc3Npb24sIFNlCiAjZW5k
aWYKICAgICAgICAgbmV0d29ya0xvYWRNZXRyaWNzLmlzUmV1c2VkQ29ubmVjdGlvbiA9IG0uaXNS
ZXVzZWRDb25uZWN0aW9uOwogCisgICAgICAgIE5FVFdPUktfU0VTU0lPTl9DT0NPQV9BRERJVElP
TlNfMworCiAgICAgICAgIGlmIChuZXR3b3JrRGF0YVRhc2stPnNob3VsZENhcHR1cmVFeHRyYU5l
dHdvcmtMb2FkTWV0cmljcygpKSB7CiAgICAgICAgICAgICBuZXR3b3JrTG9hZE1ldHJpY3MucHJp
b3JpdHkgPSB0b05ldHdvcmtMb2FkUHJpb3JpdHkodGFzay5wcmlvcml0eSk7CiAK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427796</attachid>
            <date>2021-05-05 13:21:38 -0700</date>
            <delta_ts>2021-05-05 13:32:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225406-20210505132137.patch</filename>
            <type>text/plain</type>
            <size>9475</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDBhYzc1YzU1OTFjMWQz
MzU3NTZkNjMyZmFhMWM3MzAxZDQxNmY4Ny4uNzllMTRmZTVkMjc5N2QyNjgzMzMyYmYzNWI4NWRi
M2JmZGM5YzU0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA1LTA1ICBBbGV4
IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdl
YktpdEFkZGl0aW9ucyBzdHVicyBmb3IgbmV3IE5ldHdvcmtMb2FkTWV0cmljcworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NDA2CisgICAgICAgIDxy
ZGFyOi8vNzc1NjMzNzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgSSBhbHNvIHJlbW92ZWQgc29tZSBkZWFkIGNvZGUgYW5kIGFkZGVkIHN0YXRpYyBh
c3NlcnRzIHRoYXQgZG8gd2hhdCB0aGUgZGVhZCBjb2RlIHdhcyBpbnRlbmRlZCB0byBkby4KKwor
ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmg6CisgICAgICAg
IChXZWJDb3JlOjpOZXR3b3JrTG9hZE1ldHJpY3M6Omlzb2xhdGVkQ29weSBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpOZXR3b3JrTG9hZE1ldHJpY3M6Om9wZXJhdG9yPT0gY29uc3QpOgorICAg
ICAgICAoV2ViQ29yZTo6TmV0d29ya0xvYWRNZXRyaWNzOjplbmNvZGUgY29uc3QpOgorICAgICAg
ICAoV2ViQ29yZTo6TmV0d29ya0xvYWRNZXRyaWNzOjpkZWNvZGUpOgorICAgICAgICAoV1RGOjpQ
ZXJzaXN0ZW5jZTo6Q29kZXI8T3B0aW9uYWw8V2ViQ29yZTo6TmV0d29ya0xvYWRQcmlvcml0eT4+
OjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoV1RGOjpQZXJzaXN0ZW5jZTo6Q29kZXI8T3B0
aW9uYWw8V2ViQ29yZTo6TmV0d29ya0xvYWRQcmlvcml0eT4+OjpkZWNvZGUpOiBEZWxldGVkLgor
ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbToK
KwogMjAyMS0wNS0wNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg
ICAgU2FtcGxlZCBQYWdlIFRvcCBDb2xvcjogdGFrZSBhZGRpdGlvbmFsIHNuYXBzaG90cyBmdXJ0
aGVyIGRvd24gdGhlIHBhZ2UgdG8gc2VlIGlmIHRoZSBzYW1wbGVkIHRvcCBjb2xvciBpcyBtb3Jl
IHRoYW4ganVzdCBhIHRpbnkgc3RyaXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMTYyMDc5N2YxM2IwM2NlYzg2MjRj
YmRlM2Y0OGVlNmE2ZTllYTczMy4uZjczODg0ZTNlOTU0MmVjNTJjYzZjZmNhZGMwZmY3NjYxNzg3
OWRlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNS0wNSAgQWxleCBDaHJpc3Rl
bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBXZWJLaXRBZGRp
dGlvbnMgc3R1YnMgZm9yIG5ldyBOZXR3b3JrTG9hZE1ldHJpY3MKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTQwNgorICAgICAgICA8cmRhcjovLzc3
NTYzMzcyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAg
KC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246dGFzazpkaWRGaW5pc2hDb2xs
ZWN0aW5nTWV0cmljczpdKToKKwogMjAyMS0wNS0wNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh
cHBsZS5jb20+CiAKICAgICAgICAgU2FtcGxlZCBQYWdlIFRvcCBDb2xvcjogdGFrZSBhZGRpdGlv
bmFsIHNuYXBzaG90cyBmdXJ0aGVyIGRvd24gdGhlIHBhZ2UgdG8gc2VlIGlmIHRoZSBzYW1wbGVk
IHRvcCBjb2xvciBpcyBtb3JlIHRoYW4ganVzdCBhIHRpbnkgc3RyaXAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmggYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtMb2FkTWV0cmljcy5oCmluZGV4IDY1
OWYwY2E5NjA4ZWFiZDM3MWU1ZThiY2Q4NWIxODFjZGQwMjE0NjYuLmI1ZTNhMmJmMDIwODU2NDU2
MWVjZTJiMGNmMmVlYmFjZTcxYzFlZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vbmV0d29yay9OZXR3b3JrTG9hZE1ldHJpY3MuaApAQCAtMzMsNiArMzMsMTggQEAKICNp
bmNsdWRlIDx3dGYvcGVyc2lzdGVuY2UvUGVyc2lzdGVudENvZGVyLmg+CiAjaW5jbHVkZSA8d3Rm
L3RleHQvV1RGU3RyaW5nLmg+CiAKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorI2luY2x1
ZGUgPFdlYktpdEFkZGl0aW9ucy9OZXR3b3JrTG9hZE1ldHJpY3NBZGRpdGlvbnMuaD4KKyNlbHNl
CisjZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNTX0FERElUSU9OU18xCisjZGVmaW5lIE5FVFdP
UktfTE9BRF9NRVRSSUNTX0FERElUSU9OU18yCisjZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNT
X0FERElUSU9OU18zCisjZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNTX0FERElUSU9OU180Cisj
ZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNTX0FERElUSU9OU181CisjZGVmaW5lIE5FVFdPUktf
TE9BRF9NRVRSSUNTX0FERElUSU9OU182CisjZGVmaW5lIE5FVFdPUktfTE9BRF9NRVRSSUNTX0FE
RElUSU9OU183CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKENPQ09BKQogT0JKQ19DTEFTUyBOU0Rp
Y3Rpb25hcnk7CiAjZW5kaWYKQEAgLTQ2LDYgKzU4LDggQEAgZW51bSBjbGFzcyBOZXR3b3JrTG9h
ZFByaW9yaXR5IDogdWludDhfdCB7CiAgICAgVW5rbm93biwKIH07CiAKK05FVFdPUktfTE9BRF9N
RVRSSUNTX0FERElUSU9OU18xOworCiBjbGFzcyBOZXR3b3JrTG9hZE1ldHJpY3NXaXRob3V0Tm9u
VGltaW5nRGF0YSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQoTmV0d29ya0xvYWRNZXRy
aWNzV2l0aG91dE5vblRpbWluZ0RhdGEpOwogcHVibGljOgpAQCAtMTExLDYgKzEyNSw3IEBAIHB1
YmxpYzoKICAgICAgICAgY29weS50bHNQcm90b2NvbCA9IHRsc1Byb3RvY29sLmlzb2xhdGVkQ29w
eSgpOwogICAgICAgICBjb3B5LnRsc0NpcGhlciA9IHRsc0NpcGhlci5pc29sYXRlZENvcHkoKTsK
ICAgICAgICAgY29weS5wcmlvcml0eSA9IHByaW9yaXR5OworICAgICAgICBORVRXT1JLX0xPQURf
TUVUUklDU19BRERJVElPTlNfMjsKICAgICAgICAgY29weS5yZXF1ZXN0SGVhZGVycyA9IHJlcXVl
c3RIZWFkZXJzLmlzb2xhdGVkQ29weSgpOwogCiAgICAgICAgIGNvcHkucmVxdWVzdEhlYWRlckJ5
dGVzU2VudCA9IHJlcXVlc3RIZWFkZXJCeXRlc1NlbnQ7CkBAIC0xNDUsNiArMTYwLDcgQEAgcHVi
bGljOgogICAgICAgICAgICAgJiYgdGxzUHJvdG9jb2wgPT0gb3RoZXIudGxzUHJvdG9jb2wKICAg
ICAgICAgICAgICYmIHRsc0NpcGhlciA9PSBvdGhlci50bHNDaXBoZXIKICAgICAgICAgICAgICYm
IHByaW9yaXR5ID09IG90aGVyLnByaW9yaXR5CisgICAgICAgICAgICBORVRXT1JLX0xPQURfTUVU
UklDU19BRERJVElPTlNfMwogICAgICAgICAgICAgJiYgcmVxdWVzdEhlYWRlcnMgPT0gb3RoZXIu
cmVxdWVzdEhlYWRlcnMKICAgICAgICAgICAgICYmIHJlcXVlc3RIZWFkZXJCeXRlc1NlbnQgPT0g
b3RoZXIucmVxdWVzdEhlYWRlckJ5dGVzU2VudAogICAgICAgICAgICAgJiYgcmVxdWVzdEJvZHlC
eXRlc1NlbnQgPT0gb3RoZXIucmVxdWVzdEJvZHlCeXRlc1NlbnQKQEAgLTE2OCw2ICsxODQsNyBA
QCBwdWJsaWM6CiAgICAgU3RyaW5nIHRsc0NpcGhlcjsKIAogICAgIE5ldHdvcmtMb2FkUHJpb3Jp
dHkgcHJpb3JpdHkgeyBOZXR3b3JrTG9hZFByaW9yaXR5OjpVbmtub3duIH07CisgICAgTkVUV09S
S19MT0FEX01FVFJJQ1NfQURESVRJT05TXzQ7CiAKICAgICBIVFRQSGVhZGVyTWFwIHJlcXVlc3RI
ZWFkZXJzOwogCkBAIC0xODUsNiArMjAyLDggQEAgV0VCQ09SRV9FWFBPUlQgQm94PE5ldHdvcmtM
b2FkTWV0cmljcz4gY29weVRpbWluZ0RhdGEoTlNEaWN0aW9uYXJ5ICp0aW1pbmdEYXRhKTsKIHRl
bXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIE5ldHdvcmtMb2FkTWV0cmljczo6ZW5jb2RlKEVu
Y29kZXImIGVuY29kZXIpIGNvbnN0CiB7CisgICAgc3RhdGljX2Fzc2VydChFbmNvZGVyOjppc0lQ
Q0VuY29kZXIsICJOZXR3b3JrTG9hZE1ldHJpY3Mgc2hvdWxkIG5vdCBiZSBzdG9yZWQgYnkgdGhl
IFdURjo6UGVyc2lzdGVuY2U6OkVuY29kZXIiKTsKKwogICAgIGVuY29kZXIgPDwgZmV0Y2hTdGFy
dDsKICAgICBlbmNvZGVyIDw8IGRvbWFpbkxvb2t1cFN0YXJ0OwogICAgIGVuY29kZXIgPDwgZG9t
YWluTG9va3VwRW5kOwpAQCAtMjA2LDYgKzIyNSw3IEBAIHZvaWQgTmV0d29ya0xvYWRNZXRyaWNz
OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IHRsc1Byb3Rv
Y29sOwogICAgIGVuY29kZXIgPDwgdGxzQ2lwaGVyOwogICAgIGVuY29kZXIgPDwgcHJpb3JpdHk7
CisgICAgTkVUV09SS19MT0FEX01FVFJJQ1NfQURESVRJT05TXzU7CiAgICAgZW5jb2RlciA8PCBy
ZXF1ZXN0SGVhZGVyczsKICAgICBlbmNvZGVyIDw8IHJlcXVlc3RIZWFkZXJCeXRlc1NlbnQ7CiAg
ICAgZW5jb2RlciA8PCByZXF1ZXN0Qm9keUJ5dGVzU2VudDsKQEAgLTIxNyw2ICsyMzcsOCBAQCB2
b2lkIE5ldHdvcmtMb2FkTWV0cmljczo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB0
ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPgogYm9vbCBOZXR3b3JrTG9hZE1ldHJpY3M6OmRlY29kZShE
ZWNvZGVyJiBkZWNvZGVyLCBOZXR3b3JrTG9hZE1ldHJpY3MmIG1ldHJpY3MpCiB7CisgICAgc3Rh
dGljX2Fzc2VydChEZWNvZGVyOjppc0lQQ0RlY29kZXIsICJOZXR3b3JrTG9hZE1ldHJpY3Mgc2hv
dWxkIG5vdCBiZSBzdG9yZWQgYnkgdGhlIFdURjo6UGVyc2lzdGVuY2U6OkVuY29kZXIiKTsKKwog
ICAgIHJldHVybiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLmZldGNoU3RhcnQpCiAgICAgICAgICYm
IGRlY29kZXIuZGVjb2RlKG1ldHJpY3MuZG9tYWluTG9va3VwU3RhcnQpCiAgICAgICAgICYmIGRl
Y29kZXIuZGVjb2RlKG1ldHJpY3MuZG9tYWluTG9va3VwRW5kKQpAQCAtMjM4LDYgKzI2MCw3IEBA
IGJvb2wgTmV0d29ya0xvYWRNZXRyaWNzOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwgTmV0d29y
a0xvYWRNZXRyaWNzJiBtZXRyaWNzKQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNz
LnRsc1Byb3RvY29sKQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLnRsc0NpcGhl
cikKICAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0cmljcy5wcmlvcml0eSkKKyAgICAgICAg
TkVUV09SS19MT0FEX01FVFJJQ1NfQURESVRJT05TXzYKICAgICAgICAgJiYgZGVjb2Rlci5kZWNv
ZGUobWV0cmljcy5yZXF1ZXN0SGVhZGVycykKICAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0
cmljcy5yZXF1ZXN0SGVhZGVyQnl0ZXNTZW50KQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZSht
ZXRyaWNzLnJlcXVlc3RCb2R5Qnl0ZXNTZW50KQpAQCAtMjQ4LDIxICsyNzEsNCBAQCBib29sIE5l
dHdvcmtMb2FkTWV0cmljczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIE5ldHdvcmtMb2FkTWV0
cmljcyYgbWV0cmljcykKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCi0vLyBOZXR3b3JrTG9h
ZE1ldHJpY3Mgc2hvdWxkIG5vdCBiZSBzdG9yZWQgYnkgdGhlIFdURjo6UGVyc2lzdGVuY2U6OkRl
Y29kZXIuCi1uYW1lc3BhY2UgV1RGIHsKLW5hbWVzcGFjZSBQZXJzaXN0ZW5jZSB7Ci0KLXRlbXBs
YXRlPD4gc3RydWN0IENvZGVyPE9wdGlvbmFsPFdlYkNvcmU6Ok5ldHdvcmtMb2FkUHJpb3JpdHk+
PiB7Ci0gICAgc3RhdGljIE5PX1JFVFVSTl9EVUVfVE9fQVNTRVJUIHZvaWQgZW5jb2RlKEVuY29k
ZXImLCBjb25zdCBPcHRpb25hbDxXZWJDb3JlOjpOZXR3b3JrTG9hZFByaW9yaXR5PiYpCi0gICAg
ewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgYm9v
bCBkZWNvZGUoRGVjb2RlciYsIE9wdGlvbmFsPFdlYkNvcmU6Ok5ldHdvcmtMb2FkUHJpb3JpdHk+
JikKLSAgICB7Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4g
ZmFsc2U7Ci0gICAgfQotfTsKLQotfX0gLy8gbmFtZXNwYWNlIFdURjo6UGVyc2lzdGVuY2UKK05F
VFdPUktfTE9BRF9NRVRSSUNTX0FERElUSU9OU183CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0gYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0KaW5k
ZXggNTI5Njk1ZjcxYzZhYjFmNDNjY2U0ZmIxMzBiODQ0MjJlNjBmNWYxOS4uZDAxNWRmNjI0NDY0
OTJjNjVhYmFlZjgxZGMwYzIxZDY2YWRhNjdlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbQpA
QCAtMzAsMTEgKzMwLDE5IEBACiAjaW1wb3J0ICJQYXJzZWRSZXF1ZXN0UmFuZ2UuaCIKICNpbXBv
cnQgIlBsYXRmb3JtTWVkaWFSZXNvdXJjZUxvYWRlci5oIgogI2ltcG9ydCAiU3VicmVzb3VyY2VM
b2FkZXIuaCIKKyNpbXBvcnQgPHBhbC9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmg+CiAjaW1wb3J0IDx3
dGYvQmxvY2tQdHIuaD4KICNpbXBvcnQgPHd0Zi9Db21wbGV0aW9uSGFuZGxlci5oPgogI2ltcG9y
dCA8d3RmL1dlYWtPYmpDUHRyLmg+CiAjaW1wb3J0IDx3dGYvY29jb2EvVmVjdG9yQ29jb2EuaD4K
IAorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25z
L1dlYkNvcmVOU1VSTFNlc3Npb25BZGRpdGlvbnMuaD4KKyNlbHNlCisjZGVmaW5lIFdFQkNPUkVf
U0VTU0lPTl9BRERJVElPTlNfMQorI2RlZmluZSBXRUJDT1JFX1NFU1NJT05fQURESVRJT05TXzIK
KyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogI3ByYWdtYSBtYXJrIC0gUHJp
dmF0ZSBkZWNsYXJhdGlvbnMKQEAgLTY3LDYgKzc1LDcgQEAgc3RhdGljIE5TRGF0ZSAqIF9fbnVs
bGFibGUgbmV0d29ya0xvYWRNZXRyaWNzRGF0ZShTZWNvbmRzIGZldGNoU3RhcnQsIFNlY29uZHMg
ZGUKIEBwcm9wZXJ0eSAocmVhZG9ubHksIGdldHRlcj1pc0V4cGVuc2l2ZSkgQk9PTCBleHBlbnNp
dmU7CiBAcHJvcGVydHkgKHJlYWRvbmx5LCBnZXR0ZXI9aXNDb25zdHJhaW5lZCkgQk9PTCBjb25z
dHJhaW5lZDsKIEBwcm9wZXJ0eSAocmVhZG9ubHksIGdldHRlcj1pc011bHRpcGF0aCkgQk9PTCBt
dWx0aXBhdGg7CitXRUJDT1JFX1NFU1NJT05fQURESVRJT05TXzE7CiBAZW5kCiAKIEBpbXBsZW1l
bnRhdGlvbiBXZWJDb3JlTlNVUkxTZXNzaW9uVGFza1RyYW5zYWN0aW9uTWV0cmljcyB7CkBAIC0x
NDcsNiArMTU2LDggQEAgc3RhdGljIE5TRGF0ZSAqIF9fbnVsbGFibGUgbmV0d29ya0xvYWRNZXRy
aWNzRGF0ZShTZWNvbmRzIGZldGNoU3RhcnQsIFNlY29uZHMgZGUKICAgICByZXR1cm4gX21ldHJp
Y3MuaXNSZXVzZWRDb25uZWN0aW9uOwogfQogCitXRUJDT1JFX1NFU1NJT05fQURESVRJT05TXzIK
KwogQGR5bmFtaWMgY2VsbHVsYXI7CiAtIChCT09MKWNlbGx1bGFyCiB7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0g
Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2Eu
bW0KaW5kZXggYTdjMmM3ZGUwNGM2ZWM1MDdlMWM3NGY3NDdmZTZmMjY4YzE1ZGExZS4uYjk5Y2Nh
NjA1ZWZmMGU2MDZjOWFkZmY5NWRkMGI0OWQ2MTBkYjhmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1Nv
dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpA
QCAtNjQsNiArNjQsOCBAQAogI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL05ldHdvcmtTZXNzaW9u
Q29jb2FBZGRpdGlvbnMuaD4KICNlbHNlCiAjZGVmaW5lIE5FVFdPUktfU0VTU0lPTl9DT0NPQV9B
RERJVElPTlNfMQorI2RlZmluZSBORVRXT1JLX1NFU1NJT05fQ09DT0FfQURESVRJT05TXzIKKyNk
ZWZpbmUgTkVUV09SS19TRVNTSU9OX0NPQ09BX0FERElUSU9OU18zCiB2b2lkIFdlYktpdDo6TmV0
d29ya1Nlc3Npb25Db2NvYTo6cmVtb3ZlTmV0d29ya1dlYnNpdGVEYXRhKFdhbGxUaW1lLCBDb21w
bGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpIHsgY29tcGxldGlvbkhh
bmRsZXIoKTsgfQogI2VuZGlmCiAKQEAgLTEyMCw2ICsxMjIsOCBAQCBzdGF0aWMgV2ViQ29yZTo6
TmV0d29ya0xvYWRQcmlvcml0eSB0b05ldHdvcmtMb2FkUHJpb3JpdHkoZmxvYXQgcHJpb3JpdHkp
CiAgICAgcmV0dXJuIFdlYkNvcmU6Ok5ldHdvcmtMb2FkUHJpb3JpdHk6Ok1lZGl1bTsKIH0KIAor
TkVUV09SS19TRVNTSU9OX0NPQ09BX0FERElUSU9OU18yCisKICNpZiBIQVZFKENGTkVUV09SS19O
RUdPVElBVEVEX1NTTF9QUk9UT0NPTF9DSVBIRVIpCiAjaWYgSEFWRShDRk5FVFdPUktfTUVUUklD
U19BUElTX1Y0KQogc3RhdGljIFN0cmluZyBzdHJpbmdGb3JUTFNQcm90b2NvbFZlcnNpb24odGxz
X3Byb3RvY29sX3ZlcnNpb25fdCBwcm90b2NvbCkKQEAgLTgwMSw2ICs4MDUsOCBAQCBzdGF0aWMg
aW5saW5lIHZvaWQgcHJvY2Vzc1NlcnZlclRydXN0RXZhbHVhdGlvbihOZXR3b3JrU2Vzc2lvbkNv
Y29hJiBzZXNzaW9uLCBTZQogI2VuZGlmCiAgICAgICAgIG5ldHdvcmtMb2FkTWV0cmljcy5pc1Jl
dXNlZENvbm5lY3Rpb24gPSBtLmlzUmV1c2VkQ29ubmVjdGlvbjsKIAorICAgICAgICBORVRXT1JL
X1NFU1NJT05fQ09DT0FfQURESVRJT05TXzMKKwogICAgICAgICBpZiAobmV0d29ya0RhdGFUYXNr
LT5zaG91bGRDYXB0dXJlRXh0cmFOZXR3b3JrTG9hZE1ldHJpY3MoKSkgewogICAgICAgICAgICAg
bmV0d29ya0xvYWRNZXRyaWNzLnByaW9yaXR5ID0gdG9OZXR3b3JrTG9hZFByaW9yaXR5KHRhc2su
cHJpb3JpdHkpOwogCg==
</data>
<flag name="review"
          id="448523"
          type_id="1"
          status="+"
          setter="jer.noble"
    />
          </attachment>
      

    </bug>

</bugzilla>