<?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>163502</bug_id>
          
          <creation_ts>2016-10-16 06:44:13 -0700</creation_ts>
          <short_desc>[Modern Media Controls] Add a MediaControlsHost API to retrieve images as base64</short_desc>
          <delta_ts>2016-10-17 12:56:48 -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>Safari 10</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>
          <dependson>163500</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Antoine Quint">graouts</reporter>
          <assigned_to name="Antoine Quint">graouts</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>graouts</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1240719</commentid>
    <comment_count>0</comment_count>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2016-10-16 06:44:13 -0700</bug_when>
    <thetext>The previous media controls codebase would inline images as base64 in stylesheets, making it hard to version those resources. We could add a new method to MediaControlsHost to obtain the base64 encoded version of a given image so that we could obtain images at runtime from the WebCore bundle.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1240720</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2016-10-16 06:44:36 -0700</bug_when>
    <thetext>&lt;rdar://problem/28792017&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1240724</commentid>
    <comment_count>2</comment_count>
      <attachid>291747</attachid>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2016-10-16 06:57:59 -0700</bug_when>
    <thetext>Created attachment 291747
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1240731</commentid>
    <comment_count>3</comment_count>
      <attachid>291747</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2016-10-16 10:12:39 -0700</bug_when>
    <thetext>Comment on attachment 291747
Patch

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

&gt; Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp:292
&gt; +    if (page)
&gt; +        return RenderTheme::themeForPage(page)-&gt;mediaControlsBase64StringForIconAndPlatform(iconName, platform);
&gt; +    return &quot;&quot;;

Early return means error case comes first. Please use emptyString(), rather than &quot;&quot;.

&gt; Source/WebCore/Modules/mediacontrols/MediaControlsHost.h:85
&gt; +    String base64StringForIconAndPlatform(String iconName, String platform) const;

Argument types should be const String&amp;, not String.

&gt; Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl:63
&gt; +    [EnabledAtRuntime=ModernMediaControls] DOMString base64StringForIconAndPlatform(DOMString iconName, DOMString platform);

