<?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>84491</bug_id>
          
          <creation_ts>2012-04-20 13:55:51 -0700</creation_ts>
          <short_desc>[chromium] Fix compile errors when DEBUG_GL_CALLS is enabled</short_desc>
          <delta_ts>2012-04-20 15:18:26 -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="Alexandre Elias">aelias</reporter>
          <assigned_to name="Alexandre Elias">aelias</assigned_to>
          <cc>aelias</cc>
    
    <cc>cc-bugs</cc>
    
    <cc>jamesr</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>606874</commentid>
    <comment_count>0</comment_count>
    <who name="Alexandre Elias">aelias</who>
    <bug_when>2012-04-20 13:55:51 -0700</bug_when>
    <thetext>[chromium] Fix compile errors when DEBUG_GL_CALLS is enabled</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>606875</commentid>
    <comment_count>1</comment_count>
      <attachid>138156</attachid>
    <who name="Alexandre Elias">aelias</who>
    <bug_when>2012-04-20 14:01:11 -0700</bug_when>
    <thetext>Created attachment 138156
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>606950</commentid>
    <comment_count>2</comment_count>
      <attachid>138156</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-04-20 15:18:21 -0700</bug_when>
    <thetext>Comment on attachment 138156
Patch

Clearing flags on attachment: 138156

Committed r114787: &lt;http://trac.webkit.org/changeset/114787&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>606952</commentid>
    <comment_count>3</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-04-20 15:18:26 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>138156</attachid>
            <date>2012-04-20 14:01:11 -0700</date>
            <delta_ts>2012-04-20 15:18:21 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-84491-20120420140110.patch</filename>
            <type>text/plain</type>
            <size>16796</size>
            <attacher name="Alexandre Elias">aelias</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODUxNjI1OTJlMWIxYzUx
