<?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>122071</bug_id>
          
          <creation_ts>2013-09-28 22:39:22 -0700</creation_ts>
          <short_desc>Merge ScriptControllerBase into ScriptController</short_desc>
          <delta_ts>2013-09-28 23:00:56 -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>528+ (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="Sam Weinig">sam</reporter>
          <assigned_to name="Sam Weinig">sam</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>eflews.bot</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>mkwst</cc>
    
    <cc>rakuco</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>934332</commentid>
    <comment_count>0</comment_count>
    <who name="Sam Weinig">sam</who>
    <bug_when>2013-09-28 22:39:22 -0700</bug_when>
    <thetext>Merge ScriptControllerBase into ScriptController</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>934333</commentid>
    <comment_count>1</comment_count>
      <attachid>212914</attachid>
    <who name="Sam Weinig">sam</who>
    <bug_when>2013-09-28 22:39:57 -0700</bug_when>
    <thetext>Created attachment 212914
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>934334</commentid>
    <comment_count>2</comment_count>
      <attachid>212914</attachid>
    <who name="EFL EWS Bot">eflews.bot</who>
    <bug_when>2013-09-28 22:59:28 -0700</bug_when>
    <thetext>Comment on attachment 212914
Patch

Attachment 212914 did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/2729052</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>934335</commentid>
    <comment_count>3</comment_count>
    <who name="Sam Weinig">sam</who>
    <bug_when>2013-09-28 23:00:56 -0700</bug_when>
    <thetext>Committed r156615: &lt;http://trac.webkit.org/changeset/156615&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>212914</attachid>
            <date>2013-09-28 22:39:57 -0700</date>
            <delta_ts>2013-09-28 22:59:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-122071-20130928223954.patch</filename>
            <type>text/plain</type>
            <size>28555</size>
            <attacher name="Sam Weinig">sam</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjYxMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA5LTI4ICBTYW0gV2Vp
bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWVyZ2UgU2NyaXB0Q29udHJvbGxlckJh
c2UgaW50byBTY3JpcHRDb250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0xMjIwNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBUaGVyZSBpcyBubyBuZWVkIGZvciBTY3JpcHRDb250cm9sbGVyQmFz
ZS4gUmVtb3ZlIGl0LgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICogR05V
bWFrZWZpbGUubGlzdC5hbToKKyAgICAgICAgKiBUYXJnZXQucHJpOgorICAgICAgICAqIFdlYkNv
cmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2o6CisgICAgICAgICogV2ViQ29yZS52Y3hwcm9qL1dl
YkNvcmUudmN4cHJvai5maWx0ZXJzOgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2pl
Y3QucGJ4cHJvajoKKyAgICAgICAgKiBiaW5kaW5ncy9TY3JpcHRDb250cm9sbGVyQmFzZS5jcHA6
IFJlbW92ZWQuCisgICAgICAgICogYmluZGluZ3MvU2NyaXB0Q29udHJvbGxlckJhc2UuaDogUmVt
b3ZlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OmNhbkV4ZWN1dGVTY3JpcHRzKToKKyAgICAg
ICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHQpOgorICAgICAgICAo
V2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTCk6CisgICAg
ICAgICogYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5oOgorCiAyMDEzLTA5LTI4ICBBbnR0
aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBTd2l0Y2ggaW5saW5lIGJv
eGVzIHRvIHVzZSBjb25zdCBSZW5kZXJTdHlsZSYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NNYWtl
TGlzdHMudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CShy
ZXZpc2lvbiAxNTY2MTApCisrKyBTb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dAkod29ya2lu
ZyBjb3B5KQpAQCAtMTAwMiw4ICsxMDAyLDYgQEAgc2V0KFdlYkNvcmVfU09VUkNFUwogICAgIGFj
Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29udGFpbmVyLmNwcAogICAgIGFj
Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlUm93LmNwcAogCi0gICAgYmluZGluZ3MvU2Ny
aXB0Q29udHJvbGxlckJhc2UuY3BwCi0KICAgICBiaW5kaW5ncy9nZW5lcmljL0FjdGl2ZURPTUNh
bGxiYWNrLmNwcAogICAgIGJpbmRpbmdzL2dlbmVyaWMvQmluZGluZ1NlY3VyaXR5LmNwcAogICAg
IGJpbmRpbmdzL2dlbmVyaWMvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5jcHAKSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv
cmUvR05VbWFrZWZpbGUubGlzdC5hbQkocmV2aXNpb24gMTU2NjEwKQorKysgU291cmNlL1dlYkNv
cmUvR05VbWFrZWZpbGUubGlzdC5hbQkod29ya2luZyBjb3B5KQpAQCAtMjUzNiw4ICsyNTM2LDYg
QEAgd2ViY29yZV9zb3VyY2VzICs9IFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3Jr
ZXJTY3JpcHRDb250cm9sbGVyLmggXAogCVNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtl
clNjcmlwdERlYnVnU2VydmVyLmNwcCBcCiAJU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29y
a2VyU2NyaXB0RGVidWdTZXJ2ZXIuaCBcCi0JU291cmNlL1dlYkNvcmUvYmluZGluZ3MvU2NyaXB0
Q29udHJvbGxlckJhc2UuY3BwIFwKLQlTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9TY3JpcHRDb250
cm9sbGVyQmFzZS5oIFwKIAlTb3VyY2UvV2ViQ29yZS9icmlkZ2UvQnJpZGdlLmggXAogCVNvdXJj
ZS9XZWJDb3JlL2JyaWRnZS9jL2NfY2xhc3MuY3BwIFwKIAlTb3VyY2UvV2ViQ29yZS9icmlkZ2Uv
Yy9jX2NsYXNzLmggXApJbmRleDogU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCShyZXZpc2lvbiAxNTY2MTApCisrKyBTb3Vy
Y2UvV2ViQ29yZS9UYXJnZXQucHJpCSh3b3JraW5nIGNvcHkpCkBAIC03MSw3ICs3MSw2IEBAIFNP
VVJDRVMgKz0gXAogICAgIGJpbmRpbmdzL2dlbmVyaWMvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5j
cHAKIAogU09VUkNFUyArPSBcCi0gICAgIGJpbmRpbmdzL1NjcmlwdENvbnRyb2xsZXJCYXNlLmNw
cCBcCiAgICAgIGJpbmRpbmdzL2pzL0FycmF5VmFsdWUuY3BwIFwKICAgICAgYmluZGluZ3MvanMv
QmluZGluZ1N0YXRlLmNwcCBcCiAgICAgIGJpbmRpbmdzL2pzL0NhbGxiYWNrRnVuY3Rpb24uY3Bw
IFwKQEAgLTEzMTMsNyArMTMxMiw2IEBAIEhFQURFUlMgKz0gXAogICAgIGFjY2Vzc2liaWxpdHkv
QWNjZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29udGFpbmVyLmggXAogICAgIGFjY2Vzc2liaWxpdHkv
QWNjZXNzaWJpbGl0eVRhYmxlUm93LmggXAogICAgIGFjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo
ZS5oIFwKLSAgICBiaW5kaW5ncy9TY3JpcHRDb250cm9sbGVyQmFzZS5oIFwKICAgICBiaW5kaW5n
cy9nZW5lcmljL0FjdGl2ZURPTUNhbGxiYWNrLmggXAogICAgIGJpbmRpbmdzL2dlbmVyaWMvQmlu
ZGluZ1NlY3VyaXR5LmggXAogICAgIGJpbmRpbmdzL2dlbmVyaWMvUnVudGltZUVuYWJsZWRGZWF0
dXJlcy5oCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hw
cm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3Jl
LnZjeHByb2oJKHJldmlzaW9uIDE1NjYxMCkKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4
cHJvai9XZWJDb3JlLnZjeHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTE1NjI5LDcgKzE1NjI5LDYg
QEAKICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXGh0bWxcdHJhY2tcVHJhY2tFdmVudC5jcHAi
IC8+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxodG1sXHRyYWNrXFdlYlZUVFBhcnNlci5j
cHAiIC8+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxodG1sXHRyYWNrXFdlYlZUVFRva2Vu
aXplci5jcHAiIC8+Ci0gICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxiaW5kaW5nc1xTY3JpcHRD
b250cm9sbGVyQmFzZS5jcHAiIC8+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxiaW5kaW5n
c1xnZW5lcmljXEFjdGl2ZURPTUNhbGxiYWNrLmNwcCIgLz4KICAgICA8Q2xDb21waWxlIEluY2x1
ZGU9Ii4uXGJpbmRpbmdzXGdlbmVyaWNcQmluZGluZ1NlY3VyaXR5LmNwcCIgLz4KICAgICA8Q2xD
b21waWxlIEluY2x1ZGU9Ii4uXGJpbmRpbmdzXGdlbmVyaWNcUnVudGltZUVuYWJsZWRGZWF0dXJl
cy5jcHAiIC8+CkBAIC0yMDQ2NSw3ICsyMDQ2NCw2IEBACiAgICAgPENsSW5jbHVkZSBJbmNsdWRl
PSIuLlxodG1sXHRyYWNrXFdlYlZUVFBhcnNlci5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVk
ZT0iLi5caHRtbFx0cmFja1xXZWJWVFRUb2tlbi5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVk
ZT0iLi5caHRtbFx0cmFja1xXZWJWVFRUb2tlbml6ZXIuaCIgLz4KLSAgICA8Q2xJbmNsdWRlIElu
Y2x1ZGU9Ii4uXGJpbmRpbmdzXFNjcmlwdENvbnRyb2xsZXJCYXNlLmgiIC8+CiAgICAgPENsSW5j
bHVkZSBJbmNsdWRlPSIuLlxiaW5kaW5nc1xnZW5lcmljXEFjdGl2ZURPTUNhbGxiYWNrLmgiIC8+
CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxiaW5kaW5nc1xnZW5lcmljXEJpbmRpbmdTZWN1
cml0eS5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cYmluZGluZ3NcZ2VuZXJpY1xS
dW50aW1lRW5hYmxlZEZlYXR1cmVzLmgiIC8+CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3Jl
LnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qLmZpbHRlcnMKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJzCShyZXZpc2lvbiAx
NTY2MTApCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9q
LmZpbHRlcnMJKHdvcmtpbmcgY29weSkKQEAgLTQzNTksOSArNDM1OSw2IEBACiAgICAgPENsQ29t
cGlsZSBJbmNsdWRlPSIuLlxodG1sXHRyYWNrXFdlYlZUVFRva2VuaXplci5jcHAiPgogICAgICAg
PEZpbHRlcj5odG1sXHRyYWNrPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+Ci0gICAgPENsQ29t
cGlsZSBJbmNsdWRlPSIuLlxiaW5kaW5nc1xTY3JpcHRDb250cm9sbGVyQmFzZS5jcHAiPgotICAg
ICAgPEZpbHRlcj5iaW5kaW5nczwvRmlsdGVyPgotICAgIDwvQ2xDb21waWxlPgogICAgIDxDbENv
bXBpbGUgSW5jbHVkZT0iLi5cYmluZGluZ3NcZ2VuZXJpY1xBY3RpdmVET01DYWxsYmFjay5jcHAi
PgogICAgICAgPEZpbHRlcj5iaW5kaW5nc1xnZW5lcmljPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBp
bGU+CkBAIC0xMTQ5OSw5ICsxMTQ5Niw2IEBACiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxo
dG1sXHRyYWNrXFdlYlZUVFRva2VuaXplci5oIj4KICAgICAgIDxGaWx0ZXI+aHRtbFx0cmFjazwv
RmlsdGVyPgogICAgIDwvQ2xJbmNsdWRlPgotICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cYmlu
ZGluZ3NcU2NyaXB0Q29udHJvbGxlckJhc2UuaCI+Ci0gICAgICA8RmlsdGVyPmJpbmRpbmdzPC9G
aWx0ZXI+Ci0gICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxiaW5k
aW5nc1xnZW5lcmljXEFjdGl2ZURPTUNhbGxiYWNrLmgiPgogICAgICAgPEZpbHRlcj5iaW5kaW5n
c1xnZW5lcmljPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CkluZGV4OiBTb3VyY2UvV2ViQ29y
ZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAxNTY2
MTApCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJ
KHdvcmtpbmcgY29weSkKQEAgLTMzODUsNyArMzM4NSw2IEBACiAJCTk3RENFMjAyMTA4MDdDNzUw
MDU3RDM5NCAvKiBIaXN0b3J5Q29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY
QnVpbGRGaWxlOyBmaWxlUmVmID0gOTdEQ0UyMDAxMDgwN0M3NTAwNTdEMzk0IC8qIEhpc3RvcnlD
b250cm9sbGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsg
fTsKIAkJOTdFNDAyOEYxM0E2OTZFRDAwOTEzRDY3IC8qIEljb25Db250cm9sbGVyLmNwcCBpbiBT
b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3RTQwMjhEMTNBNjk2
RUQwMDkxM0Q2NyAvKiBJY29uQ29udHJvbGxlci5jcHAgKi87IH07CiAJCTk3RTQwMjkwMTNBNjk2
RUQwMDkxM0Q2NyAvKiBJY29uQ29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY
QnVpbGRGaWxlOyBmaWxlUmVmID0gOTdFNDAyOEUxM0E2OTZFRDAwOTEzRDY3IC8qIEljb25Db250
cm9sbGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK
LQkJOTdFRjdERkUxMDdFNTVCNzAwRDdDNDlDIC8qIFNjcmlwdENvbnRyb2xsZXJCYXNlLmNwcCBp
biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3RUY3REZEMTA3
RTU1QjcwMEQ3QzQ5QyAvKiBTY3JpcHRDb250cm9sbGVyQmFzZS5jcHAgKi87IH07CiAJCTk3RjhF
NjY1MTUxRDRBNEIwMEQyRDE4MSAvKiBXb3JrZXJHbG9iYWxTY29wZU5vdGlmaWNhdGlvbnMuY3Bw
IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTdGOEU2NjEx
NTFENEEzRjAwRDJEMTgxIC8qIFdvcmtlckdsb2JhbFNjb3BlTm90aWZpY2F0aW9ucy5jcHAgKi87
IH07CiAJCTk3RjhFNjY2MTUxRDRBNEUwMEQyRDE4MSAvKiBXb3JrZXJHbG9iYWxTY29wZU5vdGlm
aWNhdGlvbnMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9
IDk3RjhFNjYyMTUxRDRBM0YwMEQyRDE4MSAvKiBXb3JrZXJHbG9iYWxTY29wZU5vdGlmaWNhdGlv
bnMuaCAqLzsgfTsKIAkJOTgzMUFFNEExNTQyMjVDOTAwRkUyNjQ0IC8qIFJlZmVycmVyUG9saWN5
LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5ODMxQUU0
OTE1NDIyNUEyMDBGRTI2NDQgLyogUmVmZXJyZXJQb2xpY3kuaCAqLzsgc2V0dGluZ3MgPSB7QVRU
UklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpAQCAtNTM5Miw3ICs1MzkxLDYgQEAKIAkJQ0RF
RTM5MzcxNzk3NDI1OTAwMUQ3NTgwIC8qIFB1YmxpY1VSTE1hbmFnZXIuY3BwIGluIFNvdXJjZXMg
Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0RFRTM5MzYxNzk3NDI1OTAwMUQ3
NTgwIC8qIFB1YmxpY1VSTE1hbmFnZXIuY3BwICovOyB9OwogCQlDREY2NUNDODE0NUIxRTc1MDBD
NEM3QUEgLyogTWVkaWFDb250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSBDRDI3RjZFNDE0NTc2Nzg3MDA3ODIwN0QgLyogTWVkaWFDb250cm9s
bGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJ
Q0RGNjVDQ0ExNDVCNDQ4ODAwQzRDN0FBIC8qIE1lZGlhQ29udHJvbGxlckludGVyZmFjZS5oIGlu
IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0RGNjVDQzkxNDVC
NDNBNzAwQzRDN0FBIC8qIE1lZGlhQ29udHJvbGxlckludGVyZmFjZS5oICovOyBzZXR0aW5ncyA9
IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07Ci0JCUNFMDJGMEM0MTFFODNBREQwMEM2
Njg0QSAvKiBTY3JpcHRDb250cm9sbGVyQmFzZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY
QnVpbGRGaWxlOyBmaWxlUmVmID0gQ0UwMkYwQzMxMUU4M0FERDAwQzY2ODRBIC8qIFNjcmlwdENv
bnRyb2xsZXJCYXNlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsg
fTsgfTsKIAkJQ0UwNTdGQTUxMjIwNzMxMTAwQTQ3NkQ1IC8qIERvY3VtZW50TWFya2VyQ29udHJv
bGxlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBD
RTA1N0ZBMzEyMjA3MzExMDBBNDc2RDUgLyogRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcCAq
LzsgfTsKIAkJQ0UwNTdGQTYxMjIwNzMxMTAwQTQ3NkQ1IC8qIERvY3VtZW50TWFya2VyQ29udHJv
bGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0Uw
NTdGQTQxMjIwNzMxMTAwQTQ3NkQ1IC8qIERvY3VtZW50TWFya2VyQ29udHJvbGxlci5oICovOyBz
ZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUNFMDhDM0QxMTUy
QjU5OUEwMDIxQjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNwcCBpbiBTb3VyY2Vz
ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENFMDhDM0NGMTUyQjU5OUEwMDIx
QjhDMiAvKiBBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNwcCAqLzsgfTsKQEAgLTY2OTEsMTAg
KzY2ODksMTAgQEAKIAkJMDdDNTlCNTAxN0Y0QUMxNTAwMEZCQ0JCIC8qIFZpZGVvU3RyZWFtVHJh
Y2suY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh
c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gVmlkZW9TdHJlYW1U
cmFjay5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTA3QzU5QjUxMTdGNEFDMTUw
MDBGQkNCQiAvKiBWaWRlb1N0cmVhbVRyYWNrLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j
ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg
cGF0aCA9IFZpZGVvU3RyZWFtVHJhY2suaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ
MDdDNTlCNTIxN0Y0QUMxNTAwMEZCQ0JCIC8qIFZpZGVvU3RyZWFtVHJhY2suaWRsICovID0ge2lz
YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl
ID0gdGV4dDsgcGF0aCA9IFZpZGVvU3RyZWFtVHJhY2suaWRsOyBzb3VyY2VUcmVlID0gIjxncm91
cD4iOyB9OwotCQkwN0M1OUI1OTE3RjRCMjA4MDAwRkJDQkIgLyogSlNBdWRpb1N0cmVhbVRyYWNr
LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0
S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IEpTQXVkaW9TdHJlYW1U
cmFjay5jcHA7IHBhdGggPSBKU0F1ZGlvU3RyZWFtVHJhY2suY3BwOyBzb3VyY2VUcmVlID0gIjxn
cm91cD4iOyB9OwotCQkwN0M1OUI1QTE3RjRCMjA4MDAwRkJDQkIgLyogSlNBdWRpb1N0cmVhbVRy
YWNrLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz
dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IEpTQXVkaW9TdHJlYW1UcmFj
ay5oOyBwYXRoID0gSlNBdWRpb1N0cmVhbVRyYWNrLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7
IH07Ci0JCTA3QzU5QjVCMTdGNEIyMDgwMDBGQkNCQiAvKiBKU1ZpZGVvU3RyZWFtVHJhY2suY3Bw
ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93
bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gSlNWaWRlb1N0cmVhbVRyYWNr
LmNwcDsgcGF0aCA9IEpTVmlkZW9TdHJlYW1UcmFjay5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw
PiI7IH07Ci0JCTA3QzU5QjVDMTdGNEIyMDgwMDBGQkNCQiAvKiBKU1ZpZGVvU3RyZWFtVHJhY2su
aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v
d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gSlNWaWRlb1N0cmVhbVRyYWNrLmg7
IHBhdGggPSBKU1ZpZGVvU3RyZWFtVHJhY2suaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK
KwkJMDdDNTlCNTkxN0Y0QjIwODAwMEZCQ0JCIC8qIEpTQXVkaW9TdHJlYW1UcmFjay5jcHAgKi8g
PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls
ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU0F1ZGlvU3RyZWFtVHJhY2suY3Bw
OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkwN0M1OUI1QTE3RjRCMjA4MDAwRkJDQkIg
LyogSlNBdWRpb1N0cmVhbVRyYWNrLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls
ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9
IEpTQXVkaW9TdHJlYW1UcmFjay5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkwN0M1
OUI1QjE3RjRCMjA4MDAwRkJDQkIgLyogSlNWaWRlb1N0cmVhbVRyYWNrLmNwcCAqLyA9IHtpc2Eg
PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9
IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpTVmlkZW9TdHJlYW1UcmFjay5jcHA7IHNvdXJj
ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTA3QzU5QjVDMTdGNEIyMDgwMDBGQkNCQiAvKiBKU1Zp
ZGVvU3RyZWFtVHJhY2suaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp
bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNWaWRl
b1N0cmVhbVRyYWNrLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTA3QzU5QjYxMTdG
NENGODcwMDBGQkNCQiAvKiBNb2NrTWVkaWFTdHJlYW1DZW50ZXIuY3BwICovID0ge2lzYSA9IFBC
WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291
cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gTW9ja01lZGlhU3RyZWFtQ2VudGVyLmNwcDsgcGF0aCA9
IG1vY2svTW9ja01lZGlhU3RyZWFtQ2VudGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg
fTsKIAkJMDdDNTlCNjIxN0Y0Q0Y4NzAwMEZCQ0JCIC8qIE1vY2tNZWRpYVN0cmVhbUNlbnRlci5o
ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93
bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBNb2NrTWVkaWFTdHJlYW1DZW50ZXIu
aDsgcGF0aCA9IG1vY2svTW9ja01lZGlhU3RyZWFtQ2VudGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdy
b3VwPiI7IH07CiAJCTA3Q0U3N0Q0MTY3MTJBNkEwMEM1NUE0NyAvKiBJbmJhbmRUZXh0VHJhY2tQ
cml2YXRlQ2xpZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n
ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEluYmFuZFRl
eHRUcmFja1ByaXZhdGVDbGllbnQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTEw
MDM2LDcgKzEwMDM0LDYgQEAKIAkJOTdFNDAyOEUxM0E2OTZFRDAwOTEzRDY3IC8qIEljb25Db250
cm9sbGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg
bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEljb25Db250cm9sbGVy
Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTk3RTlFQzhCMTVEQzQ5MkYwMDRGMkU3
MSAvKiBKU1ZvaWRDYWxsYmFjay5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls
ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh
dGggPSBKU1ZvaWRDYWxsYmFjay5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTk3
RTlFQzhDMTVEQzQ5MkYwMDRGMkU3MSAvKiBKU1ZvaWRDYWxsYmFjay5oICovID0ge2lzYSA9IFBC
WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291
cmNlY29kZS5jLmg7IHBhdGggPSBKU1ZvaWRDYWxsYmFjay5oOyBzb3VyY2VUcmVlID0gIjxncm91
cD4iOyB9OwotCQk5N0VGN0RGRDEwN0U1NUI3MDBEN0M0OUMgLyogU2NyaXB0Q29udHJvbGxlckJh
c2UuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh
c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU2NyaXB0Q29udHJv
bGxlckJhc2UuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5N0Y4RTY2MTE1MUQ0
QTNGMDBEMkQxODEgLyogV29ya2VyR2xvYmFsU2NvcGVOb3RpZmljYXRpb25zLmNwcCAqLyA9IHtp
c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw
ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFdvcmtlckdsb2JhbFNjb3BlTm90aWZpY2F0
aW9ucy5jcHA7IHBhdGggPSBNb2R1bGVzL25vdGlmaWNhdGlvbnMvV29ya2VyR2xvYmFsU2NvcGVO
b3RpZmljYXRpb25zLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTdGOEU2NjIx
NTFENEEzRjAwRDJEMTgxIC8qIFdvcmtlckdsb2JhbFNjb3BlTm90aWZpY2F0aW9ucy5oICovID0g
e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU
eXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBXb3JrZXJHbG9iYWxTY29wZU5vdGlmaWNhdGlv
bnMuaDsgcGF0aCA9IE1vZHVsZXMvbm90aWZpY2F0aW9ucy9Xb3JrZXJHbG9iYWxTY29wZU5vdGlm
aWNhdGlvbnMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTdGOEU2NjMxNTFENEEz
RjAwRDJEMTgxIC8qIFdvcmtlckdsb2JhbFNjb3BlTm90aWZpY2F0aW9ucy5pZGwgKi8gPSB7aXNh
ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg
PSB0ZXh0OyBuYW1lID0gV29ya2VyR2xvYmFsU2NvcGVOb3RpZmljYXRpb25zLmlkbDsgcGF0aCA9
IE1vZHVsZXMvbm90aWZpY2F0aW9ucy9Xb3JrZXJHbG9iYWxTY29wZU5vdGlmaWNhdGlvbnMuaWRs
OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTIzNTcsNyArMTIzNTQsNiBAQAogCQlD
REVFMzkzODE3OTc0Mjc0MDAxRDc1ODAgLyogVVJMUmVnaXN0cnkuaCAqLyA9IHtpc2EgPSBQQlhG
aWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g
VVJMUmVnaXN0cnkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0RGNjVDQzkxNDVC
NDNBNzAwQzRDN0FBIC8qIE1lZGlhQ29udHJvbGxlckludGVyZmFjZS5oICovID0ge2lzYSA9IFBC
WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291
cmNlY29kZS5jLmg7IHBhdGggPSBNZWRpYUNvbnRyb2xsZXJJbnRlcmZhY2UuaDsgc291cmNlVHJl
ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0RGNjVDQ0MxNDVCNkFGRTAwQzRDN0FBIC8qIEpTSFRNTE1l
ZGlhRWxlbWVudEN1c3RvbS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu
Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg
PSBKU0hUTUxNZWRpYUVsZW1lbnRDdXN0b20uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9
OwotCQlDRTAyRjBDMzExRTgzQUREMDBDNjY4NEEgLyogU2NyaXB0Q29udHJvbGxlckJhc2UuaCAq
LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G
aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gU2NyaXB0Q29udHJvbGxlckJhc2UuaDsg
c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0UwNTdGQTMxMjIwNzMxMTAwQTQ3NkQ1IC8q
IERvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j
ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j
cHA7IHBhdGggPSBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxn
cm91cD4iOyB9OwogCQlDRTA1N0ZBNDEyMjA3MzExMDBBNDc2RDUgLyogRG9jdW1lbnRNYXJrZXJD
b250cm9sbGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g
NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IERvY3VtZW50TWFy
a2VyQ29udHJvbGxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDRTA4QzNDRjE1
MkI1OTlBMDAyMUI4QzIgLyogQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5jcHAgKi8gPSB7aXNh
ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg
PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNw
cDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE5MjU5LDggKzE5MjU1LDYgQEAKIAkJ
CQlDMEYyQTQzRjEzODY5QTI4MDA2NkM1MzQgLyogcHJlcHJvY2Vzc29yLnBtICovLAogCQkJCThD
NkVBNjE3MTFFRjdFMDQwMEZEOEVFMyAvKiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzLmNwcCAqLywK
IAkJCQk4QzZFQTYxODExRUY3RTA0MDBGRDhFRTMgLyogUnVudGltZUVuYWJsZWRGZWF0dXJlcy5o
ICovLAotCQkJCTk3RUY3REZEMTA3RTU1QjcwMEQ3QzQ5QyAvKiBTY3JpcHRDb250cm9sbGVyQmFz
ZS5jcHAgKi8sCi0JCQkJQ0UwMkYwQzMxMUU4M0FERDAwQzY2ODRBIC8qIFNjcmlwdENvbnRyb2xs
ZXJCYXNlLmggKi8sCiAJCQkJN0M2MTM2RjkxNzEwQzM1MjAwRkY0QTU3IC8qIFN0YXRpY1N0cmlu
Zy5wbSAqLywKIAkJCSk7CiAJCQlwYXRoID0gYmluZGluZ3M7CkBAIC0yMzk3MCw3ICsyMzk2NCw2
IEBACiAJCQkJNDE2RTc1QkUwRURGOEZENzAwMzYwRTFEIC8qIFNjcmlwdENhbGxTdGFjay5oIGlu
IEhlYWRlcnMgKi8sCiAJCQkJRjM5MjI0OUQxMjZGMTFBRTAwQTkyNkQ5IC8qIFNjcmlwdENhbGxT
dGFja0ZhY3RvcnkuaCBpbiBIZWFkZXJzICovLAogCQkJCTkzQjcwRDcwMDlFQjBDN0MwMDlEODQ2
OCAvKiBTY3JpcHRDb250cm9sbGVyLmggaW4gSGVhZGVycyAqLywKLQkJCQlDRTAyRjBDNDExRTgz
QUREMDBDNjY4NEEgLyogU2NyaXB0Q29udHJvbGxlckJhc2UuaCBpbiBIZWFkZXJzICovLAogCQkJ
CTdBRkQ0RkY0MTEzMjc3QjYwMDM1Qjg4MyAvKiBTY3JpcHREZWJ1Z0xpc3RlbmVyLmggaW4gSGVh
ZGVycyAqLywKIAkJCQk5RjZGQzE5NzExMjJFODJBMDBFODAxOTYgLyogU2NyaXB0RGVidWdTZXJ2
ZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCTQ5OThBRUQyMTNGQjIyNEQwMDkwQjFBQSAvKiBTY3Jp
cHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuaCBpbiBIZWFkZXJzICovLApAQCAtMjcxNjUsNyArMjcx
NTgsNiBAQAogCQkJCTQxNkU3NUJGMEVERjhGRDcwMDM2MEUxRCAvKiBTY3JpcHRDYWxsU3RhY2su
Y3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJRjM5MjI0OUMxMjZGMTFBRTAwQTkyNkQ5IC8qIFNjcmlw
dENhbGxTdGFja0ZhY3RvcnkuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJOTNCNzBENkYwOUVCMEM3
QzAwOUQ4NDY4IC8qIFNjcmlwdENvbnRyb2xsZXIuY3BwIGluIFNvdXJjZXMgKi8sCi0JCQkJOTdF
RjdERkUxMDdFNTVCNzAwRDdDNDlDIC8qIFNjcmlwdENvbnRyb2xsZXJCYXNlLmNwcCBpbiBTb3Vy
Y2VzICovLAogCQkJCUE4M0UxQzc0MEU0OTA0MkMwMDE0MEI5QyAvKiBTY3JpcHRDb250cm9sbGVy
TWFjLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJOUY2RkMxOTYxMTIyRTgyQTAwRTgwMTk2IC8qIFNj
cmlwdERlYnVnU2VydmVyLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTQ5OThBRUQxMTNGQjIyNEQw
MDkwQjFBQSAvKiBTY3JpcHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwIGluIFNvdXJjZXMgKi8s
CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9TY3JpcHRDb250cm9sbGVyQmFzZS5jcHAK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvU2NyaXB0Q29udHJvbGxlckJh
c2UuY3BwCShyZXZpc2lvbiAxNTY2MTApCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9TY3Jp
cHRDb250cm9sbGVyQmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsMTI0ICswLDAgQEAKLS8q
Ci0gKiAgQ29weXJpZ2h0IChDKSAxOTk5LTIwMDEgSGFycmkgUG9ydGVuIChwb3J0ZW5Aa2RlLm9y
ZykKLSAqICBDb3B5cmlnaHQgKEMpIDIwMDEgUGV0ZXIgS2VsbHkgKHBta0Bwb3N0LmNvbSkKLSAq
ICBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl
c2VydmVkLgotICoKLSAqICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiBy
ZWRpc3RyaWJ1dGUgaXQgYW5kL29yCi0gKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0
aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYwotICogIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5
IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgotICogIHZlcnNpb24gMiBvZiB0
aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KLSAqCi0g
KiAgVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBi
ZSB1c2VmdWwsCi0gKiAgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhl
IGltcGxpZWQgd2FycmFudHkgb2YKLSAqICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1Ig
QSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQotICogIExlc3NlciBHZW5lcmFsIFB1
YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCi0gKgotICogIFlvdSBzaG91bGQgaGF2ZSBy
ZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKLSAqICBMaWNl
bnNlIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNv
ZnR3YXJlCi0gKiAgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBG
bG9vciwgQm9zdG9uLCBNQSAgMDIxMTAtMTMwMSAgVVNBCi0gKi8KLQotI2luY2x1ZGUgImNvbmZp
Zy5oIgotI2luY2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIuaCIKLQotI2luY2x1ZGUgIkNvbnRlbnRT
ZWN1cml0eVBvbGljeS5oIgotI2luY2x1ZGUgIkRvY3VtZW50LmgiCi0jaW5jbHVkZSAiRG9jdW1l
bnRMb2FkZXIuaCIKLSNpbmNsdWRlICJGcmFtZS5oIgotI2luY2x1ZGUgIkZyYW1lTG9hZGVyLmgi
Ci0jaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnQuaCIKLSNpbmNsdWRlICJQYWdlLmgiCi0jaW5j
bHVkZSAiU2NyaXB0U291cmNlQ29kZS5oIgotI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgiCi0jaW5j
bHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKLSNpbmNsdWRlICJTZXR0aW5ncy5oIgotI2luY2x1ZGUg
IlVzZXJHZXN0dXJlSW5kaWNhdG9yLmgiCi0jaW5jbHVkZSA8d3RmL3RleHQvVGV4dFBvc2l0aW9u
Lmg+Ci0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotYm9vbCBTY3JpcHRDb250cm9sbGVyOjpjYW5F
eGVjdXRlU2NyaXB0cyhSZWFzb25Gb3JDYWxsaW5nQ2FuRXhlY3V0ZVNjcmlwdHMgcmVhc29uKQot
ewotICAgIGlmIChtX2ZyYW1lLmRvY3VtZW50KCkgJiYgbV9mcmFtZS5kb2N1bWVudCgpLT5pc1Nh
bmRib3hlZChTYW5kYm94U2NyaXB0cykpIHsKLSAgICAgICAgLy8gRklYTUU6IFRoaXMgbWVzc2Fn
ZSBzaG91bGQgYmUgbW92ZWQgb2ZmIHRoZSBjb25zb2xlIG9uY2UgYSBzb2x1dGlvbiB0byBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMjc0IGV4aXN0cy4KLSAgICAg
ICAgaWYgKHJlYXNvbiA9PSBBYm91dFRvRXhlY3V0ZVNjcmlwdCkKLSAgICAgICAgICAgIG1fZnJh
bWUuZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoU2VjdXJpdHlNZXNzYWdlU291cmNlLCBF
cnJvck1lc3NhZ2VMZXZlbCwgIkJsb2NrZWQgc2NyaXB0IGV4ZWN1dGlvbiBpbiAnIiArIG1fZnJh
bWUuZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nQ2VudGVyRWxsaXBzaXplZFRvTGVuZ3RoKCkgKyAi
JyBiZWNhdXNlIHRoZSBkb2N1bWVudCdzIGZyYW1lIGlzIHNhbmRib3hlZCBhbmQgdGhlICdhbGxv
dy1zY3JpcHRzJyBwZXJtaXNzaW9uIGlzIG5vdCBzZXQuIik7Ci0gICAgICAgIHJldHVybiBmYWxz
ZTsKLSAgICB9Ci0KLSAgICBpZiAobV9mcmFtZS5kb2N1bWVudCgpICYmIG1fZnJhbWUuZG9jdW1l
bnQoKS0+aXNWaWV3U291cmNlKCkpIHsKLSAgICAgICAgQVNTRVJUKG1fZnJhbWUuZG9jdW1lbnQo
KS0+c2VjdXJpdHlPcmlnaW4oKS0+aXNVbmlxdWUoKSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwot
ICAgIH0KLQotICAgIGlmICghbV9mcmFtZS5wYWdlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsK
LQotICAgIGNvbnN0IGJvb2wgYWxsb3dlZCA9IG1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkuYWxs
b3dTY3JpcHQobV9mcmFtZS5zZXR0aW5ncygpLmlzU2NyaXB0RW5hYmxlZCgpKTsKLSAgICBpZiAo
IWFsbG93ZWQgJiYgcmVhc29uID09IEFib3V0VG9FeGVjdXRlU2NyaXB0KQotICAgICAgICBtX2Zy
YW1lLmxvYWRlcigpLmNsaWVudCgpLmRpZE5vdEFsbG93U2NyaXB0KCk7Ci0gICAgcmV0dXJuIGFs
bG93ZWQ7Ci19Ci0KLVNjcmlwdFZhbHVlIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHQo
Y29uc3QgU3RyaW5nJiBzY3JpcHQsIGJvb2wgZm9yY2VVc2VyR2VzdHVyZSkKLXsKLSAgICBVc2Vy
R2VzdHVyZUluZGljYXRvciBnZXN0dXJlSW5kaWNhdG9yKGZvcmNlVXNlckdlc3R1cmUgPyBEZWZp
bml0ZWx5UHJvY2Vzc2luZ1VzZXJHZXN0dXJlIDogUG9zc2libHlQcm9jZXNzaW5nVXNlckdlc3R1
cmUpOwotICAgIHJldHVybiBleGVjdXRlU2NyaXB0KFNjcmlwdFNvdXJjZUNvZGUoc2NyaXB0LCBt
X2ZyYW1lLmRvY3VtZW50KCktPnVybCgpKSk7Ci19Ci0KLVNjcmlwdFZhbHVlIFNjcmlwdENvbnRy
b2xsZXI6OmV4ZWN1dGVTY3JpcHQoY29uc3QgU2NyaXB0U291cmNlQ29kZSYgc291cmNlQ29kZSkK
LXsKLSAgICBpZiAoIWNhbkV4ZWN1dGVTY3JpcHRzKEFib3V0VG9FeGVjdXRlU2NyaXB0KSB8fCBp
c1BhdXNlZCgpKQotICAgICAgICByZXR1cm4gU2NyaXB0VmFsdWUoKTsKLQotICAgIFJlZjxGcmFt
ZT4gcHJvdGVjdChtX2ZyYW1lKTsgLy8gU2NyaXB0IGV4ZWN1dGlvbiBjYW4gZGVzdHJveSB0aGUg
ZnJhbWUsIGFuZCB0aHVzIHRoZSBTY3JpcHRDb250cm9sbGVyLgotCi0gICAgcmV0dXJuIGV2YWx1
YXRlKHNvdXJjZUNvZGUpOwotfQotCi1ib29sIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkph
dmFTY3JpcHRVUkwoY29uc3QgVVJMJiB1cmwsIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNj
cmlwdFVSTCBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwpCi17Ci0gICAgaWYg
KCFwcm90b2NvbElzSmF2YVNjcmlwdCh1cmwpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg
ICBpZiAoIW1fZnJhbWUucGFnZSgpCi0gICAgICAgIHx8ICFtX2ZyYW1lLmRvY3VtZW50KCktPmNv
bnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0phdmFTY3JpcHRVUkxzKG1fZnJhbWUuZG9jdW1l
bnQoKS0+dXJsKCksIGV2ZW50SGFuZGxlclBvc2l0aW9uKCkubV9saW5lKSkKLSAgICAgICAgcmV0
dXJuIHRydWU7Ci0KLSAgICAvLyBXZSBuZWVkIHRvIGhvbGQgb250byB0aGUgRnJhbWUgaGVyZSBi
ZWNhdXNlIGV4ZWN1dGluZyBzY3JpcHQgY2FuCi0gICAgLy8gZGVzdHJveSB0aGUgZnJhbWUuCi0g
ICAgUmVmPEZyYW1lPiBwcm90ZWN0b3IobV9mcmFtZSk7Ci0gICAgUmVmUHRyPERvY3VtZW50PiBv
d25lckRvY3VtZW50KG1fZnJhbWUuZG9jdW1lbnQoKSk7Ci0KLSAgICBjb25zdCBpbnQgamF2YXNj
cmlwdFNjaGVtZUxlbmd0aCA9IHNpemVvZigiamF2YXNjcmlwdDoiKSAtIDE7Ci0KLSAgICBTdHJp
bmcgZGVjb2RlZFVSTCA9IGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyh1cmwuc3RyaW5nKCkpOwot
ICAgIFNjcmlwdFZhbHVlIHJlc3VsdCA9IGV4ZWN1dGVTY3JpcHQoZGVjb2RlZFVSTC5zdWJzdHJp
bmcoamF2YXNjcmlwdFNjaGVtZUxlbmd0aCkpOwotCi0gICAgLy8gSWYgZXhlY3V0aW5nIHNjcmlw
dCBjYXVzZWQgdGhpcyBmcmFtZSB0byBiZSByZW1vdmVkIGZyb20gdGhlIHBhZ2UsIHdlCi0gICAg
Ly8gZG9uJ3Qgd2FudCB0byB0cnkgdG8gcmVwbGFjZSBpdHMgZG9jdW1lbnQhCi0gICAgaWYgKCFt
X2ZyYW1lLnBhZ2UoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBTdHJpbmcgc2NyaXB0
UmVzdWx0OwotICAgIEpTRE9NV2luZG93U2hlbGwqIHNoZWxsID0gd2luZG93U2hlbGwobWFpblRo
cmVhZE5vcm1hbFdvcmxkKCkpOwotICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gc2hlbGwtPndp
bmRvdygpLT5nbG9iYWxFeGVjKCk7Ci0gICAgaWYgKCFyZXN1bHQuZ2V0U3RyaW5nKGV4ZWMsIHNj
cmlwdFJlc3VsdCkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgLy8gRklYTUU6IFdlIHNo
b3VsZCBhbHdheXMgcmVwbGFjZSB0aGUgZG9jdW1lbnQsIGJ1dCBkb2luZyBzbwotICAgIC8vICAg
ICAgICBzeW5jaHJvbm91c2x5IGNhbiBjYXVzZSBjcmFzaGVzOgotICAgIC8vICAgICAgICBodHRw
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc4MgotICAgIGlmIChzaG91bGRS
ZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgPT0gUmVwbGFjZURvY3VtZW50SWZKYXZhU2Ny
aXB0VVJMKSB7Ci0gICAgICAgIC8vIFdlJ3JlIHN0aWxsIGluIGEgZnJhbWUsIHNvIHRoZXJlIHNo
b3VsZCBiZSBhIERvY3VtZW50TG9hZGVyLgotICAgICAgICBBU1NFUlQobV9mcmFtZS5kb2N1bWVu
dCgpLT5sb2FkZXIoKSk7Ci0gICAgICAgIAotICAgICAgICAvLyBEb2N1bWVudFdyaXRlcjo6cmVw
bGFjZURvY3VtZW50IGNhbiBjYXVzZSB0aGUgRG9jdW1lbnRMb2FkZXIgdG8gZ2V0IGRlcmVmJ2Vk
IGFuZCBwb3NzaWJsZSBkZXN0cm95ZWQsCi0gICAgICAgIC8vIHNvIHByb3RlY3QgaXQgd2l0aCBh
IFJlZlB0ci4KLSAgICAgICAgaWYgKFJlZlB0cjxEb2N1bWVudExvYWRlcj4gbG9hZGVyID0gbV9m
cmFtZS5kb2N1bWVudCgpLT5sb2FkZXIoKSkKLSAgICAgICAgICAgIGxvYWRlci0+d3JpdGVyKCkt
PnJlcGxhY2VEb2N1bWVudChzY3JpcHRSZXN1bHQsIG93bmVyRG9jdW1lbnQuZ2V0KCkpOwotICAg
IH0KLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQotfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDog
U291cmNlL1dlYkNvcmUvYmluZGluZ3MvU2NyaXB0Q29udHJvbGxlckJhc2UuaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9TY3JpcHRDb250cm9sbGVyQmFzZS5oCShyZXZp
c2lvbiAxNTY2MTApCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9TY3JpcHRDb250cm9sbGVy
QmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDQyICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQg
KEMpIDIwMTAgUmVzZWFyY2ggaW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQu
Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgot
ICogQ29weXJpZ2h0IChDKSAyMDA4IEVyaWMgU2VpZGVsIDxlcmljQHdlYmtpdC5vcmc+Ci0gKiBD
b3B5cmlnaHQgKEMpIDIwMDEgUGV0ZXIgS2VsbHkgKHBta0Bwb3N0LmNvbSkKLSAqIENvcHlyaWdo
dCAoQykgMTk5OSBIYXJyaSBQb3J0ZW4gKHBvcnRlbkBrZGUub3JnKQotICoKLSAqIFJlZGlzdHJp
YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91
dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv
d2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNv
dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwg
dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAq
IDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv
dmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0
aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9v
ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAq
IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFO
WQotICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM
SU1JVEVEIFRPLCBUSEUKLSAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg
QU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g
IElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIENPTVBVVEVSLCBJTkMuIE9SCi0gKiBDT05UUklCVVRP
UlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB
TCwKLSAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV
VCBOT1QgTElNSVRFRCBUTywKLSAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1Ig
U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgotICogUFJPRklUUzsgT1IgQlVTSU5FU1Mg
SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQotICogT0YgTElB
QklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0g
KiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkg
T1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU
SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI2lmbmRlZiBTY3JpcHRDb250
cm9sbGVyQmFzZV9oCi0jZGVmaW5lIFNjcmlwdENvbnRyb2xsZXJCYXNlX2gKLQotbmFtZXNwYWNl
IFdlYkNvcmUgewotCi1lbnVtIFJlYXNvbkZvckNhbGxpbmdDYW5FeGVjdXRlU2NyaXB0cyB7Ci0g
ICAgQWJvdXRUb0V4ZWN1dGVTY3JpcHQsCi0gICAgTm90QWJvdXRUb0V4ZWN1dGVTY3JpcHQKLX07
Ci0KLX0KLQotI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRD
b250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9T
Y3JpcHRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMTU2NjEwKQorKysgU291cmNlL1dlYkNvcmUv
YmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzLDYg
KzIzLDcgQEAKIAogI2luY2x1ZGUgIkJyaWRnZUpTQy5oIgogI2luY2x1ZGUgIkNvbnRlbnRTZWN1
cml0eVBvbGljeS5oIgorI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRXZl
bnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKQEAgLTUx
LDggKzUyLDggQEAKICNpbmNsdWRlIDxoZWFwL1N0cm9uZ0lubGluZXMuaD4KICNpbmNsdWRlIDxy
dW50aW1lL0luaXRpYWxpemVUaHJlYWRpbmcuaD4KICNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5o
PgotI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRQb3NpdGlvbi5oPgogI2luY2x1ZGUgPHd0Zi9UaHJl
YWRpbmcuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0UG9zaXRpb24uaD4KIAogdXNpbmcgbmFt
ZXNwYWNlIEpTQzsKIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CkBAIC00NzcsNCArNDc4LDg3IEBAIGJv
b2wgU2NyaXB0Q29udHJvbGxlcjo6c2hvdWxkQnlwYXNzTWFpblcKICAgICByZXR1cm4gdHJ1ZTsK
IH0KIAorYm9vbCBTY3JpcHRDb250cm9sbGVyOjpjYW5FeGVjdXRlU2NyaXB0cyhSZWFzb25Gb3JD
YWxsaW5nQ2FuRXhlY3V0ZVNjcmlwdHMgcmVhc29uKQoreworICAgIGlmIChtX2ZyYW1lLmRvY3Vt
ZW50KCkgJiYgbV9mcmFtZS5kb2N1bWVudCgpLT5pc1NhbmRib3hlZChTYW5kYm94U2NyaXB0cykp
IHsKKyAgICAgICAgLy8gRklYTUU6IFRoaXMgbWVzc2FnZSBzaG91bGQgYmUgbW92ZWQgb2ZmIHRo
ZSBjb25zb2xlIG9uY2UgYSBzb2x1dGlvbiB0byBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MTAzMjc0IGV4aXN0cy4KKyAgICAgICAgaWYgKHJlYXNvbiA9PSBBYm91dFRv
RXhlY3V0ZVNjcmlwdCkKKyAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+YWRkQ29uc29s
ZU1lc3NhZ2UoU2VjdXJpdHlNZXNzYWdlU291cmNlLCBFcnJvck1lc3NhZ2VMZXZlbCwgIkJsb2Nr
ZWQgc2NyaXB0IGV4ZWN1dGlvbiBpbiAnIiArIG1fZnJhbWUuZG9jdW1lbnQoKS0+dXJsKCkuc3Ry
aW5nQ2VudGVyRWxsaXBzaXplZFRvTGVuZ3RoKCkgKyAiJyBiZWNhdXNlIHRoZSBkb2N1bWVudCdz
IGZyYW1lIGlzIHNhbmRib3hlZCBhbmQgdGhlICdhbGxvdy1zY3JpcHRzJyBwZXJtaXNzaW9uIGlz
IG5vdCBzZXQuIik7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBpZiAobV9m
cmFtZS5kb2N1bWVudCgpICYmIG1fZnJhbWUuZG9jdW1lbnQoKS0+aXNWaWV3U291cmNlKCkpIHsK
KyAgICAgICAgQVNTRVJUKG1fZnJhbWUuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+aXNV
bmlxdWUoKSk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIGlmICghbV9mcmFt
ZS5wYWdlKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGNvbnN0IGJvb2wgYWxsb3dl
ZCA9IG1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkuYWxsb3dTY3JpcHQobV9mcmFtZS5zZXR0aW5n
cygpLmlzU2NyaXB0RW5hYmxlZCgpKTsKKyAgICBpZiAoIWFsbG93ZWQgJiYgcmVhc29uID09IEFi
b3V0VG9FeGVjdXRlU2NyaXB0KQorICAgICAgICBtX2ZyYW1lLmxvYWRlcigpLmNsaWVudCgpLmRp
ZE5vdEFsbG93U2NyaXB0KCk7CisgICAgcmV0dXJuIGFsbG93ZWQ7Cit9CisKK1NjcmlwdFZhbHVl
IFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHQoY29uc3QgU3RyaW5nJiBzY3JpcHQsIGJv
b2wgZm9yY2VVc2VyR2VzdHVyZSkKK3sKKyAgICBVc2VyR2VzdHVyZUluZGljYXRvciBnZXN0dXJl
SW5kaWNhdG9yKGZvcmNlVXNlckdlc3R1cmUgPyBEZWZpbml0ZWx5UHJvY2Vzc2luZ1VzZXJHZXN0
dXJlIDogUG9zc2libHlQcm9jZXNzaW5nVXNlckdlc3R1cmUpOworICAgIHJldHVybiBleGVjdXRl
U2NyaXB0KFNjcmlwdFNvdXJjZUNvZGUoc2NyaXB0LCBtX2ZyYW1lLmRvY3VtZW50KCktPnVybCgp
KSk7Cit9CisKK1NjcmlwdFZhbHVlIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVTY3JpcHQoY29u
c3QgU2NyaXB0U291cmNlQ29kZSYgc291cmNlQ29kZSkKK3sKKyAgICBpZiAoIWNhbkV4ZWN1dGVT
Y3JpcHRzKEFib3V0VG9FeGVjdXRlU2NyaXB0KSB8fCBpc1BhdXNlZCgpKQorICAgICAgICByZXR1
cm4gU2NyaXB0VmFsdWUoKTsKKworICAgIFJlZjxGcmFtZT4gcHJvdGVjdChtX2ZyYW1lKTsgLy8g
U2NyaXB0IGV4ZWN1dGlvbiBjYW4gZGVzdHJveSB0aGUgZnJhbWUsIGFuZCB0aHVzIHRoZSBTY3Jp
cHRDb250cm9sbGVyLgorCisgICAgcmV0dXJuIGV2YWx1YXRlKHNvdXJjZUNvZGUpOworfQorCiti
b29sIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwoY29uc3QgVVJMJiB1
cmwsIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCBzaG91bGRSZXBsYWNlRG9j
dW1lbnRJZkphdmFTY3JpcHRVUkwpCit7CisgICAgaWYgKCFwcm90b2NvbElzSmF2YVNjcmlwdCh1
cmwpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIW1fZnJhbWUucGFnZSgpIHx8
ICFtX2ZyYW1lLmRvY3VtZW50KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0phdmFT
Y3JpcHRVUkxzKG1fZnJhbWUuZG9jdW1lbnQoKS0+dXJsKCksIGV2ZW50SGFuZGxlclBvc2l0aW9u
KCkubV9saW5lKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAvLyBXZSBuZWVkIHRvIGhv
bGQgb250byB0aGUgRnJhbWUgaGVyZSBiZWNhdXNlIGV4ZWN1dGluZyBzY3JpcHQgY2FuCisgICAg
Ly8gZGVzdHJveSB0aGUgZnJhbWUuCisgICAgUmVmPEZyYW1lPiBwcm90ZWN0b3IobV9mcmFtZSk7
CisgICAgUmVmUHRyPERvY3VtZW50PiBvd25lckRvY3VtZW50KG1fZnJhbWUuZG9jdW1lbnQoKSk7
CisKKyAgICBjb25zdCBpbnQgamF2YXNjcmlwdFNjaGVtZUxlbmd0aCA9IHNpemVvZigiamF2YXNj
cmlwdDoiKSAtIDE7CisKKyAgICBTdHJpbmcgZGVjb2RlZFVSTCA9IGRlY29kZVVSTEVzY2FwZVNl
cXVlbmNlcyh1cmwuc3RyaW5nKCkpOworICAgIFNjcmlwdFZhbHVlIHJlc3VsdCA9IGV4ZWN1dGVT
Y3JpcHQoZGVjb2RlZFVSTC5zdWJzdHJpbmcoamF2YXNjcmlwdFNjaGVtZUxlbmd0aCkpOworCisg
ICAgLy8gSWYgZXhlY3V0aW5nIHNjcmlwdCBjYXVzZWQgdGhpcyBmcmFtZSB0byBiZSByZW1vdmVk
IGZyb20gdGhlIHBhZ2UsIHdlCisgICAgLy8gZG9uJ3Qgd2FudCB0byB0cnkgdG8gcmVwbGFjZSBp
dHMgZG9jdW1lbnQhCisgICAgaWYgKCFtX2ZyYW1lLnBhZ2UoKSkKKyAgICAgICAgcmV0dXJuIHRy
dWU7CisKKyAgICBTdHJpbmcgc2NyaXB0UmVzdWx0OworICAgIEpTRE9NV2luZG93U2hlbGwqIHNo
ZWxsID0gd2luZG93U2hlbGwobWFpblRocmVhZE5vcm1hbFdvcmxkKCkpOworICAgIEpTQzo6RXhl
Y1N0YXRlKiBleGVjID0gc2hlbGwtPndpbmRvdygpLT5nbG9iYWxFeGVjKCk7CisgICAgaWYgKCFy
ZXN1bHQuZ2V0U3RyaW5nKGV4ZWMsIHNjcmlwdFJlc3VsdCkpCisgICAgICAgIHJldHVybiB0cnVl
OworCisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBhbHdheXMgcmVwbGFjZSB0aGUgZG9jdW1lbnQs
IGJ1dCBkb2luZyBzbworICAgIC8vICAgICAgICBzeW5jaHJvbm91c2x5IGNhbiBjYXVzZSBjcmFz
aGVzOgorICAgIC8vICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xNjc4MgorICAgIGlmIChzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgPT0g
UmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKSB7CisgICAgICAgIC8vIFdlJ3JlIHN0aWxs
IGluIGEgZnJhbWUsIHNvIHRoZXJlIHNob3VsZCBiZSBhIERvY3VtZW50TG9hZGVyLgorICAgICAg
ICBBU1NFUlQobV9mcmFtZS5kb2N1bWVudCgpLT5sb2FkZXIoKSk7CisgICAgICAgIAorICAgICAg
ICAvLyBEb2N1bWVudFdyaXRlcjo6cmVwbGFjZURvY3VtZW50IGNhbiBjYXVzZSB0aGUgRG9jdW1l
bnRMb2FkZXIgdG8gZ2V0IGRlcmVmJ2VkIGFuZCBwb3NzaWJsZSBkZXN0cm95ZWQsCisgICAgICAg
IC8vIHNvIHByb3RlY3QgaXQgd2l0aCBhIFJlZlB0ci4KKyAgICAgICAgaWYgKFJlZlB0cjxEb2N1
bWVudExvYWRlcj4gbG9hZGVyID0gbV9mcmFtZS5kb2N1bWVudCgpLT5sb2FkZXIoKSkKKyAgICAg
ICAgICAgIGxvYWRlci0+d3JpdGVyKCktPnJlcGxhY2VEb2N1bWVudChzY3JpcHRSZXN1bHQsIG93
bmVyRG9jdW1lbnQuZ2V0KCkpOworICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogfSAvLyBu
YW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0
Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Nj
cmlwdENvbnRyb2xsZXIuaAkocmV2aXNpb24gMTU2NjEwKQorKysgU291cmNlL1dlYkNvcmUvYmlu
ZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNCw3ICsyNCw2
IEBACiAKICNpbmNsdWRlICJGcmFtZUxvYWRlclR5cGVzLmgiCiAjaW5jbHVkZSAiSlNET01XaW5k
b3dTaGVsbC5oIgotI2luY2x1ZGUgIlNjcmlwdENvbnRyb2xsZXJCYXNlLmgiCiAjaW5jbHVkZSA8
SmF2YVNjcmlwdENvcmUvSlNCYXNlLmg+CiAjaW5jbHVkZSA8aGVhcC9TdHJvbmcuaD4KICNpbmNs
dWRlIDx3dGYvRm9yd2FyZC5oPgpAQCAtNjAsNiArNTksMTEgQEAgY2xhc3MgV2lkZ2V0OwogCiB0
eXBlZGVmIEhhc2hNYXA8dm9pZCosIFJlZlB0cjxKU0M6OkJpbmRpbmdzOjpSb290T2JqZWN0PiA+
IFJvb3RPYmplY3RNYXA7CiAKK2VudW0gUmVhc29uRm9yQ2FsbGluZ0NhbkV4ZWN1dGVTY3JpcHRz
IHsKKyAgICBBYm91dFRvRXhlY3V0ZVNjcmlwdCwKKyAgICBOb3RBYm91dFRvRXhlY3V0ZVNjcmlw
dAorfTsKKwogY2xhc3MgU2NyaXB0Q29udHJvbGxlciB7CiAgICAgZnJpZW5kIGNsYXNzIFNjcmlw
dENhY2hlZEZyYW1lRGF0YTsKICAgICB0eXBlZGVmIFdURjo6SGFzaE1hcDwgUmVmUHRyPERPTVdy
YXBwZXJXb3JsZD4sIEpTQzo6U3Ryb25nPEpTRE9NV2luZG93U2hlbGw+ID4gU2hlbGxNYXA7Cg==
</data>
<flag name="review"
          id="235192"
          type_id="1"
          status="+"
          setter="koivisto"
    />
    <flag name="commit-queue"
          id="235194"
          type_id="3"
          status="-"
          setter="eflews.bot"
    />
          </attachment>
      

    </bug>

</bugzilla>