Could be a dangerous API for performance because it loads the file from disk and encodes it every time with no caching.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1240793</commentid>
    <comment_count>4</comment_count>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2016-10-16 14:51:28 -0700</bug_when>
    <thetext>(In reply to comment #3)
&gt; Comment on attachment 291747 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=291747&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp:292
&gt; &gt; +    if (page)
&gt; &gt; +        return RenderTheme::themeForPage(page)-&gt;mediaControlsBase64StringForIconAndPlatform(iconName, platform);
&gt; &gt; +    return &quot;&quot;;
&gt; 
&gt; Early return means error case comes first. Please use emptyString(), rather
&gt; than &quot;&quot;.

Sure thing, will change when landing.

&gt; &gt; Source/WebCore/Modules/mediacontrols/MediaControlsHost.h:85
&gt; &gt; +    String base64StringForIconAndPlatform(String iconName, String platform) const;
&gt; 
&gt; Argument types should be const String&amp;, not String.

Thanks, will change when landing.

&gt; &gt; Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl:63
&gt; &gt; +    [EnabledAtRuntime=ModernMediaControls] DOMString base64StringForIconAndPlatform(DOMString iconName, DOMString platform);
&gt; 
&gt; Could be a dangerous API for performance because it loads the file from disk
&gt; and encodes it every time with no caching.

True. I will add caching on the JS side as part of the iconService singleton (see Source/WebCore/Modules/modern-media-controls/controls/icon-service.js). Currently caching is done based on the image URL, but we need to do it based on the iconName / platform pair.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1241095</commentid>
    <comment_count>5</comment_count>
      <attachid>291856</attachid>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2016-10-17 12:22:58 -0700</bug_when>
    <thetext>Created attachment 291856
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1241109</commentid>
    <comment_count>6</comment_count>
      <attachid>291856</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-10-17 12:56:45 -0700</bug_when>
    <thetext>Comment on attachment 291856
Patch for landing

Clearing flags on attachment: 291856

Committed r207423: &lt;http://trac.webkit.org/changeset/207423&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1241110</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-10-17 12:56:48 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>291747</attachid>
            <date>2016-10-16 06:57:59 -0700</date>
            <delta_ts>2016-10-17 12:22:52 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-163502-20161016155428.patch</filename>
            <type>text/plain</type>
            <size>7411</size>
            <attacher name="Antoine Quint">graouts</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzA3MjRhOTA2M2E4ZDIw
Y2M3MjAwODMzYmNkZWU1OGZjNWQ2ZWViMi4uYTVmMmVkNTQxNmI3NGE1M2RiMWJkOTY3OTg0ZmZk
MWJjZWY1YTZmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE2LTEwLTE2ICBBbnRv
aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD
b250cm9sc10gQWRkIGEgTWVkaWFDb250cm9sc0hvc3QgQVBJIHRvIHJldHJpZXZlIGltYWdlcyBh
cyBiYXNlNjQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTE2MzUwMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjg3OTIwMTc+CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IGBiYXNlNjRTdHJp
bmdGb3JJY29uQW5kUGxhdGZvcm0oKWAgbWV0aG9kIHRvIE1lZGlhQ29udHJvbHNIb3N0IHN1Y2gg
dGhhdCB3ZQorICAgICAgICBtYXkgbG9hZCBpbWFnZXMgZnJvbSB0aGUgbW9kZXJuLW1lZGlhLWNv
bnRyb2xzIGRpcmVjdG9yeSBpbiB0aGUgV2ViQ29yZS5mcmFtZXdvcmsgYnVuZGxlLgorICAgICAg
ICBXZSB1c2UgdGhpcyBuZXcgbWV0aG9kIGluIHRoZSBpY29uU2VydmljZSBzaW5nbGV0b24gd2hl
biBhIGBtZWRpYUNvbnRyb2xzSG9zdGAgaXMgc2V0LAorICAgICAgICB3aGljaCB3aWxsIGJlIHNl
dCBpbiBhIGxhdGVyIHBhdGNoLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01l
ZGlhQ29udHJvbHNIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0
OjpiYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0pOgorICAgICAgICAqIE1vZHVsZXMvbWVk
aWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFj
b250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGw6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4t
bWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzOgorICAgICAgICAoY29uc3Qu
aWNvblNlcnZpY2UubmV3Lkljb25TZXJ2aWNlLnByb3RvdHlwZS51cmxGb3JJY29uTmFtZUFuZExh
eW91dFRyYWl0cyk6CisgICAgICAgIChjb25zdC5pY29uU2VydmljZS5uZXcuSWNvblNlcnZpY2Up
OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5oOgorICAgICAgICAoV2ViQ29yZTo6
UmVuZGVyVGhlbWU6Om1lZGlhQ29udHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0p
OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6Om1lZGlhQ29udHJvbHNTY3JpcHQpOiBE
ZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oOgorICAgICAgICAq
IHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRo
ZW1lTWFjOjptZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBsYXRmb3JtKToKKwog
MjAxNi0xMC0xNSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAg
IFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIG1hY09TIGlubGluZSBjb250cm9scwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xz
SG9zdC5jcHAKaW5kZXggZDdhZjM1YTU2Y2NlZDdjOWJjMDJhNzU3MTk5MzUzMzA3YzI5Y2NkMS4u
YmMyMTFkMmNkZTcxNGRjZDI3OTY2ZGFkYTViNWYwODBkOWZmYzkyYSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hv
c3QuY3BwCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiTWVkaWFDb250cm9sRWxlbWVudHMu
aCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGFnZUdyb3VwLmgiCisjaW5jbHVkZSAi
UmVuZGVyVGhlbWUuaCIKICNpbmNsdWRlICJUZXh0VHJhY2suaCIKICNpbmNsdWRlICJUZXh0VHJh
Y2tMaXN0LmgiCiAjaW5jbHVkZSAiVVVJRC5oIgpAQCAtMjgzLDYgKzI4NCwxNCBAQCBTdHJpbmcg
TWVkaWFDb250cm9sc0hvc3Q6OmdlbmVyYXRlVVVJRCgpIGNvbnN0CiAgICAgcmV0dXJuIGNyZWF0
ZUNhbm9uaWNhbFVVSURTdHJpbmcoKTsKIH0KIAorU3RyaW5nIE1lZGlhQ29udHJvbHNIb3N0Ojpi
YXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0oU3RyaW5nIGljb25OYW1lLCBTdHJpbmcgcGxh
dGZvcm0pIGNvbnN0Cit7CisgICAgUGFnZSogcGFnZSA9IG1fbWVkaWFFbGVtZW50LT5kb2N1bWVu
dCgpLnBhZ2UoKTsKKyAgICBpZiAocGFnZSkKKyAgICAgICAgcmV0dXJuIFJlbmRlclRoZW1lOjp0
aGVtZUZvclBhZ2UocGFnZSktPm1lZGlhQ29udHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxh
dGZvcm0oaWNvbk5hbWUsIHBsYXRmb3JtKTsKKyAgICByZXR1cm4gIiI7Cit9CisKIH0KIAogI2Vu
ZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVk
aWFDb250cm9sc0hvc3QuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9N
ZWRpYUNvbnRyb2xzSG9zdC5oCmluZGV4IGU5OTJiZmE1NmVkZjgzYjJlNjMxMTgwZmVlNmFkMTVh
YWE1NGQ1YjYuLmIxMDJjY2NjOWFhNGUxMzNhNWNiMzg3ZGQzYTU3OGIwNDMyZTRkYjcgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xz
SG9zdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNv
bnRyb2xzSG9zdC5oCkBAIC04Miw2ICs4Miw4IEBAIHB1YmxpYzoKIAogICAgIFN0cmluZyBnZW5l
cmF0ZVVVSUQoKSBjb25zdDsKIAorICAgIFN0cmluZyBiYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxh
dGZvcm0oU3RyaW5nIGljb25OYW1lLCBTdHJpbmcgcGxhdGZvcm0pIGNvbnN0OworCiBwcml2YXRl
OgogICAgIE1lZGlhQ29udHJvbHNIb3N0KEhUTUxNZWRpYUVsZW1lbnQqKTsKIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0
LmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xz
SG9zdC5pZGwKaW5kZXggZTE4MWY5Yzc0YjE2YmM0NmZhMzI4NDc4YjQ1Njk4ZjNhOWM5ODc0Ny4u
ODMyNDBmZGZlNGJjZWY0MDljY2M2Y2UwMmU0YWJhZTlkZTQ1YjQ4YSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hv
c3QuaWRsCkBAIC01OSw0ICs1OSw2IEBAIGVudW0gRGV2aWNlVHlwZSB7CiAgICAgdm9pZCBleGl0
ZWRGdWxsc2NyZWVuKCk7CiAKICAgICBET01TdHJpbmcgZ2VuZXJhdGVVVUlEKCk7CisKKyAgICBb
RW5hYmxlZEF0UnVudGltZT1Nb2Rlcm5NZWRpYUNvbnRyb2xzXSBET01TdHJpbmcgYmFzZTY0U3Ry
aW5nRm9ySWNvbkFuZFBsYXRmb3JtKERPTVN0cmluZyBpY29uTmFtZSwgRE9NU3RyaW5nIHBsYXRm
b3JtKTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp
YS1jb250cm9scy9jb250cm9scy9pY29uLXNlcnZpY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1
bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pY29uLXNlcnZpY2UuanMKaW5kZXgg
ZGE5MzFmYmE3OTVlMjNlYTg4ZDdlMmNiYTQ1MTgzNGMzMTNhZmE1MS4uNjMxODMzMDE1OTU3NTdk
NzU3NWI2NmQ3YWM2YjU1YTZjZjljYWM3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k
dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzCisrKyBi
L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2lj
b24tc2VydmljZS5qcwpAQCAtNzgsNyArNzgsMTIgQEAgY29uc3QgaWNvblNlcnZpY2UgPSBuZXcg
Y2xhc3MgSWNvblNlcnZpY2UgewogICAgICAgICBpZiAobGF5b3V0VHJhaXRzICYgTGF5b3V0VHJh
aXRzLkZ1bGxzY3JlZW4gJiYgSWNvbnNXaXRoRnVsbFNjcmVlblZhcmlhbnRzLmluY2x1ZGVzKGlj
b25OYW1lKSkKICAgICAgICAgICAgIGljb25OYW1lICs9ICItZnVsbHNjcmVlbiI7CiAKLSAgICAg
ICAgcmV0dXJuIGAke3RoaXMuZGlyZWN0b3J5UGF0aH0vJHtwbGF0Zm9ybX0vJHtpY29uTmFtZX1A
JHt3aW5kb3cuZGV2aWNlUGl4ZWxSYXRpb314LnBuZ2A7CisgICAgICAgIGNvbnN0IGZpbGVOYW1l
ID0gYCR7aWNvbk5hbWV9QCR7d2luZG93LmRldmljZVBpeGVsUmF0aW99eGA7CisKKyAgICAgICAg
aWYgKHRoaXMubWVkaWFDb250cm9sc0hvc3QpCisgICAgICAgICAgICByZXR1cm4gImRhdGE6aW1h
Z2UvcG5nO2Jhc2U2NCwiICsgdGhpcy5tZWRpYUNvbnRyb2xzSG9zdC5iYXNlNjRTdHJpbmdGb3JJ
Y29uQW5kUGxhdGZvcm0oZmlsZU5hbWUsIHBsYXRmb3JtKTsKKworICAgICAgICByZXR1cm4gYCR7
dGhpcy5kaXJlY3RvcnlQYXRofS8ke3BsYXRmb3JtfS8ke2ZpbGVOYW1lfS5wbmdgOwogICAgIH0K
IAogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5o
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKaW5kZXggMzliOTdjODZh
ZGUxN2RjMmMyYTZmNDljNDQ1MThhMTEzZmQ3MmQ5MC4uNWMzMDM5ZDYxMWNjZDc4MjBlM2UyNjM0
ZWJjNGFjYzE2YjIyMjRlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlclRoZW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgK
QEAgLTEwMSw2ICsxMDEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBTdHJpbmcgbWVkaWFDb250
cm9sc1N0eWxlU2hlZXQoKSB7IHJldHVybiBTdHJpbmcoKTsgfQogICAgIHZpcnR1YWwgU3RyaW5n
IGV4dHJhTWVkaWFDb250cm9sc1N0eWxlU2hlZXQoKSB7IHJldHVybiBTdHJpbmcoKTsgfQogICAg
IHZpcnR1YWwgU3RyaW5nIG1lZGlhQ29udHJvbHNTY3JpcHQoKSB7IHJldHVybiBTdHJpbmcoKTsg
fQorICAgIHZpcnR1YWwgU3RyaW5nIG1lZGlhQ29udHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5k
UGxhdGZvcm0oU3RyaW5nLCBTdHJpbmcpIHsgcmV0dXJuIFN0cmluZygpOyB9CiAjZW5kaWYKICNp
ZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgdmlydHVhbCBTdHJpbmcgZXh0cmFGdWxsU2Ny
ZWVuU3R5bGVTaGVldCgpIHsgcmV0dXJuIFN0cmluZygpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJUaGVtZU1hYy5oCmluZGV4IDY1OGY4ODMxNDYzNjA3MjliNmNhMzc2NmRjMGM5
YTlhNTY5Yjg2ZTUuLjdlNzhiOWIwNjg2NTFjYzA4ZjU5NmRiNjNlOGU4MzU2ZGJiNjAxNzAgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oCkBAIC0xMDgsNiArMTA4
LDcgQEAgcHJvdGVjdGVkOgogICAgIC8vIE1lZGlhIGNvbnRyb2xzCiAgICAgU3RyaW5nIG1lZGlh
Q29udHJvbHNTdHlsZVNoZWV0KCkgb3ZlcnJpZGU7CiAgICAgU3RyaW5nIG1lZGlhQ29udHJvbHNT
Y3JpcHQoKSBvdmVycmlkZTsKKyAgICBTdHJpbmcgbWVkaWFDb250cm9sc0Jhc2U2NFN0cmluZ0Zv
ckljb25BbmRQbGF0Zm9ybShTdHJpbmcsIFN0cmluZykgb3ZlcnJpZGU7CiAjZW5kaWYKIAogI2lm
IEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
clRoZW1lTWFjLm1tCmluZGV4IGU3ZmUwZGU4OTViY2I1NWY1NWRkMjE4OGE2MmNmOGE1YzEyN2Jj
NTkuLmYyZWJmNzllYThhOGQ2Mzg5YzJmNWIyNDU5Y2JiYTk1MDY1MTRlYWYgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KQEAgLTY0LDYgKzY0LDcgQEAKICNp
bXBvcnQgIlJlbmRlclNsaWRlci5oIgogI2ltcG9ydCAiUmVuZGVyU25hcHNob3R0ZWRQbHVnSW4u
aCIKICNpbXBvcnQgIlJlbmRlclZpZXcuaCIKKyNpbXBvcnQgIlJ1bnRpbWVFbmFibGVkRmVhdHVy
ZXMuaCIKICNpbXBvcnQgIlNoYXJlZEJ1ZmZlci5oIgogI2ltcG9ydCAiU3RyaW5nVHJ1bmNhdG9y
LmgiCiAjaW1wb3J0ICJTdHlsZVJlc29sdmVyLmgiCkBAIC0yNjAsNiArMjYxLDIwIEBAIFN0cmlu
ZyBSZW5kZXJUaGVtZU1hYzo6bWVkaWFDb250cm9sc1NjcmlwdCgpCiAjZW5kaWYKIH0KIAorU3Ry
aW5nIFJlbmRlclRoZW1lTWFjOjptZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBs
YXRmb3JtKFN0cmluZyBpY29uTmFtZSwgU3RyaW5nIHBsYXRmb3JtKQoreworI2lmIEVOQUJMRShN
RURJQV9DT05UUk9MU19TQ1JJUFQpCisgICAgaWYgKCFSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpz
aGFyZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVkKCkpCisgICAgICAgIHJl
dHVybiBlbXB0eVN0cmluZygpOworCisgICAgU3RyaW5nIGRpcmVjdG9yeSA9ICJtb2Rlcm4tbWVk
aWEtY29udHJvbHMvaW1hZ2VzLyIgKyBwbGF0Zm9ybTsKKyAgICBOU0J1bmRsZSogYnVuZGxlID0g
W05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVyVGhlbWVCdW5kbGUgY2xhc3Nd
XTsKKyAgICByZXR1cm4gW1tOU0RhdGEgZGF0YVdpdGhDb250ZW50c09mRmlsZTpbYnVuZGxlIHBh
dGhGb3JSZXNvdXJjZTppY29uTmFtZSBvZlR5cGU6QCJwbmciIGluRGlyZWN0b3J5OmRpcmVjdG9y
eV1dIGJhc2U2NEVuY29kZWRTdHJpbmdXaXRoT3B0aW9uczowXTsKKyNlbHNlCisgICAgcmV0dXJu
IGVtcHR5U3RyaW5nKCk7CisjZW5kaWYKK30KKwogI2VuZGlmIC8vIEVOQUJMRShWSURFTykKIAog
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>291856</attachid>
            <date>2016-10-17 12:22:58 -0700</date>
            <delta_ts>2016-10-17 12:56:45 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-163502-20161017211925.patch</filename>
            <type>text/plain</type>
            <size>12015</size>
            <attacher name="Antoine Quint">graouts</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3NDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjZjMzFjODMyNmU1ZGZh
ZmYwOTZkMjYyYjk1ODAyYzJjODQ3NzU4ZS4uN2ZmYjI5ZDExMTMxZmQ2ZmI3OWYwMmYzMDI4ZTAx
ZTVmMmY3M2YwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE2LTEwLTE2ICBBbnRv
aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD
b250cm9sc10gQWRkIGEgTWVkaWFDb250cm9sc0hvc3QgQVBJIHRvIHJldHJpZXZlIGltYWdlcyBh
cyBiYXNlNjQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTE2MzUwMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjg3OTIwMTc+CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWRkIGEgbmV3IGBiYXNlNjRTdHJpbmdG
b3JJY29uQW5kUGxhdGZvcm0oKWAgbWV0aG9kIHRvIE1lZGlhQ29udHJvbHNIb3N0IHN1Y2ggdGhh
dCB3ZQorICAgICAgICBtYXkgbG9hZCBpbWFnZXMgZnJvbSB0aGUgbW9kZXJuLW1lZGlhLWNvbnRy
b2xzIGRpcmVjdG9yeSBpbiB0aGUgV2ViQ29yZS5mcmFtZXdvcmsgYnVuZGxlLgorICAgICAgICBX
ZSB1c2UgdGhpcyBuZXcgbWV0aG9kIGluIHRoZSBpY29uU2VydmljZSBzaW5nbGV0b24gd2hlbiBh
IGBtZWRpYUNvbnRyb2xzSG9zdGAgaXMgc2V0LAorICAgICAgICB3aGljaCB3aWxsIGJlIHNldCBp
biBhIGxhdGVyIHBhdGNoLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlh
Q29udHJvbHNIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpi
YXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0pOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFj
b250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250
cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGw6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVk
aWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzOgorICAgICAgICAoY29uc3QuaWNv
blNlcnZpY2UubmV3Lkljb25TZXJ2aWNlLnByb3RvdHlwZS51cmxGb3JJY29uTmFtZUFuZExheW91
dFRyYWl0cyk6CisgICAgICAgIChjb25zdC5pY29uU2VydmljZS5uZXcuSWNvblNlcnZpY2UpOgor
ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyVGhlbWU6Om1lZGlhQ29udHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0pOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6Om1lZGlhQ29udHJvbHNTY3JpcHQpOiBEZWxl
dGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oOgorICAgICAgICAqIHJl
bmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l
TWFjOjptZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBsYXRmb3JtKToKKwogMjAx
Ni0xMC0xNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtN
b2Rlcm4gTWVkaWEgQ29udHJvbHNdIEFkZCBhIE1lZGlhQ29udHJvbHNIb3N0IEFQSSB0byByZXRy
aWV2ZSB0aGUgc2hhZG93IHJvb3QgQ1NTCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1
bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUv
TW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAppbmRleCBlZDBjYjU4
NzJhZGQxYjM2YTBlYjE0MDYzM2Y5NjIyMzZhMjQ5MWU3Li5mYWY1MWNmMzY2OTUwMDk0ZmNjNTA4
ODI0YzQ5N2QwZmU5MTM0ZGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l
ZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v
ZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAKQEAgLTI5Miw2ICsyOTIs
MTQgQEAgU3RyaW5nIE1lZGlhQ29udHJvbHNIb3N0OjpzaGFkb3dSb290Q1NTVGV4dCgpIGNvbnN0
CiAgICAgcmV0dXJuIFJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UocGFnZSktPm1lZGlhQ29udHJv
bHNTdHlsZVNoZWV0KCk7CiB9CiAKK1N0cmluZyBNZWRpYUNvbnRyb2xzSG9zdDo6YmFzZTY0U3Ry
aW5nRm9ySWNvbkFuZFBsYXRmb3JtKGNvbnN0IFN0cmluZyYgaWNvbk5hbWUsIGNvbnN0IFN0cmlu
ZyYgcGxhdGZvcm0pIGNvbnN0Cit7CisgICAgUGFnZSogcGFnZSA9IG1fbWVkaWFFbGVtZW50LT5k
b2N1bWVudCgpLnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJldHVybiBlbXB0eVN0
cmluZygpOworICAgIHJldHVybiBSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdlKHBhZ2UpLT5tZWRp
YUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBsYXRmb3JtKGljb25OYW1lLCBwbGF0Zm9y
bSk7Cit9CisKIH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oCmluZGV4IGU4NjQ2ZjhiZTJjNjBk
YTgwZmI1YzNlZDNmMDYyNWU0YWMzODZkYWYuLjZmMjBiM2JlNTYyODJlMGIyZjliOTA1YzY3YjA3
ZWNlYmM1OWU2N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250
cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk
aWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oCkBAIC04Myw2ICs4Myw3IEBAIHB1YmxpYzoK
ICAgICBTdHJpbmcgZ2VuZXJhdGVVVUlEKCkgY29uc3Q7CiAKICAgICBTdHJpbmcgc2hhZG93Um9v
dENTU1RleHQoKSBjb25zdDsKKyAgICBTdHJpbmcgYmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBsYXRm
b3JtKGNvbnN0IFN0cmluZyYgaWNvbk5hbWUsIGNvbnN0IFN0cmluZyYgcGxhdGZvcm0pIGNvbnN0
OwogCiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbHNIb3N0KEhUTUxNZWRpYUVsZW1lbnQqKTsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNv
bnRyb2xzSG9zdC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVk
aWFDb250cm9sc0hvc3QuaWRsCmluZGV4IDQ4Mjg5YWE1M2ViMWIxZDI5ZjdmYTdiZDRjZTU5MWU5
OWMxODU1MDEuLmE2ZTMwNGUwOWI1N2FiYjA2NjAxZjljZTFjYWQzZWEwOTViOGEzOTMgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xz
SG9zdC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlh
Q29udHJvbHNIb3N0LmlkbApAQCAtNjEsNCArNjEsNSBAQCBlbnVtIERldmljZVR5cGUgewogICAg
IERPTVN0cmluZyBnZW5lcmF0ZVVVSUQoKTsKIAogICAgIFtFbmFibGVkQXRSdW50aW1lPU1vZGVy
bk1lZGlhQ29udHJvbHNdIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgc2hhZG93Um9vdENT
U1RleHQ7CisgICAgW0VuYWJsZWRBdFJ1bnRpbWU9TW9kZXJuTWVkaWFDb250cm9sc10gRE9NU3Ry
aW5nIGJhc2U2NFN0cmluZ0Zvckljb25BbmRQbGF0Zm9ybShET01TdHJpbmcgaWNvbk5hbWUsIERP
TVN0cmluZyBwbGF0Zm9ybSk7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl
cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzIGIvU291cmNl
L1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2
aWNlLmpzCmluZGV4IGRhOTMxZmJhNzk1ZTIzZWE4OGQ3ZTJjYmE0NTE4MzRjMzEzYWZhNTEuLmM3
YThiYjcwMjY3NTVkOTM5NDY0ZDZjNGQwYThkNzdkZjk3NzNkYTkgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2ljb24tc2Vy
dmljZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9s
cy9jb250cm9scy9pY29uLXNlcnZpY2UuanMKQEAgLTUyLDIwICs1MiwzMCBAQCBjb25zdCBpY29u
U2VydmljZSA9IG5ldyBjbGFzcyBJY29uU2VydmljZSB7CiAgICAgICAgIHRoaXMuaW1hZ2VzID0g
e307CiAgICAgfQogCisgICAgLy8gUHVibGljCisKICAgICBpbWFnZUZvckljb25OYW1lQW5kTGF5
b3V0VHJhaXRzKGljb25OYW1lLCBsYXlvdXRUcmFpdHMpCiAgICAgewotICAgICAgICBjb25zdCBw
YXRoID0gdGhpcy51cmxGb3JJY29uTmFtZUFuZExheW91dFRyYWl0cyhpY29uTmFtZSwgbGF5b3V0
VHJhaXRzKTsKLSAgICAgICAgCisgICAgICAgIGNvbnN0IFtmaWxlTmFtZSwgcGxhdGZvcm1dID0g
dGhpcy5fZmlsZU5hbWVBbmRQbGF0Zm9ybUZvckljb25OYW1lQW5kTGF5b3V0VHJhaXRzKGljb25O
YW1lLCBsYXlvdXRUcmFpdHMpOworICAgICAgICBjb25zdCBwYXRoID0gYCR7cGxhdGZvcm19LyR7
ZmlsZU5hbWV9LnBuZ2A7CisKICAgICAgICAgbGV0IGltYWdlID0gdGhpcy5pbWFnZXNbcGF0aF07
CiAgICAgICAgIGlmIChpbWFnZSkKICAgICAgICAgICAgIHJldHVybiBpbWFnZTsKIAogICAgICAg
ICBpbWFnZSA9IHRoaXMuaW1hZ2VzW3BhdGhdID0gbmV3IEltYWdlOwotICAgICAgICBpbWFnZS5z
cmMgPSBwYXRoOworCisgICAgICAgIGlmICh0aGlzLm1lZGlhQ29udHJvbHNIb3N0KQorICAgICAg
ICAgICAgaW1hZ2Uuc3JjID0gImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCwiICsgdGhpcy5tZWRpYUNv
bnRyb2xzSG9zdC5iYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0oZmlsZU5hbWUsIHBsYXRm
b3JtKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgaW1hZ2Uuc3JjID0gYCR7dGhpcy5kaXJl
Y3RvcnlQYXRofS8ke3BhdGh9YDsKKwogICAgICAgICByZXR1cm4gaW1hZ2U7CiAgICAgfQogCi0g
ICAgdXJsRm9ySWNvbk5hbWVBbmRMYXlvdXRUcmFpdHMoaWNvbk5hbWUsIGxheW91dFRyYWl0cykK
KyAgICAvLyBQcml2YXRlCisKKyAgICBfZmlsZU5hbWVBbmRQbGF0Zm9ybUZvckljb25OYW1lQW5k
TGF5b3V0VHJhaXRzKGljb25OYW1lLCBsYXlvdXRUcmFpdHMpCiAgICAgewogICAgICAgICBsZXQg
cGxhdGZvcm07CiAgICAgICAgIGlmIChsYXlvdXRUcmFpdHMgJiBMYXlvdXRUcmFpdHMubWFjT1Mp
CkBAIC03OCw3ICs4OCw5IEBAIGNvbnN0IGljb25TZXJ2aWNlID0gbmV3IGNsYXNzIEljb25TZXJ2
aWNlIHsKICAgICAgICAgaWYgKGxheW91dFRyYWl0cyAmIExheW91dFRyYWl0cy5GdWxsc2NyZWVu
ICYmIEljb25zV2l0aEZ1bGxTY3JlZW5WYXJpYW50cy5pbmNsdWRlcyhpY29uTmFtZSkpCiAgICAg
ICAgICAgICBpY29uTmFtZSArPSAiLWZ1bGxzY3JlZW4iOwogCi0gICAgICAgIHJldHVybiBgJHt0
aGlzLmRpcmVjdG9yeVBhdGh9LyR7cGxhdGZvcm19LyR7aWNvbk5hbWV9QCR7d2luZG93LmRldmlj
ZVBpeGVsUmF0aW99eC5wbmdgOworICAgICAgICBjb25zdCBmaWxlTmFtZSA9IGAke2ljb25OYW1l
fUAke3dpbmRvdy5kZXZpY2VQaXhlbFJhdGlvfXhgOworCisgICAgICAgIHJldHVybiBbZmlsZU5h
bWUsIHBsYXRmb3JtXTsKICAgICB9CiAKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9zdGFydC1idXR0b24uanMgYi9T
b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9zdGFy
dC1idXR0b24uanMKaW5kZXggMjViNzgzMDMzYmUyMzkwMThiOTc4ZDA5NDg2NGE2ZDcwZjVkYWVk
Ni4uOTg2MGM3ZTc5NDk0MGZmYmM4MjViMWIzNzYyODY2OThkNTY5NmYzYSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvc3Rh
cnQtYnV0dG9uLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv
bnRyb2xzL2NvbnRyb2xzL3N0YXJ0LWJ1dHRvbi5qcwpAQCAtMzYsNyArMzYsNyBAQCBjbGFzcyBT
dGFydEJ1dHRvbiBleHRlbmRzIEJ1dHRvbgogICAgICAgICBiYWNrZ3JvdW5kLmNsYXNzTmFtZSA9
ICJiYWNrZ3JvdW5kIjsKIAogICAgICAgICBjb25zdCBpbWFnZSA9IHRoaXMuZWxlbWVudC5hcHBl
bmRDaGlsZChuZXcgSW1hZ2UpOwotICAgICAgICBpbWFnZS5zcmMgPSBpY29uU2VydmljZS51cmxG
b3JJY29uTmFtZUFuZExheW91dFRyYWl0cyhJY29ucy5TdGFydCwgdGhpcy5sYXlvdXRUcmFpdHMp
OworICAgICAgICBpbWFnZS5zcmMgPSBpY29uU2VydmljZS5pbWFnZUZvckljb25OYW1lQW5kTGF5
b3V0VHJhaXRzKEljb25zLlN0YXJ0LCB0aGlzLmxheW91dFRyYWl0cykuc3JjOwogICAgIH0KIAog
fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmggYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAppbmRleCAzOWI5N2M4NmFkZTE3
ZGMyYzJhNmY0OWM0NDUxOGExMTNmZDcyZDkwLi43YzZmNTQ0NzBhNmZjNWEyM2JmNzU4Y2Q5N2Vl
OWRkMGUzNDk3Y2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
VGhlbWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaApAQCAt
MTAxLDYgKzEwMSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFN0cmluZyBtZWRpYUNvbnRyb2xz
U3R5bGVTaGVldCgpIHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgdmlydHVhbCBTdHJpbmcgZXh0
cmFNZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpIHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgdmly
dHVhbCBTdHJpbmcgbWVkaWFDb250cm9sc1NjcmlwdCgpIHsgcmV0dXJuIFN0cmluZygpOyB9Cisg
ICAgdmlydHVhbCBTdHJpbmcgbWVkaWFDb250cm9sc0Jhc2U2NFN0cmluZ0Zvckljb25BbmRQbGF0
Zm9ybShjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKSB7IHJldHVybiBTdHJpbmcoKTsgfQog
I2VuZGlmCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQogICAgIHZpcnR1YWwgU3RyaW5nIGV4
dHJhRnVsbFNjcmVlblN0eWxlU2hlZXQoKSB7IHJldHVybiBTdHJpbmcoKTsgfQpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmggYi9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMuaAppbmRleCA2NThmODgzMTQ2MzYwNzI5YjZj
YTM3NjZkYzBjOWE5YTU2OWI4NmU1Li5jNTk0ZTliMWJiMzFjNmM5NGZhY2JjZGJmNjRlNWI1Yzhh
NDk2MGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVN
YWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMuaApAQCAt
MTA4LDYgKzEwOCw3IEBAIHByb3RlY3RlZDoKICAgICAvLyBNZWRpYSBjb250cm9scwogICAgIFN0
cmluZyBtZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpIG92ZXJyaWRlOwogICAgIFN0cmluZyBtZWRp
YUNvbnRyb2xzU2NyaXB0KCkgb3ZlcnJpZGU7CisgICAgU3RyaW5nIG1lZGlhQ29udHJvbHNCYXNl
NjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0oY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJikg
b3ZlcnJpZGU7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDI0NGM2ODUyZGIyM2Ni
MTk3MWYyMGNjYTUzYjczZTdhMmFmZDJkYzUuLjdjYjZhMTc1YTZhMzVkZWUyOWVkODZhNjlhZjdl
NWU5OWM5YjEwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU
aGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMu
bW0KQEAgLTI3Miw2ICsyNzIsMjAgQEAgU3RyaW5nIFJlbmRlclRoZW1lTWFjOjptZWRpYUNvbnRy
b2xzU2NyaXB0KCkKICNlbmRpZgogfQogCitTdHJpbmcgUmVuZGVyVGhlbWVNYWM6Om1lZGlhQ29u
dHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0oY29uc3QgU3RyaW5nJiBpY29uTmFt
ZSwgY29uc3QgU3RyaW5nJiBwbGF0Zm9ybSkKK3sKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNf
U0NSSVBUKQorICAgIGlmICghUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMo
KS5tb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gZW1wdHlTdHJp
bmcoKTsKKworICAgIFN0cmluZyBkaXJlY3RvcnkgPSAibW9kZXJuLW1lZGlhLWNvbnRyb2xzL2lt
YWdlcy8iICsgcGxhdGZvcm07CisgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5k
bGVGb3JDbGFzczpbV2ViQ29yZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV07CisgICAgcmV0dXJu
IFtbTlNEYXRhIGRhdGFXaXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6
aWNvbk5hbWUgb2ZUeXBlOkAicG5nIiBpbkRpcmVjdG9yeTpkaXJlY3RvcnldXSBiYXNlNjRFbmNv
ZGVkU3RyaW5nV2l0aE9wdGlvbnM6MF07CisjZWxzZQorICAgIHJldHVybiBlbXB0eVN0cmluZygp
OworI2VuZGlmCit9CisKICNlbmRpZiAvLyBFTkFCTEUoVklERU8pCiAKIApkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2ljb24tc2VydmljZS9pY29u
LXNlcnZpY2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv
bnRyb2xzL2ljb24tc2VydmljZS9pY29uLXNlcnZpY2UtZXhwZWN0ZWQudHh0CmluZGV4IDM2MzU5
ZWJiZjNjMWQyMTQyMWQxNmM3YTc4YjllYjVlYTk1ZDVhNjEuLjk0NGZhNjkyZTgyODMzNzIyN2Vm
MGExMjMwNzg2NDdkZmMwMDY1NzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL21vZGVy
bi1tZWRpYS1jb250cm9scy9pY29uLXNlcnZpY2UvaWNvbi1zZXJ2aWNlLWV4cGVjdGVkLnR4dAor
KysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvaWNvbi1zZXJ2aWNl
L2ljb24tc2VydmljZS1leHBlY3RlZC50eHQKQEAgLTQsOSArNCw5IEBAIE9uIHN1Y2Nlc3MsIHlv
dSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNU
IENPTVBMRVRFCiAKIAogQ2hlY2tpbmcgcGF0aCB0byBpbWFnZXMgaXMgY29tcHV0ZWQgYWNjb3Jk
aW5nIHRvIHRyYWl0cwotUEFTUyBpY29uU2VydmljZS51cmxGb3JJY29uTmFtZUFuZExheW91dFRy
YWl0cyhJY29ucy5QYXVzZSwgTGF5b3V0VHJhaXRzLm1hY09TKS5pbmNsdWRlcygibWFjT1MvcGF1
c2UiKSBpcyB0cnVlCi1QQVNTIGljb25TZXJ2aWNlLnVybEZvckljb25OYW1lQW5kTGF5b3V0VHJh
aXRzKEljb25zLlBhdXNlLCBMYXlvdXRUcmFpdHMuaU9TKS5pbmNsdWRlcygiaU9TL3BhdXNlIikg
aXMgdHJ1ZQotUEFTUyBpY29uU2VydmljZS51cmxGb3JJY29uTmFtZUFuZExheW91dFRyYWl0cyhJ
Y29ucy5QYXVzZSwgTGF5b3V0VHJhaXRzLm1hY09TIHwgTGF5b3V0VHJhaXRzLkZ1bGxzY3JlZW4p
LmluY2x1ZGVzKCJtYWNPUy9wYXVzZS1mdWxsc2NyZWVuIikgaXMgdHJ1ZQorUEFTUyBpY29uU2Vy
dmljZS5pbWFnZUZvckljb25OYW1lQW5kTGF5b3V0VHJhaXRzKEljb25zLlBhdXNlLCBMYXlvdXRU
cmFpdHMubWFjT1MpLnNyYy5pbmNsdWRlcygibWFjT1MvcGF1c2VAIikgaXMgdHJ1ZQorUEFTUyBp
Y29uU2VydmljZS5pbWFnZUZvckljb25OYW1lQW5kTGF5b3V0VHJhaXRzKEljb25zLlBhdXNlLCBM
YXlvdXRUcmFpdHMuaU9TKS5zcmMuaW5jbHVkZXMoImlPUy9wYXVzZUAiKSBpcyB0cnVlCitQQVNT
IGljb25TZXJ2aWNlLmltYWdlRm9ySWNvbk5hbWVBbmRMYXlvdXRUcmFpdHMoSWNvbnMuUGF1c2Us
IExheW91dFRyYWl0cy5tYWNPUyB8IExheW91dFRyYWl0cy5GdWxsc2NyZWVuKS5zcmMuaW5jbHVk
ZXMoIm1hY09TL3BhdXNlLWZ1bGxzY3JlZW5AIikgaXMgdHJ1ZQogCiBDaGVja2luZyByZXF1ZXN0
ZWQgaW1hZ2VzIGFyZSBjYWNoZWQKIFBBU1MgaWNvblNlcnZpY2UuaW1hZ2VGb3JJY29uTmFtZUFu
ZExheW91dFRyYWl0cyhJY29ucy5QYXVzZSwgTGF5b3V0VHJhaXRzLm1hY09TKSA9PT0gaWNvblNl
cnZpY2UuaW1hZ2VGb3JJY29uTmFtZUFuZExheW91dFRyYWl0cyhJY29ucy5QYXVzZSwgTGF5b3V0
VHJhaXRzLm1hY09TKSBpcyB0cnVlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl
cm4tbWVkaWEtY29udHJvbHMvaWNvbi1zZXJ2aWNlL2ljb24tc2VydmljZS5odG1sIGIvTGF5b3V0
VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2ljb24tc2VydmljZS9pY29uLXNlcnZp
Y2UuaHRtbAppbmRleCAzOGE3YTI5YjY0OWM2MjQyNGQ4YjM4NDU3NzdlNzUyODU4OGQ3MzY2Li5l
YjU0OTFiNjgyYzZmODQ1ZTRhYjdmMWEzYjM3MWRmODRmZmNkMzY0IDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvaWNvbi1zZXJ2aWNlL2ljb24tc2Vy
dmljZS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9p
Y29uLXNlcnZpY2UvaWNvbi1zZXJ2aWNlLmh0bWwKQEAgLTEwLDkgKzEwLDkgQEAgZGVzY3JpcHRp
b24oIlRlc3RpbmcgdGhlIDxjb2RlPmljb25TZXJ2aWNlPC9jb2RlPiBzaW5nbGV0b24uIik7CiBp
Y29uU2VydmljZS5kaXJlY3RvcnlQYXRoID0gIi4uLy4uLy4uLy4uL1NvdXJjZS9XZWJDb3JlL01v
ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2ltYWdlcyI7CiAKIGRlYnVnKCJDaGVja2luZyBw
YXRoIHRvIGltYWdlcyBpcyBjb21wdXRlZCBhY2NvcmRpbmcgdG8gdHJhaXRzIik7Ci1zaG91bGRC
ZVRydWUoJ2ljb25TZXJ2aWNlLnVybEZvckljb25OYW1lQW5kTGF5b3V0VHJhaXRzKEljb25zLlBh
dXNlLCBMYXlvdXRUcmFpdHMubWFjT1MpLmluY2x1ZGVzKCJtYWNPUy9wYXVzZSIpJyk7Ci1zaG91
bGRCZVRydWUoJ2ljb25TZXJ2aWNlLnVybEZvckljb25OYW1lQW5kTGF5b3V0VHJhaXRzKEljb25z
LlBhdXNlLCBMYXlvdXRUcmFpdHMuaU9TKS5pbmNsdWRlcygiaU9TL3BhdXNlIiknKTsKLXNob3Vs
ZEJlVHJ1ZSgnaWNvblNlcnZpY2UudXJsRm9ySWNvbk5hbWVBbmRMYXlvdXRUcmFpdHMoSWNvbnMu
UGF1c2UsIExheW91dFRyYWl0cy5tYWNPUyB8IExheW91dFRyYWl0cy5GdWxsc2NyZWVuKS5pbmNs
dWRlcygibWFjT1MvcGF1c2UtZnVsbHNjcmVlbiIpJyk7CitzaG91bGRCZVRydWUoJ2ljb25TZXJ2
aWNlLmltYWdlRm9ySWNvbk5hbWVBbmRMYXlvdXRUcmFpdHMoSWNvbnMuUGF1c2UsIExheW91dFRy
YWl0cy5tYWNPUykuc3JjLmluY2x1ZGVzKCJtYWNPUy9wYXVzZUAiKScpOworc2hvdWxkQmVUcnVl
KCdpY29uU2VydmljZS5pbWFnZUZvckljb25OYW1lQW5kTGF5b3V0VHJhaXRzKEljb25zLlBhdXNl
LCBMYXlvdXRUcmFpdHMuaU9TKS5zcmMuaW5jbHVkZXMoImlPUy9wYXVzZUAiKScpOworc2hvdWxk
QmVUcnVlKCdpY29uU2VydmljZS5pbWFnZUZvckljb25OYW1lQW5kTGF5b3V0VHJhaXRzKEljb25z
LlBhdXNlLCBMYXlvdXRUcmFpdHMubWFjT1MgfCBMYXlvdXRUcmFpdHMuRnVsbHNjcmVlbikuc3Jj
LmluY2x1ZGVzKCJtYWNPUy9wYXVzZS1mdWxsc2NyZWVuQCIpJyk7CiAKIGRlYnVnKCIiKTsKIGRl
YnVnKCJDaGVja2luZyByZXF1ZXN0ZWQgaW1hZ2VzIGFyZSBjYWNoZWQiKTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>