YTdkYTBiYWI5ODc0YzUxNzhhOWE1NmIzMy4uZmViMjhkZDM2YTgzYzBiYzg3ODk5MjBmMjBjZjMy
MWE3ZmI3MWZmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA0LTIwICBBbGV4
YW5kcmUgRWxpYXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEZp
eCBjb21waWxlIGVycm9ycyB3aGVuIERFQlVHX0dMX0NBTExTIGlzIGVuYWJsZWQKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDkxCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgREVCVUdfR0xfQ0FMTFMgaGFk
IG5vdCBiZWVuIHVzZWQgaW4gYSB3aGlsZSBhbmQgdGhlIG1vZGUgbm8gbG9uZ2VyCisgICAgICAg
IGNvbXBpbGVkIHdoZW4gSSB0cmllZCBpdC4gIEkgaW1wcm92ZWQgdGhlIEdMQyBtYWNybyB0byBz
dXBwb3J0IGVpdGhlcgorICAgICAgICByYXcgcG9pbnRlcnMgb3IgUmVmUHRycywgYW5kIHRvIGJl
IGEgc2luZ2xlIGV4cHJlc3Npb24gaW4gb3JkZXIgdG8KKyAgICAgICAgaW50ZXJhY3QgcHJvcGVy
bHkgd2l0aCBpZi9lbHNlIGJsb2Nrcy4gIEkgZml4ZWQgdGhlIGNhc2VzIHdoZXJlIHdlCisgICAg
ICAgIHdlcmUgcGFzc2luZyBpbiB0aGUgImNvbnRleHQiIG1ldGhvZCBwb2ludGVyIGJ5IG1pc3Rh
a2UsIGFuZCByZW1vdmVkIHRoZQorICAgICAgICBub3ctdW5uZWNlc3NhcnkgImdldCgpIiBjYWxs
cyBmb3IgdGhlIFJlZlB0cnMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoTm8tb3AgY2hhbmdl
IGluIHJlbGVhc2UgYnVpbGRzLikKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t
aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJl
bmRlcmVyQ2hyb21pdW06OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5k
ZXJlckNocm9taXVtOjpjbGVhclJlbmRlclN1cmZhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5
ZXJSZW5kZXJlckNocm9taXVtOjpiZWdpbkRyYXdpbmdGcmFtZSk6CisgICAgICAgIChXZWJDb3Jl
OjpMYXllclJlbmRlcmVyQ2hyb21pdW06OmRvTm9PcCk6CisgICAgICAgIChXZWJDb3JlOjpMYXll
clJlbmRlcmVyQ2hyb21pdW06OmRyYXdRdWFkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVu
ZGVyZXJDaHJvbWl1bTo6ZHJhd1RleHR1cmVRdWFkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVy
UmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0hlYWRzVXBEaXNwbGF5KToKKyAgICAgICAgKFdlYkNvcmU6
OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZmluaXNoRHJhd2luZ0ZyYW1lKToKKyAgICAgICAgKFdl
YkNvcmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXNlUmVuZGVyU3VyZmFjZSk6CisgICAgICAg
IChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OmJpbmRGcmFtZWJ1ZmZlclRvVGV4dHVy
ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OnNldFNjaXNzb3JU
b1JlY3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpzZXREcmF3
Vmlld3BvcnRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6
aW5pdGlhbGl6ZVNoYXJlZE9iamVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJl
ckNocm9taXVtOjpjbGVhbnVwU2hhcmVkT2JqZWN0cyk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh
cGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmg6CisgICAgICAgIChXZWJDb3Jl
KToKKwogMjAxMi0wNC0xOSAgdnNldmlrQGNocm9taXVtLm9yZyAgPHZzZXZpa0BjaHJvbWl1bS5v
cmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTm8gcmVzcG9uc2UgYm9keSBhdmFpbGFibGUg
Zm9yIGNhY2hlZCByZXNvdXJjZSByZXF1ZXN0cyB3aXRoIGVycm9yIHN0YXR1cyBjb2Rlcy4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy
UmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j
aHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IDdmYTNjMzU2Nzk5MmY1M2Ri
ZTY1NDU4NDcxOTc2ZGY3YzYwM2RjY2EuLmQ4M2M4ZTViNjczOTdjM2FkYjNkMWMxNjJjNmJmN2Mz
MDllNmNhN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No
cm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcApAQCAtMzAy
LDcgKzMwMiw3IEBAIGJvb2wgTGF5ZXJSZW5kZXJlckNocm9taXVtOjppbml0aWFsaXplKCkKICAg
ICBpZiAobV9jYXBhYmlsaXRpZXMudXNpbmdEaXNjYXJkRnJhbWVidWZmZXIpCiAgICAgICAgIGV4
dGVuc2lvbnMtPmVuc3VyZUVuYWJsZWQoIkdMX0NIUk9NSVVNX2Rpc2NhcmRfZnJhbWVidWZmZXIi
KTsKIAotICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+Z2V0SW50ZWdlcnYoR3Jh
cGhpY3NDb250ZXh0M0Q6Ok1BWF9URVhUVVJFX1NJWkUsICZtX2NhcGFiaWxpdGllcy5tYXhUZXh0
dXJlU2l6ZSkpOworICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+Z2V0SW50ZWdlcnYoR3Jh
cGhpY3NDb250ZXh0M0Q6Ok1BWF9URVhUVVJFX1NJWkUsICZtX2NhcGFiaWxpdGllcy5tYXhUZXh0
dXJlU2l6ZSkpOwogICAgIG1fY2FwYWJpbGl0aWVzLmJlc3RUZXh0dXJlRm9ybWF0ID0gUGxhdGZv
cm1Db2xvcjo6YmVzdFRleHR1cmVGb3JtYXQobV9jb250ZXh0LmdldCgpKTsKIAogICAgIGlmICgh
aW5pdGlhbGl6ZVNoYXJlZE9iamVjdHMoKSkKQEAgLTM3MSwyMSArMzcxLDIxIEBAIHZvaWQgTGF5
ZXJSZW5kZXJlckNocm9taXVtOjpjbGVhclJlbmRlclN1cmZhY2UoQ0NSZW5kZXJTdXJmYWNlKiBy
ZW5kZXJTdXJmYWNlLCBDCiAgICAgLy8gb2YgdGhlIHNjcmVlbi4KIAogICAgIGlmIChyZW5kZXJT
dXJmYWNlICE9IHJvb3RSZW5kZXJTdXJmYWNlKQotICAgICAgICBHTEMobV9jb250ZXh0LmdldCgp
LCBtX2NvbnRleHQtPmNsZWFyQ29sb3IoMCwgMCwgMCwgMCkpOworICAgICAgICBHTEMobV9jb250
ZXh0LCBtX2NvbnRleHQtPmNsZWFyQ29sb3IoMCwgMCwgMCwgMCkpOwogICAgIGVsc2UKLSAgICAg
ICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5jbGVhckNvbG9yKDAsIDAsIDEsIDEp
KTsKKyAgICAgICAgR0xDKG1fY29udGV4dCwgbV9jb250ZXh0LT5jbGVhckNvbG9yKDAsIDAsIDEs
IDEpKTsKIAogICAgIGlmIChtX2NhcGFiaWxpdGllcy51c2luZ1BhcnRpYWxTd2FwKQogICAgICAg
ICBzZXRTY2lzc29yVG9SZWN0KGVuY2xvc2luZ0ludFJlY3Qoc3VyZmFjZURhbWFnZVJlY3QpKTsK
ICAgICBlbHNlCi0gICAgICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+ZGlzYWJs
ZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9URVNUKSk7CisgICAgICAgIEdMQyhtX2NvbnRl
eHQsIG1fY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9URVNUKSk7
CiAKICNpZiBkZWZpbmVkKE5ERUJVRykKICAgICBpZiAocmVuZGVyU3VyZmFjZSAhPSByb290UmVu
ZGVyU3VyZmFjZSkKICNlbmRpZgogICAgICAgICBtX2NvbnRleHQtPmNsZWFyKEdyYXBoaWNzQ29u
dGV4dDNEOjpDT0xPUl9CVUZGRVJfQklUKTsKIAotICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1f
Y29udGV4dC0+ZW5hYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09SX1RFU1QpKTsKKyAgICBH
TEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NP
Ul9URVNUKSk7CiB9CiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpiZWdpbkRyYXdpbmdG
cmFtZShDQ1JlbmRlclN1cmZhY2UqIGRlZmF1bHRSZW5kZXJTdXJmYWNlKQpAQCAtNDE2LDE3ICs0
MTYsMTcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmJlZ2luRHJhd2luZ0ZyYW1lKEND
UmVuZGVyU3VyZmFjZSogZGVmYXVsdFJlbmRlclN1cmYKICAgICAvLyBCaW5kIHRoZSBjb21tb24g
dmVydGV4IGF0dHJpYnV0ZXMgdXNlZCBmb3IgZHJhd2luZyBhbGwgdGhlIGxheWVycy4KICAgICBt
X3NoYXJlZEdlb21ldHJ5LT5wcmVwYXJlRm9yRHJhdygpOwogCi0gICAgR0xDKG1fY29udGV4dC5n
ZXQoKSwgbV9jb250ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9URVNUKSk7
Ci0gICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29u
dGV4dDNEOjpDVUxMX0ZBQ0UpKTsKLSAgICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2NvbnRleHQt
PmNvbG9yTWFzayh0cnVlLCB0cnVlLCB0cnVlLCB0cnVlKSk7Ci0gICAgR0xDKG1fY29udGV4dC5n
ZXQoKSwgbV9jb250ZXh0LT5lbmFibGUoR3JhcGhpY3NDb250ZXh0M0Q6OkJMRU5EKSk7Ci0gICAg
R0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5ibGVuZEZ1bmMoR3JhcGhpY3NDb250ZXh0
M0Q6Ok9ORSwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKKyAgICBH
TEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRI
X1RFU1QpKTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3ND
b250ZXh0M0Q6OkNVTExfRkFDRSkpOworICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+Y29s
b3JNYXNrKHRydWUsIHRydWUsIHRydWUsIHRydWUpKTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2Nv
bnRleHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6QkxFTkQpKTsKKyAgICBHTEMobV9jb250
ZXh0LCBtX2NvbnRleHQtPmJsZW5kRnVuYyhHcmFwaGljc0NvbnRleHQzRDo6T05FLCBHcmFwaGlj
c0NvbnRleHQzRDo6T05FX01JTlVTX1NSQ19BTFBIQSkpOwogfQogCiB2b2lkIExheWVyUmVuZGVy
ZXJDaHJvbWl1bTo6ZG9Ob09wKCkKIHsKLSAgICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2NvbnRl
eHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIDApKTsK
LSAgICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2NvbnRleHQtPmZsdXNoKCkpOworICAgIEdMQyht
X2NvbnRleHQsIG1fY29udGV4dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpG
UkFNRUJVRkZFUiwgMCkpOworICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+Zmx1c2goKSk7
CiB9CiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3UmVuZGVyUGFzcyhjb25zdCBD
Q1JlbmRlclBhc3MqIHJlbmRlclBhc3MpCkBAIC00NTYsMTQgKzQ1NiwxNCBAQCB2b2lkIExheWVy
UmVuZGVyZXJDaHJvbWl1bTo6ZHJhd1F1YWQoY29uc3QgQ0NEcmF3UXVhZCogcXVhZCwgY29uc3Qg
RmxvYXRSZWN0JiBzdQogICAgICAgICBzY2lzc29yUmVjdCA9IHF1YWQtPmNsaXBSZWN0KCk7CiAK
ICAgICBpZiAoc2Npc3NvclJlY3QuaXNFbXB0eSgpKQotICAgICAgICBHTEMobV9jb250ZXh0Lmdl
dCgpLCBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVTVCkp
OworICAgICAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250
ZXh0M0Q6OlNDSVNTT1JfVEVTVCkpOwogICAgIGVsc2UKICAgICAgICAgc2V0U2Npc3NvclRvUmVj
dChzY2lzc29yUmVjdCk7CiAKICAgICBpZiAocXVhZC0+bmVlZHNCbGVuZGluZygpKQotICAgICAg
ICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2NvbnRleHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQz
RDo6QkxFTkQpKTsKKyAgICAgICAgR0xDKG1fY29udGV4dCwgbV9jb250ZXh0LT5lbmFibGUoR3Jh
cGhpY3NDb250ZXh0M0Q6OkJMRU5EKSk7CiAgICAgZWxzZQotICAgICAgICBHTEMobV9jb250ZXh0
LmdldCgpLCBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250ZXh0M0Q6OkJMRU5EKSk7Cisg
ICAgICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0NvbnRleHQz
RDo6QkxFTkQpKTsKIAogICAgIHN3aXRjaCAocXVhZC0+bWF0ZXJpYWwoKSkgewogICAgIGNhc2Ug
Q0NEcmF3UXVhZDo6SW52YWxpZDoKQEAgLTEwNDUsMTAgKzEwNDUsMTAgQEAgdm9pZCBMYXllclJl
bmRlcmVyQ2hyb21pdW06OmRyYXdUZXh0dXJlUXVhZChjb25zdCBDQ1RleHR1cmVEcmF3UXVhZCog
cXVhZCkKICAgICAgICAgICAgIGJpbmRpbmcuc2V0KHRleHR1cmVMYXllclByb2dyYW1TdHJldGNo
RmxpcCgpKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgYmluZGluZy5zZXQodGV4dHVyZUxh
eWVyUHJvZ3JhbVN0cmV0Y2goKSk7Ci0gICAgICAgIEdMQyhjb250ZXh0LCBjb250ZXh0KCktPnVz
ZVByb2dyYW0oYmluZGluZy5wcm9ncmFtSWQpKTsKLSAgICAgICAgR0xDKGNvbnRleHQsIGNvbnRl
eHQoKS0+dW5pZm9ybTFpKGJpbmRpbmcuc2FtcGxlckxvY2F0aW9uLCAwKSk7Ci0gICAgICAgIEdM
Qyhjb250ZXh0LCBjb250ZXh0KCktPnVuaWZvcm0yZihiaW5kaW5nLm9mZnNldExvY2F0aW9uLCBx
dWFkLT51dlJlY3QoKS54KCksIHF1YWQtPnV2UmVjdCgpLnkoKSkpOwotICAgICAgICBHTEMoY29u
dGV4dCwgY29udGV4dCgpLT51bmlmb3JtMmYoYmluZGluZy5zY2FsZUxvY2F0aW9uLCBxdWFkLT51
dlJlY3QoKS53aWR0aCgpLCBxdWFkLT51dlJlY3QoKS5oZWlnaHQoKSkpOworICAgICAgICBHTEMo
Y29udGV4dCgpLCBjb250ZXh0KCktPnVzZVByb2dyYW0oYmluZGluZy5wcm9ncmFtSWQpKTsKKyAg
ICAgICAgR0xDKGNvbnRleHQoKSwgY29udGV4dCgpLT51bmlmb3JtMWkoYmluZGluZy5zYW1wbGVy
TG9jYXRpb24sIDApKTsKKyAgICAgICAgR0xDKGNvbnRleHQoKSwgY29udGV4dCgpLT51bmlmb3Jt
MmYoYmluZGluZy5vZmZzZXRMb2NhdGlvbiwgcXVhZC0+dXZSZWN0KCkueCgpLCBxdWFkLT51dlJl
Y3QoKS55KCkpKTsKKyAgICAgICAgR0xDKGNvbnRleHQoKSwgY29udGV4dCgpLT51bmlmb3JtMmYo
YmluZGluZy5zY2FsZUxvY2F0aW9uLCBxdWFkLT51dlJlY3QoKS53aWR0aCgpLCBxdWFkLT51dlJl
Y3QoKS5oZWlnaHQoKSkpOwogCiAgICAgICAgIG1hdHJpeExvY2F0aW9uID0gYmluZGluZy5tYXRy
aXhMb2NhdGlvbjsKICAgICAgICAgYWxwaGFMb2NhdGlvbiA9IGJpbmRpbmcuYWxwaGFMb2NhdGlv
bjsKQEAgLTEwNjIsMTAgKzEwNjIsMTAgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRy
YXdUZXh0dXJlUXVhZChjb25zdCBDQ1RleHR1cmVEcmF3UXVhZCogcXVhZCkKIAogICAgIC8vIEZJ
WE1FOiBzZXR0aW5nIHRoZSB0ZXh0dXJlIHBhcmFtZXRlcnMgZXZlcnkgdGltZSBpcyByZWR1bmRh
bnQuIE1vdmUgdGhpcyBjb2RlIHNvbWV3aGVyZQogICAgIC8vIHdoZXJlIGl0IHdpbGwgb25seSBo
YXBwZW4gb25jZSBwZXIgdGV4dHVyZS4KLSAgICBHTEMoY29udGV4dCwgY29udGV4dCgpLT50ZXhQ
YXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGljc0NvbnRleHQz
RDo6VEVYVFVSRV9NSU5fRklMVEVSLCBHcmFwaGljc0NvbnRleHQzRDo6TElORUFSKSk7Ci0gICAg
R0xDKGNvbnRleHQsIGNvbnRleHQoKS0+dGV4UGFyYW1ldGVyaShHcmFwaGljc0NvbnRleHQzRDo6
VEVYVFVSRV8yRCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfTUFHX0ZJTFRFUiwgR3JhcGhp
Y3NDb250ZXh0M0Q6OkxJTkVBUikpOwotICAgIEdMQyhjb250ZXh0LCBjb250ZXh0KCktPnRleFBh
cmFtZXRlcmkoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIEdyYXBoaWNzQ29udGV4dDNE
OjpURVhUVVJFX1dSQVBfUywgR3JhcGhpY3NDb250ZXh0M0Q6OkNMQU1QX1RPX0VER0UpKTsKLSAg
ICBHTEMoY29udGV4dCwgY29udGV4dCgpLT50ZXhQYXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNE
OjpURVhUVVJFXzJELCBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9XUkFQX1QsIEdyYXBoaWNz
Q29udGV4dDNEOjpDTEFNUF9UT19FREdFKSk7CisgICAgR0xDKGNvbnRleHQoKSwgY29udGV4dCgp
LT50ZXhQYXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGljc0Nv
bnRleHQzRDo6VEVYVFVSRV9NSU5fRklMVEVSLCBHcmFwaGljc0NvbnRleHQzRDo6TElORUFSKSk7
CisgICAgR0xDKGNvbnRleHQoKSwgY29udGV4dCgpLT50ZXhQYXJhbWV0ZXJpKEdyYXBoaWNzQ29u
dGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9NQUdfRklMVEVS
LCBHcmFwaGljc0NvbnRleHQzRDo6TElORUFSKSk7CisgICAgR0xDKGNvbnRleHQoKSwgY29udGV4
dCgpLT50ZXhQYXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGlj
c0NvbnRleHQzRDo6VEVYVFVSRV9XUkFQX1MsIEdyYXBoaWNzQ29udGV4dDNEOjpDTEFNUF9UT19F
REdFKSk7CisgICAgR0xDKGNvbnRleHQoKSwgY29udGV4dCgpLT50ZXhQYXJhbWV0ZXJpKEdyYXBo
aWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9XUkFQ
X1QsIEdyYXBoaWNzQ29udGV4dDNEOjpDTEFNUF9UT19FREdFKSk7CiAKICAgICBpZiAocXVhZC0+
aGFzQWxwaGEoKSAmJiAhcXVhZC0+cHJlbXVsdGlwbGllZEFscGhhKCkpCiAgICAgICAgIEdMQyhj
b250ZXh0KCksIGNvbnRleHQoKS0+YmxlbmRGdW5jKEdyYXBoaWNzQ29udGV4dDNEOjpTUkNfQUxQ
SEEsIEdyYXBoaWNzQ29udGV4dDNEOjpPTkVfTUlOVVNfU1JDX0FMUEhBKSk7CkBAIC0xMDc0LDcg
KzEwNzQsNyBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd1RleHR1cmVRdWFkKGNv
bnN0IENDVGV4dHVyZURyYXdRdWFkKiBxdWFkKQogCiAgICAgZHJhd1RleHR1cmVkUXVhZChxdWFk
LT5sYXllclRyYW5zZm9ybSgpLCBib3VuZHMud2lkdGgoKSwgYm91bmRzLmhlaWdodCgpLCBxdWFk
LT5vcGFjaXR5KCksIHNoYXJlZEdlb21ldHJ5UXVhZCgpLCBtYXRyaXhMb2NhdGlvbiwgYWxwaGFM
b2NhdGlvbiwgLTEpOwogCi0gICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5ibGVu
ZEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORSwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5V
U19TUkNfQUxQSEEpKTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmJsZW5kRnVuYyhH
cmFwaGljc0NvbnRleHQzRDo6T05FLCBHcmFwaGljc0NvbnRleHQzRDo6T05FX01JTlVTX1NSQ19B
TFBIQSkpOwogCiAgICAgaWYgKHF1YWQtPmlvU3VyZmFjZVRleHR1cmVJZCgpKQogICAgICAgICBH
TEMoY29udGV4dCgpLCBjb250ZXh0KCktPmJpbmRUZXh0dXJlKEV4dGVuc2lvbnMzRDo6VEVYVFVS
RV9SRUNUQU5HTEVfQVJCLCAwKSk7CkBAIC0xMDgyLDE3ICsxMDgyLDE3IEBAIHZvaWQgTGF5ZXJS
ZW5kZXJlckNocm9taXVtOjpkcmF3VGV4dHVyZVF1YWQoY29uc3QgQ0NUZXh0dXJlRHJhd1F1YWQq
IHF1YWQpCiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3SGVhZHNVcERpc3BsYXko
TWFuYWdlZFRleHR1cmUqIGh1ZFRleHR1cmUsIGNvbnN0IEludFNpemUmIGh1ZFNpemUpCiB7Ci0g
ICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5lbmFibGUoR3JhcGhpY3NDb250ZXh0
M0Q6OkJMRU5EKSk7Ci0gICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5ibGVuZEZ1
bmMoR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORSwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19T
UkNfQUxQSEEpKTsKLSAgICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2NvbnRleHQtPmRpc2FibGUo
R3JhcGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVTVCkpOworICAgIEdMQyhtX2NvbnRleHQsIG1f
Y29udGV4dC0+ZW5hYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpCTEVORCkpOworICAgIEdMQyhtX2Nv
bnRleHQsIG1fY29udGV4dC0+YmxlbmRGdW5jKEdyYXBoaWNzQ29udGV4dDNEOjpPTkUsIEdyYXBo
aWNzQ29udGV4dDNEOjpPTkVfTUlOVVNfU1JDX0FMUEhBKSk7CisgICAgR0xDKG1fY29udGV4dCwg
bV9jb250ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09SX1RFU1QpKTsKICAg
ICB1c2VSZW5kZXJTdXJmYWNlKG1fZGVmYXVsdFJlbmRlclN1cmZhY2UpOwogCiAgICAgY29uc3Qg
Q0NIZWFkc1VwRGlzcGxheTo6UHJvZ3JhbSogcHJvZ3JhbSA9IGhlYWRzVXBEaXNwbGF5UHJvZ3Jh
bSgpOwogICAgIEFTU0VSVChwcm9ncmFtICYmIHByb2dyYW0tPmluaXRpYWxpemVkKCkpOwotICAg
IEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+YWN0aXZlVGV4dHVyZShHcmFwaGljc0Nv
bnRleHQzRDo6VEVYVFVSRTApKTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmFjdGl2
ZVRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUwKSk7CiAgICAgaHVkVGV4dHVyZS0+
YmluZFRleHR1cmUobV9jb250ZXh0LmdldCgpLCByZW5kZXJTdXJmYWNlVGV4dHVyZUFsbG9jYXRv
cigpKTsKLSAgICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2NvbnRleHQtPnVzZVByb2dyYW0ocHJv
Z3JhbS0+cHJvZ3JhbSgpKSk7Ci0gICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT51
bmlmb3JtMWkocHJvZ3JhbS0+ZnJhZ21lbnRTaGFkZXIoKS5zYW1wbGVyTG9jYXRpb24oKSwgMCkp
OworICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+dXNlUHJvZ3JhbShwcm9ncmFtLT5wcm9n
cmFtKCkpKTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPnVuaWZvcm0xaShwcm9ncmFt
LT5mcmFnbWVudFNoYWRlcigpLnNhbXBsZXJMb2NhdGlvbigpLCAwKSk7CiAKICAgICBUcmFuc2Zv
cm1hdGlvbk1hdHJpeCBtYXRyaXg7CiAgICAgbWF0cml4LnRyYW5zbGF0ZTNkKGh1ZFNpemUud2lk
dGgoKSAqIDAuNSwgaHVkU2l6ZS5oZWlnaHQoKSAqIDAuNSwgMCk7CkBAIC0xMTA0LDggKzExMDQs
OCBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0hlYWRzVXBEaXNwbGF5KE1hbmFn
ZWRUZXh0dXJlKiBodWRUZXh0dXJlLCBjb25zdAogCiB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1
bTo6ZmluaXNoRHJhd2luZ0ZyYW1lKCkKIHsKLSAgICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2Nv
bnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVTVCkpOwotICAgIEdM
QyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0NvbnRleHQzRDo6
QkxFTkQpKTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3ND
b250ZXh0M0Q6OlNDSVNTT1JfVEVTVCkpOworICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+
ZGlzYWJsZShHcmFwaGljc0NvbnRleHQzRDo6QkxFTkQpKTsKIAogICAgIHNpemVfdCBjb250ZW50
c01lbW9yeVVzZUJ5dGVzID0gbV9jb250ZW50c1RleHR1cmVBbGxvY2F0b3ItPmN1cnJlbnRNZW1v
cnlVc2VCeXRlcygpOwogICAgIHNpemVfdCByZWNsYWltTGltaXQgPSBUZXh0dXJlTWFuYWdlcjo6
cmVjbGFpbUxpbWl0Qnl0ZXModmlld3BvcnRTaXplKCkpOwpAQCAtMTMxMyw3ICsxMzEzLDcgQEAg
Ym9vbCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnVzZVJlbmRlclN1cmZhY2UoQ0NSZW5kZXJTdXJm
YWNlKiByZW5kZXJTdXJmYWNlKQogICAgIG1fY3VycmVudE1hbmFnZWRUZXh0dXJlID0gMDsKIAog
ICAgIGlmIChyZW5kZXJTdXJmYWNlID09IG1fZGVmYXVsdFJlbmRlclN1cmZhY2UpIHsKLSAgICAg
ICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5iaW5kRnJhbWVidWZmZXIoR3JhcGhp
Y3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCAwKSk7CisgICAgICAgIEdMQyhtX2NvbnRleHQsIG1f
Y29udGV4dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwg
MCkpOwogICAgICAgICBzZXREcmF3Vmlld3BvcnRSZWN0KHJlbmRlclN1cmZhY2UtPmNvbnRlbnRS
ZWN0KCksIHRydWUpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CkBAIC0xMzM0LDcgKzEz
MzQsNyBAQCBib29sIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXNlTWFuYWdlZFRleHR1cmUoTWFu
YWdlZFRleHR1cmUqIHRleHR1cmUsIGNvbnN0IEludAogCiBib29sIExheWVyUmVuZGVyZXJDaHJv
bWl1bTo6YmluZEZyYW1lYnVmZmVyVG9UZXh0dXJlKE1hbmFnZWRUZXh0dXJlKiB0ZXh0dXJlLCBj
b25zdCBJbnRSZWN0JiB2aWV3cG9ydFJlY3QpCiB7Ci0gICAgR0xDKG1fY29udGV4dC5nZXQoKSwg
bV9jb250ZXh0LT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVS
LCBtX29mZnNjcmVlbkZyYW1lYnVmZmVySWQpKTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRl
eHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIG1fb2Zm
c2NyZWVuRnJhbWVidWZmZXJJZCkpOwogCiAgICAgdGV4dHVyZS0+ZnJhbWVidWZmZXJUZXh0dXJl
MkQobV9jb250ZXh0LmdldCgpLCBtX3JlbmRlclN1cmZhY2VUZXh0dXJlQWxsb2NhdG9yLmdldCgp
KTsKIApAQCAtMTM1Niw3ICsxMzU2LDcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnNl
dFNjaXNzb3JUb1JlY3QoY29uc3QgSW50UmVjdCYgc2Npc3NvclJlY3QpCiB7CiAgICAgSW50UmVj
dCBjb250ZW50UmVjdCA9IChtX2N1cnJlbnRSZW5kZXJTdXJmYWNlID8gbV9jdXJyZW50UmVuZGVy
U3VyZmFjZS0+Y29udGVudFJlY3QoKSA6IG1fZGVmYXVsdFJlbmRlclN1cmZhY2UtPmNvbnRlbnRS
ZWN0KCkpOwogCi0gICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5lbmFibGUoR3Jh
cGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVTVCkpOworICAgIEdMQyhtX2NvbnRleHQsIG1fY29u
dGV4dC0+ZW5hYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09SX1RFU1QpKTsKIAogICAgIC8v
IFRoZSBzY2lzc29yIGNvb3JkaW5hdGVzIG11c3QgYmUgc3VwcGxpZWQgaW4gdmlld3BvcnQgc3Bh
Y2Ugc28gd2UgbmVlZCB0byBvZmZzZXQKICAgICAvLyBieSB0aGUgcmVsYXRpdmUgcG9zaXRpb24g
b2YgdGhlIHRvcCBsZWZ0IGNvcm5lciBvZiB0aGUgY3VycmVudCByZW5kZXIgc3VyZmFjZS4KQEAg
LTEzNjksNyArMTM2OSw3IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpzZXRTY2lzc29y
VG9SZWN0KGNvbnN0IEludFJlY3QmIHNjaXNzb3JSZWN0KQogICAgICAgICBzY2lzc29yWSA9IG1f
Y3VycmVudFJlbmRlclN1cmZhY2UtPmNvbnRlbnRSZWN0KCkuaGVpZ2h0KCkgLSAoc2Npc3NvclJl
Y3QubWF4WSgpIC0gbV9jdXJyZW50UmVuZGVyU3VyZmFjZS0+Y29udGVudFJlY3QoKS55KCkpOwog
ICAgIGVsc2UKICAgICAgICAgc2Npc3NvclkgPSBzY2lzc29yUmVjdC55KCkgLSBjb250ZW50UmVj
dC55KCk7Ci0gICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5zY2lzc29yKHNjaXNz
b3JYLCBzY2lzc29yWSwgc2Npc3NvclJlY3Qud2lkdGgoKSwgc2Npc3NvclJlY3QuaGVpZ2h0KCkp
KTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPnNjaXNzb3Ioc2Npc3NvclgsIHNjaXNz
b3JZLCBzY2lzc29yUmVjdC53aWR0aCgpLCBzY2lzc29yUmVjdC5oZWlnaHQoKSkpOwogfQogCiBi
b29sIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6bWFrZUNvbnRleHRDdXJyZW50KCkKQEAgLTEzODYs
NyArMTM4Niw3IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpzZXREcmF3Vmlld3BvcnRS
ZWN0KGNvbnN0IEludFJlY3QmIGRyYXdSZWN0LCBib29sIGZsCiAgICAgICAgIG1fcHJvamVjdGlv
bk1hdHJpeCA9IG9ydGhvTWF0cml4KGRyYXdSZWN0LngoKSwgZHJhd1JlY3QubWF4WCgpLCBkcmF3
UmVjdC5tYXhZKCksIGRyYXdSZWN0LnkoKSk7CiAgICAgZWxzZQogICAgICAgICBtX3Byb2plY3Rp
b25NYXRyaXggPSBvcnRob01hdHJpeChkcmF3UmVjdC54KCksIGRyYXdSZWN0Lm1heFgoKSwgZHJh
d1JlY3QueSgpLCBkcmF3UmVjdC5tYXhZKCkpOwotICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1f
Y29udGV4dC0+dmlld3BvcnQoMCwgMCwgZHJhd1JlY3Qud2lkdGgoKSwgZHJhd1JlY3QuaGVpZ2h0
KCkpKTsKKyAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPnZpZXdwb3J0KDAsIDAsIGRyYXdS
ZWN0LndpZHRoKCksIGRyYXdSZWN0LmhlaWdodCgpKSk7CiAgICAgbV93aW5kb3dNYXRyaXggPSBz
Y3JlZW5NYXRyaXgoMCwgMCwgZHJhd1JlY3Qud2lkdGgoKSwgZHJhd1JlY3QuaGVpZ2h0KCkpOwog
fQogCkBAIC0xMzk3LDcgKzEzOTcsNyBAQCBib29sIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6aW5p
dGlhbGl6ZVNoYXJlZE9iamVjdHMoKQogICAgIG1ha2VDb250ZXh0Q3VycmVudCgpOwogCiAgICAg
Ly8gQ3JlYXRlIGFuIEZCTyBmb3IgZG9pbmcgb2Zmc2NyZWVuIHJlbmRlcmluZy4KLSAgICBHTEMo
bV9jb250ZXh0LmdldCgpLCBtX29mZnNjcmVlbkZyYW1lYnVmZmVySWQgPSBtX2NvbnRleHQtPmNy
ZWF0ZUZyYW1lYnVmZmVyKCkpOworICAgIEdMQyhtX2NvbnRleHQsIG1fb2Zmc2NyZWVuRnJhbWVi
dWZmZXJJZCA9IG1fY29udGV4dC0+Y3JlYXRlRnJhbWVidWZmZXIoKSk7CiAKICAgICAvLyBXZSB3
aWxsIGFsd2F5cyBuZWVkIHRoZXNlIHByb2dyYW1zIHRvIHJlbmRlciwgc28gY3JlYXRlIHRoZSBw
cm9ncmFtcyBlYWdlcmx5IHNvIHRoYXQgdGhlIHNoYWRlciBjb21waWxhdGlvbiBjYW4KICAgICAv
LyBzdGFydCB3aGlsZSB3ZSBkbyBvdGhlciB3b3JrLiBPdGhlciBwcm9ncmFtcyBhcmUgY3JlYXRl
ZCBsYXppbHkgb24gZmlyc3QgYWNjZXNzLgpAQCAtMTQwNiw3ICsxNDA2LDcgQEAgYm9vbCBMYXll
clJlbmRlcmVyQ2hyb21pdW06OmluaXRpYWxpemVTaGFyZWRPYmplY3RzKCkKICAgICBtX3RpbGVy
UHJvZ3JhbSA9IGFkb3B0UHRyKG5ldyBDQ1RpbGVkTGF5ZXJJbXBsOjpQcm9ncmFtKG1fY29udGV4
dC5nZXQoKSkpOwogICAgIG1fdGlsZXJQcm9ncmFtT3BhcXVlID0gYWRvcHRQdHIobmV3IENDVGls
ZWRMYXllckltcGw6OlByb2dyYW1PcGFxdWUobV9jb250ZXh0LmdldCgpKSk7CiAKLSAgICBHTEMo
bV9jb250ZXh0LmdldCgpLCBtX2NvbnRleHQtPmZsdXNoKCkpOworICAgIEdMQyhtX2NvbnRleHQs
IG1fY29udGV4dC0+Zmx1c2goKSk7CiAKICAgICBtX3JlbmRlclN1cmZhY2VUZXh0dXJlTWFuYWdl
ciA9IFRleHR1cmVNYW5hZ2VyOjpjcmVhdGUoVGV4dHVyZU1hbmFnZXI6OmhpZ2hMaW1pdEJ5dGVz
KHZpZXdwb3J0U2l6ZSgpKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgVGV4dHVyZU1hbmFnZXI6OnJlY2xhaW1MaW1pdEJ5dGVzKHZp
ZXdwb3J0U2l6ZSgpKSwKQEAgLTE3MzcsNyArMTczNyw3IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNo
cm9taXVtOjpjbGVhbnVwU2hhcmVkT2JqZWN0cygpCiAgICAgbV92aWRlb0xheWVyTmF0aXZlVGV4
dHVyZVByb2dyYW0uY2xlYXIoKTsKICAgICBtX3N0cmVhbVRleHR1cmVMYXllclByb2dyYW0uY2xl
YXIoKTsKICAgICBpZiAobV9vZmZzY3JlZW5GcmFtZWJ1ZmZlcklkKQotICAgICAgICBHTEMobV9j
b250ZXh0LmdldCgpLCBtX2NvbnRleHQtPmRlbGV0ZUZyYW1lYnVmZmVyKG1fb2Zmc2NyZWVuRnJh
bWVidWZmZXJJZCkpOworICAgICAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmRlbGV0ZUZy
YW1lYnVmZmVyKG1fb2Zmc2NyZWVuRnJhbWVidWZmZXJJZCkpOwogICAgIG1fdGV4dHVyZUNvcGll
ci5jbGVhcigpOwogICAgIG1fdGV4dHVyZVVwbG9hZGVyLmNsZWFyKCk7CiAKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJD
aHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5
ZXJSZW5kZXJlckNocm9taXVtLmgKaW5kZXggNTI3ZmNkZDJiNDA5YmRkMjEzZTQyYTg5NTU4N2U0
ZTZkMDcxZmJiNy4uMzdiMTdlZGFlMGRhOGQ5N2QxZTc0ZTI0M2Q3NmFhOWQ4MTFiYWZjOCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJS
ZW5kZXJlckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
Y2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgKQEAgLTI3MCw3ICsyNzAsNyBAQCBwcml2
YXRlOgogI2RlZmluZSBERUJVR19HTF9DQUxMUyAwCiAKICNpZiBERUJVR19HTF9DQUxMUyAmJiAh
ZGVmaW5lZCAoIE5ERUJVRyApCi0jZGVmaW5lIEdMQyhjb250ZXh0LCB4KSB7ICh4KSwgTGF5ZXJS
ZW5kZXJlckNocm9taXVtOjpkZWJ1Z0dMQ2FsbChjb250ZXh0LCAjeCwgX19GSUxFX18sIF9fTElO
RV9fKTsgfQorI2RlZmluZSBHTEMoY29udGV4dCwgeCkgKHgsIExheWVyUmVuZGVyZXJDaHJvbWl1
bTo6ZGVidWdHTENhbGwoJipjb250ZXh0LCAjeCwgX19GSUxFX18sIF9fTElORV9fKSkKICNlbHNl
CiAjZGVmaW5lIEdMQyhjb250ZXh0LCB4KSAoeCkKICNlbmRpZgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>