<?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>173953</bug_id>
          
          <creation_ts>2017-06-28 19:35:20 -0700</creation_ts>
          <short_desc>[ResourceLoadStatistics] Simplify PrevalentResourceTelemetry struct</short_desc>
          <delta_ts>2017-06-28 22:43:09 -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>WebCore Misc.</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></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>buildbot</cc>
    
    <cc>commit-queue</cc>
    
    <cc>dbates</cc>
    
    <cc>japhet</cc>
    
    <cc>sam</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1323797</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2017-06-28 19:35:20 -0700</bug_when>
    <thetext>Simplify PrevalentResourceTelemetry struct.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1323798</commentid>
    <comment_count>1</comment_count>
      <attachid>314091</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2017-06-28 19:36:35 -0700</bug_when>
    <thetext>Created attachment 314091
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1323831</commentid>
    <comment_count>2</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2017-06-28 20:30:37 -0700</bug_when>
    <thetext>Oh Windows...

C:\cygwin\home\buildbot\WebKit\Source\WebCore\loader\ResourceLoadStatisticsStore.cpp(396): error C2664: &apos;void WTF::Vector&lt;WebCore::PrevalentResourceTelemetry,0,WTF::CrashOnOverflow,16&gt;::append(WebCore::PrevalentResourceTelemetry &amp;&amp;)&apos;: cannot convert argument 1 from &apos;initializer list&apos; to &apos;WebCore::PrevalentResourceTelemetry &amp;&amp;&apos; [C:\cygwin\home\buildbot\WebKit\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj]
  C:\cygwin\home\buildbot\WebKit\Source\WebCore\loader\ResourceLoadStatisticsStore.cpp(396): note: Reason: cannot convert from &apos;initializer list&apos; to &apos;WebCore::PrevalentResourceTelemetry&apos;
  C:\cygwin\home\buildbot\WebKit\Source\WebCore\loader\ResourceLoadStatisticsStore.cpp(396): note: No constructor could take the source type, or constructor overload resolution was ambiguous</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1323833</commentid>
    <comment_count>3</comment_count>
      <attachid>314103</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2017-06-28 20:31:45 -0700</bug_when>
    <thetext>Created attachment 314103
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1323847</commentid>
    <comment_count>4</comment_count>
      <attachid>314103</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2017-06-28 20:57:15 -0700</bug_when>
    <thetext>Comment on attachment 314103
Patch

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

&gt; Source/WebCore/loader/ResourceLoadStatisticsStore.cpp:389
&gt; +        sorted.append(PrevalentResourceTelemetry {

Even with an explicit PrevalentResourceTelemetry { }

Windows...
C:\cygwin\home\buildbot\WebKit\Source\WebCore\loader\ResourceLoadStatisticsStore.cpp(396): error C2440: &apos;initializing&apos;: cannot convert from &apos;initializer list&apos; to &apos;WebCore::PrevalentResourceTelemetry&apos; [C:\cygwin\home\buildbot\WebKit\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj]
  C:\cygwin\home\buildbot\WebKit\Source\WebCore\loader\ResourceLoadStatisticsStore.cpp(396): note: No constructor could take the source type, or constructor overload resolution was ambiguous
  Generate bindings (WebCoreTestSupportBindings)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1323854</commentid>
    <comment_count>5</comment_count>
      <attachid>314108</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2017-06-28 21:02:52 -0700</bug_when>
    <thetext>Created attachment 314108
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1323886</commentid>
    <comment_count>6</comment_count>
      <attachid>314108</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-06-28 22:43:08 -0700</bug_when>
    <thetext>Comment on attachment 314108
Patch

Clearing flags on attachment: 314108

Committed r218918: &lt;http://trac.webkit.org/changeset/218918&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1323887</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-06-28 22:43:09 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314091</attachid>
            <date>2017-06-28 19:36:35 -0700</date>
            <delta_ts>2017-06-28 20:31:44 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-173953-20170628193635.patch</filename>
            <type>text/plain</type>
            <size>5309</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZThkY2U3MmFmNTFiMzRk
Njk4ZmQ1MTk4ZTU4YzczNjQzMzc0NWRjYi4uMTBiMWU2NWE3MTU1NDMwMzFiODJhM2ZmZWNkMGEz
NjE2MzE2OGIxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA2LTI4ICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1Jlc291cmNlTG9hZFN0YXRp
c3RpY3NdIFNpbXBsaWZ5IFByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5IHN0cnVjdAorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczOTUzCisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3Vy
Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9h
ZFN0YXRpc3RpY3NTdG9yZTo6c29ydGVkUHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnkpOgorICAg
ICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKyAgICAgICAgKFdl
YkNvcmU6OlByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5OjpQcmV2YWxlbnRSZXNvdXJjZVRlbGVt
ZXRyeSk6IERlbGV0ZWQuCisKIDIwMTctMDYtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh
cmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIxODc5OSk6IFtHVEtdW1dQ
RV0gQ3JpdGljYWwgd2FybmluZyBhdCBleGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv
YWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4IDFjZGI5NmY3ODQ3ZjIz
MGFhYjgxYjQwMzliYTBmMmZiODNjMzI2YWYuLjNkYzM5YzJiMDk1YWNiMWNjNzExNTI1MTBkZGYy
ZmNkN2FhZGUxZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxv
YWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj
ZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCkBAIC00Miw3ICs0Miw2IEBACiBuYW1lc3BhY2UgV2Vi
Q29yZSB7CiAKIHN0YXRpYyBjb25zdCBhdXRvIHN0YXRpc3RpY3NNb2RlbFZlcnNpb24gPSA0Owot
c3RhdGljIGNvbnN0IGF1dG8gc2Vjb25kc1BlckRheSA9IDI0ICogMzYwMDsKIHN0YXRpYyBTZWNv
bmRzIHRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24geyAyNF9oICogMzAuIH07CiBzdGF0aWMgU2Vj
b25kcyB0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSB7IDI0X2ggfTsKIHN0YXRpYyBTZWNv
bmRzIGdyYW5kZmF0aGVyaW5nVGltZSB7IDFfaCB9OwpAQCAtMzc3LDI0ICszNzYsMjMgQEAgVmVj
dG9yPFByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5PiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv
cmU6OnNvcnRlZFByZXZhbGVudFIKIHsKICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fc3Rh
dGlzdGljc0xvY2spOwogICAgIFZlY3RvcjxQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRyeT4gc29y
dGVkOwotICAgIAogICAgIGZvciAoYXV0byYgc3RhdGlzdGljIDogbV9yZXNvdXJjZVN0YXRpc3Rp
Y3NNYXAudmFsdWVzKCkpIHsKLSAgICAgICAgaWYgKHN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291
cmNlKSB7Ci0gICAgICAgICAgICB1bnNpZ25lZCBkYXlzU2luY2VVc2VySW50ZXJhY3Rpb24gPSBz
dGF0aXN0aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbiA8PSAwID8gMCA6Ci0gICAgICAgICAg
ICAgICAgc3RkOjpmbG9vcigoY3VycmVudFRpbWUoKSAtIHN0YXRpc3RpYy5tb3N0UmVjZW50VXNl
ckludGVyYWN0aW9uKSAvIHNlY29uZHNQZXJEYXkpOwotICAgICAgICAgICAgc29ydGVkLmFwcGVu
ZChQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRyeSgKLSAgICAgICAgICAgICAgICBzdGF0aXN0aWMu
ZGF0YVJlY29yZHNSZW1vdmVkLAotICAgICAgICAgICAgICAgIHN0YXRpc3RpYy5oYWRVc2VySW50
ZXJhY3Rpb24sCi0gICAgICAgICAgICAgICAgZGF5c1NpbmNlVXNlckludGVyYWN0aW9uLAotICAg
ICAgICAgICAgICAgIHN0YXRpc3RpYy5zdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zLnNpemUo
KSwKLSAgICAgICAgICAgICAgICBzdGF0aXN0aWMuc3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3Jp
Z2lucy5zaXplKCksCi0gICAgICAgICAgICAgICAgc3RhdGlzdGljLnN1YnJlc291cmNlVW5pcXVl
UmVkaXJlY3RzVG8uc2l6ZSgpCi0gICAgICAgICAgICApKTsKLSAgICAgICAgfQorICAgICAgICBp
ZiAoIXN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlKQorICAgICAgICAgICAgY29udGludWU7
CisKKyAgICAgICAgdW5zaWduZWQgZGF5c1NpbmNlVXNlckludGVyYWN0aW9uID0gc3RhdGlzdGlj
Lm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24gPD0gMCA/IDAgOiBzdGQ6OmZsb29yKChXYWxsVGlt
ZTo6bm93KCkgLSBzdGF0aXN0aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUoKSkgLyAy
NF9oKTsKKyAgICAgICAgc29ydGVkLmFwcGVuZCh7CisgICAgICAgICAgICBzdGF0aXN0aWMuZGF0
YVJlY29yZHNSZW1vdmVkLAorICAgICAgICAgICAgc3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlv
biwKKyAgICAgICAgICAgIGRheXNTaW5jZVVzZXJJbnRlcmFjdGlvbiwKKyAgICAgICAgICAgIHN0
YXRpc3RpYy5zdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zLnNpemUoKSwKKyAgICAgICAgICAg
IHN0YXRpc3RpYy5zdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zLnNpemUoKSwKKyAgICAg
ICAgICAgIHN0YXRpc3RpYy5zdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c1RvLnNpemUoKQorICAg
ICAgICB9KTsKICAgICB9CiAgICAgCiAgICAgaWYgKHNvcnRlZC5zaXplKCkgPCBtaW5pbXVtUHJl
dmFsZW50UmVzb3VyY2VzRm9yVGVsZW1ldHJ5KQotICAgICAgICByZXR1cm4gVmVjdG9yPFByZXZh
bGVudFJlc291cmNlVGVsZW1ldHJ5PigpOworICAgICAgICByZXR1cm4geyB9OwogCiAgICAgc3Rk
Ojpzb3J0KHNvcnRlZC5iZWdpbigpLCBzb3J0ZWQuZW5kKCksIFtdKGNvbnN0IFByZXZhbGVudFJl
c291cmNlVGVsZW1ldHJ5JiBhLCBjb25zdCBQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRyeSYgYikg
ewogICAgICAgICByZXR1cm4gYS5zdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zICsgYS5zdWJy
ZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zICsgYS5zdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0
c1RvID4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0
aXN0aWNzU3RvcmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0
aWNzU3RvcmUuaAppbmRleCA5MGE1YjE4Mzk0MDYxYmRmYjllNTBkMzM5NzA1YjJkZDE3NTNjYmVm
Li5mNzUyZjhkMjhkZDNmNDIzZGRjOTVmYTViMDcxYmIwZjdkMTAwZjM4IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysrIGIv
U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCkBAIC0z
OSwyNCArMzksMTYgQEAgY2xhc3MgS2V5ZWRFbmNvZGVyOwogY2xhc3MgVVJMOwogCiBzdGF0aWMg
Y29uc3QgYXV0byBtaW5pbXVtUHJldmFsZW50UmVzb3VyY2VzRm9yVGVsZW1ldHJ5ID0gMzsKLSAg
ICAKKwogc3RydWN0IFByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5IHsKLSAgICB1bnNpZ25lZCBu
dW1iZXJPZlRpbWVzRGF0YVJlY29yZHNSZW1vdmVkOwotICAgIGJvb2wgaGFzSGFkVXNlckludGVy
YWN0aW9uOwotICAgIHVuc2lnbmVkIGRheXNTaW5jZVVzZXJJbnRlcmFjdGlvbjsKLSAgICB1bnNp
Z25lZCBzdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zOwotICAgIHVuc2lnbmVkIHN1YnJlc291
cmNlVW5kZXJUb3BGcmFtZU9yaWdpbnM7Ci0gICAgdW5zaWduZWQgc3VicmVzb3VyY2VVbmlxdWVS
ZWRpcmVjdHNUbzsKLSAgICBQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRyeSgpCi0gICAgICAgIDog
bnVtYmVyT2ZUaW1lc0RhdGFSZWNvcmRzUmVtb3ZlZCgwKSwgaGFzSGFkVXNlckludGVyYWN0aW9u
KDApLCBkYXlzU2luY2VVc2VySW50ZXJhY3Rpb24oMCksIHN1YmZyYW1lVW5kZXJUb3BGcmFtZU9y
aWdpbnMoMCksIHN1YnJlc291cmNlVW5kZXJUb3BGcmFtZU9yaWdpbnMoMCksIHN1YnJlc291cmNl
VW5pcXVlUmVkaXJlY3RzVG8oMCkKLSAgICB7Ci0gICAgfQotICAgIFByZXZhbGVudFJlc291cmNl
VGVsZW1ldHJ5KHVuc2lnbmVkIHJlY29yZHNSZW1vdmVkLCBib29sIHVzZXJJbnRlcmFjdGlvbiwg
dW5zaWduZWQgZGF5c1NpbmNlLCB1bnNpZ25lZCBzdWJmcmFtZSwgdW5zaWduZWQgc3VicmVzb3Vy
Y2UsIHVuc2lnbmVkIHVuaXF1ZVJlZGlyZWN0cykKLSAgICAgICAgOiBudW1iZXJPZlRpbWVzRGF0
YVJlY29yZHNSZW1vdmVkKHJlY29yZHNSZW1vdmVkKSwgaGFzSGFkVXNlckludGVyYWN0aW9uKHVz
ZXJJbnRlcmFjdGlvbiksIGRheXNTaW5jZVVzZXJJbnRlcmFjdGlvbihkYXlzU2luY2UpLCBzdWJm
cmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zKHN1YmZyYW1lKSwgc3VicmVzb3VyY2VVbmRlclRvcEZy
YW1lT3JpZ2lucyhzdWJyZXNvdXJjZSksIHN1YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzVG8odW5p
cXVlUmVkaXJlY3RzKQotICAgIHsKLSAgICB9CisgICAgdW5zaWduZWQgbnVtYmVyT2ZUaW1lc0Rh
dGFSZWNvcmRzUmVtb3ZlZCB7IDAgfTsKKyAgICBib29sIGhhc0hhZFVzZXJJbnRlcmFjdGlvbiB7
IGZhbHNlIH07CisgICAgdW5zaWduZWQgZGF5c1NpbmNlVXNlckludGVyYWN0aW9uIHsgMCB9Owor
ICAgIHVuc2lnbmVkIHN1YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdpbnMgeyAwIH07CisgICAgdW5z
aWduZWQgc3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2lucyB7IDAgfTsKKyAgICB1bnNpZ25l
ZCBzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c1RvIHswIH07CiB9OwotICAgIAorCiBzdHJ1Y3Qg
UmVzb3VyY2VMb2FkU3RhdGlzdGljczsKIAogY2xhc3MgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0
b3JlIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPFJlc291cmNlTG9hZFN0YXRpc3RpY3NT
dG9yZT4gewo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314103</attachid>
            <date>2017-06-28 20:31:45 -0700</date>
            <delta_ts>2017-06-28 21:02:51 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-173953-20170628203145.patch</filename>
            <type>text/plain</type>
            <size>5401</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2UxOTgyNTUxNTc2ZmJi
NTIyNGVlN2RmZGY2MzI4YTgyNjAwYmYxYS4uZGU0MWJiZDZiZjQ4ZmYyMDVhMWViMmQyN2E3Mzk0
MzhiZGFlZjU4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE3LTA2LTI4ICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW1Jlc291cmNlTG9hZFN0YXRp
c3RpY3NdIFNpbXBsaWZ5IFByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5IHN0cnVjdAorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczOTUzCisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxv
YWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3Rh
dGlzdGljc1N0b3JlOjpzb3J0ZWRQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRyeSk6CisgICAgICAg
ICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICAoV2ViQ29y
ZTo6UHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnk6OlByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5
KTogRGVsZXRlZC4KKworMjAxNy0wNi0yOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t
PgorCiAgICAgICAgIEF2b2lkIGNvcHlpbmcgc3RhdGlzdGljcyBpbiBSZXNvdXJjZUxvYWRTdGF0
aXN0aWNzU3RvcmU6OnJlYWREYXRhRnJvbURlY29kZXIoKQogICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczOTUxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dl
YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggYWQ0ZmI2
YzVmNzUyNTI1NjI4NzIwMmE0YzhlNDcwYjE5MWY1OGRjZC4uNDIyYjlkODNkMjY3OTA5YTkwZjhi
NWE5YzAyZTVjOWM1ZGIzZDJhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl
c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy
L1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTQyLDcgKzQyLDYgQEAKIG5hbWVz
cGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIGNvbnN0IGF1dG8gc3RhdGlzdGljc01vZGVsVmVyc2lv
biA9IDQ7Ci1zdGF0aWMgY29uc3QgYXV0byBzZWNvbmRzUGVyRGF5ID0gMjQgKiAzNjAwOwogc3Rh
dGljIFNlY29uZHMgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiB7IDI0X2ggKiAzMC4gfTsKIHN0
YXRpYyBTZWNvbmRzIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlIHsgMjRfaCB9Owogc3Rh
dGljIFNlY29uZHMgZ3JhbmRmYXRoZXJpbmdUaW1lIHsgMV9oIH07CkBAIC0zODIsMjQgKzM4MSwy
MyBAQCBWZWN0b3I8UHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnk+IFJlc291cmNlTG9hZFN0YXRp
c3RpY3NTdG9yZTo6c29ydGVkUHJldmFsZW50UgogewogICAgIGF1dG8gbG9ja2VyID0gaG9sZExv
Y2sobV9zdGF0aXN0aWNzTG9jayk7CiAgICAgVmVjdG9yPFByZXZhbGVudFJlc291cmNlVGVsZW1l
dHJ5PiBzb3J0ZWQ7Ci0gICAgCiAgICAgZm9yIChhdXRvJiBzdGF0aXN0aWMgOiBtX3Jlc291cmNl
U3RhdGlzdGljc01hcC52YWx1ZXMoKSkgewotICAgICAgICBpZiAoc3RhdGlzdGljLmlzUHJldmFs
ZW50UmVzb3VyY2UpIHsKLSAgICAgICAgICAgIHVuc2lnbmVkIGRheXNTaW5jZVVzZXJJbnRlcmFj
dGlvbiA9IHN0YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uIDw9IDAgPyAwIDoKLSAg
ICAgICAgICAgICAgICBzdGQ6OmZsb29yKChjdXJyZW50VGltZSgpIC0gc3RhdGlzdGljLm1vc3RS
ZWNlbnRVc2VySW50ZXJhY3Rpb24pIC8gc2Vjb25kc1BlckRheSk7Ci0gICAgICAgICAgICBzb3J0
ZWQuYXBwZW5kKFByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5KAotICAgICAgICAgICAgICAgIHN0
YXRpc3RpYy5kYXRhUmVjb3Jkc1JlbW92ZWQsCi0gICAgICAgICAgICAgICAgc3RhdGlzdGljLmhh
ZFVzZXJJbnRlcmFjdGlvbiwKLSAgICAgICAgICAgICAgICBkYXlzU2luY2VVc2VySW50ZXJhY3Rp
b24sCi0gICAgICAgICAgICAgICAgc3RhdGlzdGljLnN1YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdp
bnMuc2l6ZSgpLAotICAgICAgICAgICAgICAgIHN0YXRpc3RpYy5zdWJyZXNvdXJjZVVuZGVyVG9w
RnJhbWVPcmlnaW5zLnNpemUoKSwKLSAgICAgICAgICAgICAgICBzdGF0aXN0aWMuc3VicmVzb3Vy
Y2VVbmlxdWVSZWRpcmVjdHNUby5zaXplKCkKLSAgICAgICAgICAgICkpOwotICAgICAgICB9Cisg
ICAgICAgIGlmICghc3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UpCisgICAgICAgICAgICBj
b250aW51ZTsKKworICAgICAgICB1bnNpZ25lZCBkYXlzU2luY2VVc2VySW50ZXJhY3Rpb24gPSBz
dGF0aXN0aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbiA8PSAwID8gMCA6IHN0ZDo6Zmxvb3Io
KFdhbGxUaW1lOjpub3coKSAtIHN0YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGlt
ZSgpKSAvIDI0X2gpOworICAgICAgICBzb3J0ZWQuYXBwZW5kKFByZXZhbGVudFJlc291cmNlVGVs
ZW1ldHJ5IHsKKyAgICAgICAgICAgIHN0YXRpc3RpYy5kYXRhUmVjb3Jkc1JlbW92ZWQsCisgICAg
ICAgICAgICBzdGF0aXN0aWMuaGFkVXNlckludGVyYWN0aW9uLAorICAgICAgICAgICAgZGF5c1Np
bmNlVXNlckludGVyYWN0aW9uLAorICAgICAgICAgICAgc3RhdGlzdGljLnN1YmZyYW1lVW5kZXJU
b3BGcmFtZU9yaWdpbnMuc2l6ZSgpLAorICAgICAgICAgICAgc3RhdGlzdGljLnN1YnJlc291cmNl
VW5kZXJUb3BGcmFtZU9yaWdpbnMuc2l6ZSgpLAorICAgICAgICAgICAgc3RhdGlzdGljLnN1YnJl
c291cmNlVW5pcXVlUmVkaXJlY3RzVG8uc2l6ZSgpCisgICAgICAgIH0pOwogICAgIH0KICAgICAK
ICAgICBpZiAoc29ydGVkLnNpemUoKSA8IG1pbmltdW1QcmV2YWxlbnRSZXNvdXJjZXNGb3JUZWxl
bWV0cnkpCi0gICAgICAgIHJldHVybiBWZWN0b3I8UHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnk+
KCk7CisgICAgICAgIHJldHVybiB7IH07CiAKICAgICBzdGQ6OnNvcnQoc29ydGVkLmJlZ2luKCks
IHNvcnRlZC5lbmQoKSwgW10oY29uc3QgUHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnkmIGEsIGNv
bnN0IFByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5JiBiKSB7CiAgICAgICAgIHJldHVybiBhLnN1
YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdpbnMgKyBhLnN1YnJlc291cmNlVW5kZXJUb3BGcmFtZU9y
aWdpbnMgKyBhLnN1YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzVG8gPgpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNl
L1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCmluZGV4IDAwNDhj
N2Y2NGJiNTIwZWIwNjhkNmI1YjhkNjdiNTFmMWQ0NjdlMTIuLjA1NjFlNTllZWIzNWM5ODlhODBi
NDlkY2Q0NmIwYTE1NzZmNjFkZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9S
ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv
UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTM5LDI0ICszOSwxNiBAQCBjbGFzcyBL
ZXllZEVuY29kZXI7CiBjbGFzcyBVUkw7CiAKIHN0YXRpYyBjb25zdCBhdXRvIG1pbmltdW1QcmV2
YWxlbnRSZXNvdXJjZXNGb3JUZWxlbWV0cnkgPSAzOwotICAgIAorCiBzdHJ1Y3QgUHJldmFsZW50
UmVzb3VyY2VUZWxlbWV0cnkgewotICAgIHVuc2lnbmVkIG51bWJlck9mVGltZXNEYXRhUmVjb3Jk
c1JlbW92ZWQ7Ci0gICAgYm9vbCBoYXNIYWRVc2VySW50ZXJhY3Rpb247Ci0gICAgdW5zaWduZWQg
ZGF5c1NpbmNlVXNlckludGVyYWN0aW9uOwotICAgIHVuc2lnbmVkIHN1YmZyYW1lVW5kZXJUb3BG
cmFtZU9yaWdpbnM7Ci0gICAgdW5zaWduZWQgc3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2lu
czsKLSAgICB1bnNpZ25lZCBzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c1RvOwotICAgIFByZXZh
bGVudFJlc291cmNlVGVsZW1ldHJ5KCkKLSAgICAgICAgOiBudW1iZXJPZlRpbWVzRGF0YVJlY29y
ZHNSZW1vdmVkKDApLCBoYXNIYWRVc2VySW50ZXJhY3Rpb24oMCksIGRheXNTaW5jZVVzZXJJbnRl
cmFjdGlvbigwKSwgc3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lucygwKSwgc3VicmVzb3VyY2VV
bmRlclRvcEZyYW1lT3JpZ2lucygwKSwgc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUbygwKQot
ICAgIHsKLSAgICB9Ci0gICAgUHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnkodW5zaWduZWQgcmVj
b3Jkc1JlbW92ZWQsIGJvb2wgdXNlckludGVyYWN0aW9uLCB1bnNpZ25lZCBkYXlzU2luY2UsIHVu
c2lnbmVkIHN1YmZyYW1lLCB1bnNpZ25lZCBzdWJyZXNvdXJjZSwgdW5zaWduZWQgdW5pcXVlUmVk
aXJlY3RzKQotICAgICAgICA6IG51bWJlck9mVGltZXNEYXRhUmVjb3Jkc1JlbW92ZWQocmVjb3Jk
c1JlbW92ZWQpLCBoYXNIYWRVc2VySW50ZXJhY3Rpb24odXNlckludGVyYWN0aW9uKSwgZGF5c1Np
bmNlVXNlckludGVyYWN0aW9uKGRheXNTaW5jZSksIHN1YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdp
bnMoc3ViZnJhbWUpLCBzdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zKHN1YnJlc291cmNl
KSwgc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUbyh1bmlxdWVSZWRpcmVjdHMpCi0gICAgewot
ICAgIH0KKyAgICB1bnNpZ25lZCBudW1iZXJPZlRpbWVzRGF0YVJlY29yZHNSZW1vdmVkIHsgMCB9
OworICAgIGJvb2wgaGFzSGFkVXNlckludGVyYWN0aW9uIHsgZmFsc2UgfTsKKyAgICB1bnNpZ25l
ZCBkYXlzU2luY2VVc2VySW50ZXJhY3Rpb24geyAwIH07CisgICAgdW5zaWduZWQgc3ViZnJhbWVV
bmRlclRvcEZyYW1lT3JpZ2lucyB7IDAgfTsKKyAgICB1bnNpZ25lZCBzdWJyZXNvdXJjZVVuZGVy
VG9wRnJhbWVPcmlnaW5zIHsgMCB9OworICAgIHVuc2lnbmVkIHN1YnJlc291cmNlVW5pcXVlUmVk
aXJlY3RzVG8gezAgfTsKIH07Ci0gICAgCisKIHN0cnVjdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz
OwogCiBjbGFzcyBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUgOiBwdWJsaWMgVGhyZWFkU2Fm
ZVJlZkNvdW50ZWQ8UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiB7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314108</attachid>
            <date>2017-06-28 21:02:52 -0700</date>
            <delta_ts>2017-06-28 22:43:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-173953-20170628210252.patch</filename>
            <type>text/plain</type>
            <size>5071</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTg2ZDg2MzA0MjQ5OTZh
M2NkZWM0ZDFhNzlmNzU2ODEwNThlMzkxOS4uNjg1NDE0NzRhODMxMmNlOTU1MmY2MWEzY2NmYTRm
M2E1YWJjZTRkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE3LTA2LTI4ICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW1Jlc291cmNlTG9hZFN0YXRp
c3RpY3NdIFNpbXBsaWZ5IFByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5IHN0cnVjdAorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczOTUzCisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxv
YWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3Rh
dGlzdGljc1N0b3JlOjpzb3J0ZWRQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRyeSk6CisgICAgICAg
ICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICAoV2ViQ29y
ZTo6UHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnk6OlByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5
KTogRGVsZXRlZC4KKworMjAxNy0wNi0yOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t
PgorCiAgICAgICAgIFJlc291cmNlTG9hZE9ic2VydmVyIGNsZWFuIHVwCiAgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM5NTUKIApkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRl
eCBhZDRmYjZjNWY3NTI1MjU2Mjg3MjAyYTRjOGU0NzBiMTkxZjU4ZGNkLi40MjJiOWQ4M2QyNjc5
MDlhOTBmOGI1YTljMDJlNWM5YzVkYjNkMmExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtNDIsNyArNDIsNiBA
QAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgY29uc3QgYXV0byBzdGF0aXN0aWNzTW9k
ZWxWZXJzaW9uID0gNDsKLXN0YXRpYyBjb25zdCBhdXRvIHNlY29uZHNQZXJEYXkgPSAyNCAqIDM2
MDA7CiBzdGF0aWMgU2Vjb25kcyB0aW1lVG9MaXZlVXNlckludGVyYWN0aW9uIHsgMjRfaCAqIDMw
LiB9Owogc3RhdGljIFNlY29uZHMgdGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUgeyAyNF9o
IH07CiBzdGF0aWMgU2Vjb25kcyBncmFuZGZhdGhlcmluZ1RpbWUgeyAxX2ggfTsKQEAgLTM4Miwy
NCArMzgxLDIzIEBAIFZlY3RvcjxQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRyeT4gUmVzb3VyY2VM
b2FkU3RhdGlzdGljc1N0b3JlOjpzb3J0ZWRQcmV2YWxlbnRSCiB7CiAgICAgYXV0byBsb2NrZXIg
PSBob2xkTG9jayhtX3N0YXRpc3RpY3NMb2NrKTsKICAgICBWZWN0b3I8UHJldmFsZW50UmVzb3Vy
Y2VUZWxlbWV0cnk+IHNvcnRlZDsKLSAgICAKICAgICBmb3IgKGF1dG8mIHN0YXRpc3RpYyA6IG1f
cmVzb3VyY2VTdGF0aXN0aWNzTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmIChzdGF0aXN0aWMu
aXNQcmV2YWxlbnRSZXNvdXJjZSkgewotICAgICAgICAgICAgdW5zaWduZWQgZGF5c1NpbmNlVXNl
ckludGVyYWN0aW9uID0gc3RhdGlzdGljLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24gPD0gMCA/
IDAgOgotICAgICAgICAgICAgICAgIHN0ZDo6Zmxvb3IoKGN1cnJlbnRUaW1lKCkgLSBzdGF0aXN0
aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbikgLyBzZWNvbmRzUGVyRGF5KTsKLSAgICAgICAg
ICAgIHNvcnRlZC5hcHBlbmQoUHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnkoCi0gICAgICAgICAg
ICAgICAgc3RhdGlzdGljLmRhdGFSZWNvcmRzUmVtb3ZlZCwKLSAgICAgICAgICAgICAgICBzdGF0
aXN0aWMuaGFkVXNlckludGVyYWN0aW9uLAotICAgICAgICAgICAgICAgIGRheXNTaW5jZVVzZXJJ
bnRlcmFjdGlvbiwKLSAgICAgICAgICAgICAgICBzdGF0aXN0aWMuc3ViZnJhbWVVbmRlclRvcEZy
YW1lT3JpZ2lucy5zaXplKCksCi0gICAgICAgICAgICAgICAgc3RhdGlzdGljLnN1YnJlc291cmNl
VW5kZXJUb3BGcmFtZU9yaWdpbnMuc2l6ZSgpLAotICAgICAgICAgICAgICAgIHN0YXRpc3RpYy5z
dWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c1RvLnNpemUoKQotICAgICAgICAgICAgKSk7Ci0gICAg
ICAgIH0KKyAgICAgICAgaWYgKCFzdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSkKKyAgICAg
ICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIHVuc2lnbmVkIGRheXNTaW5jZVVzZXJJbnRlcmFj
dGlvbiA9IHN0YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uIDw9IDAgPyAwIDogc3Rk
OjpmbG9vcigoV2FsbFRpbWU6Om5vdygpIC0gc3RhdGlzdGljLm1vc3RSZWNlbnRVc2VySW50ZXJh
Y3Rpb25UaW1lKCkpIC8gMjRfaCk7CisgICAgICAgIHNvcnRlZC5hcHBlbmQoUHJldmFsZW50UmVz
b3VyY2VUZWxlbWV0cnkgeworICAgICAgICAgICAgc3RhdGlzdGljLmRhdGFSZWNvcmRzUmVtb3Zl
ZCwKKyAgICAgICAgICAgIHN0YXRpc3RpYy5oYWRVc2VySW50ZXJhY3Rpb24sCisgICAgICAgICAg
ICBkYXlzU2luY2VVc2VySW50ZXJhY3Rpb24sCisgICAgICAgICAgICBzdGF0aXN0aWMuc3ViZnJh
bWVVbmRlclRvcEZyYW1lT3JpZ2lucy5zaXplKCksCisgICAgICAgICAgICBzdGF0aXN0aWMuc3Vi
cmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2lucy5zaXplKCksCisgICAgICAgICAgICBzdGF0aXN0
aWMuc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUby5zaXplKCkKKyAgICAgICAgfSk7CiAgICAg
fQogICAgIAogICAgIGlmIChzb3J0ZWQuc2l6ZSgpIDwgbWluaW11bVByZXZhbGVudFJlc291cmNl
c0ZvclRlbGVtZXRyeSkKLSAgICAgICAgcmV0dXJuIFZlY3RvcjxQcmV2YWxlbnRSZXNvdXJjZVRl
bGVtZXRyeT4oKTsKKyAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgIHN0ZDo6c29ydChzb3J0ZWQu
YmVnaW4oKSwgc29ydGVkLmVuZCgpLCBbXShjb25zdCBQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRy
eSYgYSwgY29uc3QgUHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnkmIGIpIHsKICAgICAgICAgcmV0
dXJuIGEuc3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lucyArIGEuc3VicmVzb3VyY2VVbmRlclRv
cEZyYW1lT3JpZ2lucyArIGEuc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUbyA+CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgg
Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKaW5k
ZXggMDA0OGM3ZjY0YmI1MjBlYjA2OGQ2YjViOGQ2N2I1MWYxZDQ2N2UxMi4uY2JmMjAzNDIxNDE2
YWU0NTI4YjdkYzdkMDA2M2ZkNzE4OWRlOTAwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
bG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaApAQCAtMzksNyArMzksNyBAQCBj
bGFzcyBLZXllZEVuY29kZXI7CiBjbGFzcyBVUkw7CiAKIHN0YXRpYyBjb25zdCBhdXRvIG1pbmlt
dW1QcmV2YWxlbnRSZXNvdXJjZXNGb3JUZWxlbWV0cnkgPSAzOwotICAgIAorCiBzdHJ1Y3QgUHJl
dmFsZW50UmVzb3VyY2VUZWxlbWV0cnkgewogICAgIHVuc2lnbmVkIG51bWJlck9mVGltZXNEYXRh
UmVjb3Jkc1JlbW92ZWQ7CiAgICAgYm9vbCBoYXNIYWRVc2VySW50ZXJhY3Rpb247CkBAIC00Nywx
NiArNDcsOCBAQCBzdHJ1Y3QgUHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnkgewogICAgIHVuc2ln
bmVkIHN1YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdpbnM7CiAgICAgdW5zaWduZWQgc3VicmVzb3Vy
Y2VVbmRlclRvcEZyYW1lT3JpZ2luczsKICAgICB1bnNpZ25lZCBzdWJyZXNvdXJjZVVuaXF1ZVJl
ZGlyZWN0c1RvOwotICAgIFByZXZhbGVudFJlc291cmNlVGVsZW1ldHJ5KCkKLSAgICAgICAgOiBu
dW1iZXJPZlRpbWVzRGF0YVJlY29yZHNSZW1vdmVkKDApLCBoYXNIYWRVc2VySW50ZXJhY3Rpb24o
MCksIGRheXNTaW5jZVVzZXJJbnRlcmFjdGlvbigwKSwgc3ViZnJhbWVVbmRlclRvcEZyYW1lT3Jp
Z2lucygwKSwgc3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2lucygwKSwgc3VicmVzb3VyY2VV
bmlxdWVSZWRpcmVjdHNUbygwKQotICAgIHsKLSAgICB9Ci0gICAgUHJldmFsZW50UmVzb3VyY2VU
ZWxlbWV0cnkodW5zaWduZWQgcmVjb3Jkc1JlbW92ZWQsIGJvb2wgdXNlckludGVyYWN0aW9uLCB1
bnNpZ25lZCBkYXlzU2luY2UsIHVuc2lnbmVkIHN1YmZyYW1lLCB1bnNpZ25lZCBzdWJyZXNvdXJj
ZSwgdW5zaWduZWQgdW5pcXVlUmVkaXJlY3RzKQotICAgICAgICA6IG51bWJlck9mVGltZXNEYXRh
UmVjb3Jkc1JlbW92ZWQocmVjb3Jkc1JlbW92ZWQpLCBoYXNIYWRVc2VySW50ZXJhY3Rpb24odXNl
ckludGVyYWN0aW9uKSwgZGF5c1NpbmNlVXNlckludGVyYWN0aW9uKGRheXNTaW5jZSksIHN1YmZy
YW1lVW5kZXJUb3BGcmFtZU9yaWdpbnMoc3ViZnJhbWUpLCBzdWJyZXNvdXJjZVVuZGVyVG9wRnJh
bWVPcmlnaW5zKHN1YnJlc291cmNlKSwgc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUbyh1bmlx
dWVSZWRpcmVjdHMpCi0gICAgewotICAgIH0KIH07Ci0gICAgCisKIHN0cnVjdCBSZXNvdXJjZUxv
YWRTdGF0aXN0aWNzOwogCiBjbGFzcyBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUgOiBwdWJs
aWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiB7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>