<?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>81346</bug_id>
          
          <creation_ts>2012-03-16 06:36:48 -0700</creation_ts>
          <short_desc>Merge setVisibleContentsForScaling with setVisibleContentsRectForPanning</short_desc>
          <delta_ts>2012-03-16 06:42:55 -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>WebKit2</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="Kenneth Rohde Christiansen">kenneth</reporter>
          <assigned_to name="Kenneth Rohde Christiansen">kenneth</assigned_to>
          <cc>hausmann</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>580458</commentid>
    <comment_count>0</comment_count>
    <who name="Kenneth Rohde Christiansen">kenneth</who>
    <bug_when>2012-03-16 06:36:48 -0700</bug_when>
    <thetext>SSIA</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>580464</commentid>
    <comment_count>1</comment_count>
      <attachid>132272</attachid>
    <who name="Kenneth Rohde Christiansen">kenneth</who>
    <bug_when>2012-03-16 06:41:27 -0700</bug_when>
    <thetext>Created attachment 132272
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>580465</commentid>
    <comment_count>2</comment_count>
      <attachid>132272</attachid>
    <who name="Kenneth Rohde Christiansen">kenneth</who>
    <bug_when>2012-03-16 06:42:43 -0700</bug_when>
    <thetext>Comment on attachment 132272
Patch

Landed in 111001.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>132272</attachid>
            <date>2012-03-16 06:41:27 -0700</date>
            <delta_ts>2012-03-16 06:42:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-81346-20120316143459.patch</filename>
            <type>text/plain</type>
            <size>16662</size>
            <attacher name="Kenneth Rohde Christiansen">kenneth</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwOTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzE2YzZiZjM0ZTkzNjhh
N2E1NWE5MTlkMDkwYzI4NjZlMTg4NDRiZS4uZGUzZTRjOWZkYjZlZjMxMGY5ODg1OGVlMGU0NWM5
N2I2NzI0Y2JmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEyLTAzLTE2ICBLZW5u
ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBN
ZXJnZSBzZXRWaXNpYmxlQ29udGVudHNGb3JTY2FsaW5nIHdpdGggc2V0VmlzaWJsZUNvbnRlbnRz
UmVjdEZvclBhbm5pbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTgxMzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCisKKyAg
ICAgICAgVGhpcyBjbGVhbnMgdXAgdGhlIGNvZGUgcGF0aCBhbmQgaXMgb25lIHN0ZXAgb24gdGhl
IHdheSB0byBhdm9pZAorICAgICAgICBjYWxsaW5nIGJvdGggbWV0aG9kcyBpbiBzdWNjZXNzaW9u
LCBmb3IgaW5zdGFuY2UgYWZ0ZXIgZW5kaW5nIHBpbmNoCisgICAgICAgIHpvb20uCisKKyAgICAg
ICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNr
V2ViVmlld0xlZ2FjeVByaXZhdGU6OnVwZGF0ZVZpZXdwb3J0U2l6ZSk6CisgICAgICAgIChRUXVp
Y2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6X3FfY29tbWl0U2NhbGVDaGFuZ2UpOgorICAgICAg
ICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6Ol9xX2NvbW1pdFBvc2l0aW9uQ2hhbmdlKToKKyAgICAg
ICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpEcmF3
aW5nQXJlYVByb3h5OjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KToKKyAgICAgICAgKiBVSVByb2Nl
c3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJl
YVByb3h5SW1wbDo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCk6CisgICAgICAgICogVUlQcm9jZXNz
L0RyYXdpbmdBcmVhUHJveHlJbXBsLmg6CisgICAgICAgIChEcmF3aW5nQXJlYVByb3h5SW1wbCk6
CisgICAgICAgICogVUlQcm9jZXNzL0xheWVyVHJlZUhvc3RQcm94eS5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OkxheWVyVHJlZUhvc3RQcm94eTo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCk6CisgICAg
ICAgICogVUlQcm9jZXNzL0xheWVyVHJlZUhvc3RQcm94eS5oOgorICAgICAgICAoTGF5ZXJUcmVl
SG9zdFByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViTGF5ZXJUcmVlUmVuZGVyZXIuY3Bw
OgorICAgICAgICAoV2ViS2l0OjpXZWJMYXllclRyZWVSZW5kZXJlcjo6c2V0VmlzaWJsZUNvbnRl
bnRzUmVjdCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkxheWVyVHJlZVJlbmRlcmVyLmg6Cisg
ICAgICAgIChXZWJMYXllclRyZWVSZW5kZXJlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ
YWdlL0xheWVyVHJlZUhvc3QuaDoKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdDo6c2V0
VmlzaWJsZUNvbnRlbnRzUmVjdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVy
VHJlZUhvc3QubWVzc2FnZXMuaW46CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xh
eWVyVHJlZUhvc3RRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RRdDo6c2V0
VmlzaWJsZUNvbnRlbnRzUmVjdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xh
eWVyVHJlZUhvc3RRdC5oOgorICAgICAgICAoTGF5ZXJUcmVlSG9zdFF0KToKKwogMjAxMi0wMy0x
NiAgWW91bmdUYWVjayBTb25nICA8eW91bmd0YWVjay5zb25nQHNhbXN1bmcuY29tPgogCiAgICAg
ICAgIFtFRkxdW1dLMl0gQWRkIFByb2Nlc3NMYXVuY2hlckVmbC5jcHAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgYi9Tb3VyY2Uv
V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4IGVlMWFiZjQ4
Y2RjOGMwZmVkODI2MzgwMmZjZTg3YmY3YjU2ZmNlNTYuLjYzOTFlNDk2ZTQzZWVmNThjMjk4M2Q1
NTgxMmMxMTIwMTJlNzg0OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B
UEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ
SS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtNTA2LDcgKzUwNiw3IEBAIHZvaWQgUVF1aWNrV2Vi
Vmlld0xlZ2FjeVByaXZhdGU6OnVwZGF0ZVZpZXdwb3J0U2l6ZSgpCiAgICAgLy8gVGhlIGZpeGVk
IGxheW91dCBpcyBoYW5kbGVkIGJ5IHRoZSBGcmFtZVZpZXcgYW5kIHRoZSBkcmF3aW5nIGFyZWEg
ZG9lc24ndCBiZWhhdmUgZGlmZmVyZW50bHkKICAgICAvLyB3aGV0aGVyIGl0cyBmaXhlZCBvciBu
b3QuIFdlIHN0aWxsIG5lZWQgdG8gdGVsbCB0aGUgZHJhd2luZyBhcmVhIHdoaWNoIHBhcnQgb2Yg
aXQKICAgICAvLyBoYXMgdG8gYmUgcmVuZGVyZWQgb24gdGlsZXMsIGFuZCBpbiBkZXNrdG9wIG1v
ZGUgaXQncyBhbGwgb2YgaXQuCi0gICAgd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5zZXRW
aXNpYmxlQ29udGVudHNSZWN0Rm9yU2NhbGluZyhJbnRSZWN0KEludFBvaW50KCksIHZpZXdwb3J0
U2l6ZSksIDEpOworICAgIHdlYlBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKS0+c2V0VmlzaWJsZUNv
bnRlbnRzUmVjdChJbnRSZWN0KEludFBvaW50KCksIHZpZXdwb3J0U2l6ZSksIDEsIEZsb2F0UG9p
bnQoKSk7CiB9CiAKIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpRUXVpY2tXZWJWaWV3
RmxpY2thYmxlUHJpdmF0ZShRUXVpY2tXZWJWaWV3KiB2aWV3cG9ydCkKQEAgLTY1Nyw3ICs2NTcs
NyBAQCB2b2lkIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpfcV9jb21taXRTY2FsZUNo
YW5nZSgpCiAgICAgY29uc3QgUVJlY3QgdmlzaWJsZVJlY3QodmlzaWJsZUNvbnRlbnRzUmVjdCgp
KTsKICAgICBmbG9hdCBzY2FsZSA9IHBhZ2VWaWV3LT5jb250ZW50c1NjYWxlKCk7CiAKLSAgICBk
cmF3aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdEZvclNjYWxpbmcodmlzaWJsZVJlY3Qs
IHNjYWxlKTsKKyAgICBkcmF3aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2aXNpYmxl
UmVjdCwgc2NhbGUsIEZsb2F0UG9pbnQoKSk7CiAgICAgd2ViUGFnZVByb3h5LT5zZXRGaXhlZFZp
c2libGVDb250ZW50UmVjdCh2aXNpYmxlUmVjdCk7CiB9CiAKQEAgLTY2OCwxMSArNjY4LDkgQEAg
dm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6X3FfY29tbWl0UG9zaXRpb25DaGFuZ2UoY29uc3Qg
UVBvaW50RiYgdHJhamVjdG9yeVZlY3QKICAgICAgICAgcmV0dXJuOwogCiAgICAgY29uc3QgUVJl
Y3QgdmlzaWJsZVJlY3QodmlzaWJsZUNvbnRlbnRzUmVjdCgpKTsKLSAgICBkcmF3aW5nQXJlYS0+
c2V0VmlzaWJsZUNvbnRlbnRzUmVjdEZvclBhbm5pbmcodmlzaWJsZVJlY3QsIHRyYWplY3RvcnlW
ZWN0b3IpOwotCi0gICAgaWYgKCF0cmFqZWN0b3J5VmVjdG9yLmlzTnVsbCgpKQotICAgICAgICBy
ZXR1cm47CisgICAgZmxvYXQgc2NhbGUgPSBwYWdlVmlldy0+Y29udGVudHNTY2FsZSgpOwogCisg
ICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJsZVJlY3QsIHNjYWxl
LCB0cmFqZWN0b3J5VmVjdG9yKTsKICAgICB3ZWJQYWdlUHJveHktPnNldEZpeGVkVmlzaWJsZUNv
bnRlbnRSZWN0KHZpc2libGVSZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv
VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9E
cmF3aW5nQXJlYVByb3h5LmgKaW5kZXggOGI4ZGMyYjBkOTAwYTc1Y2E1MDdmMDcxMWQyOWU0M2Iw
ZjIwZTg4MS4uOGY3OTMwY2ZjZjNlOWZlM2U3YTY2NTJmZDQzYzZkYjc4YmQyMmZlOCAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAorKysgYi9T
b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCkBAIC05Myw4ICs5Myw3
IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRUb0N1cnJlbnRHTENvbnRleHQoY29u
c3QgV2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmLCBmbG9hdCwgY29uc3QgV2ViQ29yZTo6
RmxvYXRSZWN0JikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHBhaW50TGF5ZXJUcmVlKEJhY2tpbmdT
dG9yZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQpIHsgfQogICAgIExheWVyVHJlZUhvc3RQcm94
eSogbGF5ZXJUcmVlSG9zdFByb3h5KCkgY29uc3QgeyByZXR1cm4gbV9sYXllclRyZWVIb3N0UHJv
eHkuZ2V0KCk7IH0KLSAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdEZvclNj
YWxpbmcoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdmlzaWJsZUNvbnRlbnRzUmVjdCwgZmxvYXQg
c2NhbGUpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0Rm9yUGFu
bmluZyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBjb25zdCBX
ZWJDb3JlOjpGbG9hdFBvaW50JiB0cmFqZWN0b3J5VmVjdG9yKSB7IH0KKyAgICB2aXJ0dWFsIHZv
aWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxl
Q29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJh
amVjdG9yeVZlY3RvcikgeyB9CiAgICAgdmlydHVhbCB2b2lkIGNyZWF0ZVRpbGVGb3JMYXllcihp
bnQgbGF5ZXJJRCwgaW50IHRpbGVJRCwgY29uc3QgV2ViS2l0OjpVcGRhdGVJbmZvJikgeyB9CiAg
ICAgdmlydHVhbCB2b2lkIHVwZGF0ZVRpbGVGb3JMYXllcihpbnQgbGF5ZXJJRCwgaW50IHRpbGVJ
RCwgY29uc3QgV2ViS2l0OjpVcGRhdGVJbmZvJikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlbW92
ZVRpbGVGb3JMYXllcihpbnQgbGF5ZXJJRCwgaW50IHRpbGVJRCkgeyB9CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwIGIvU291cmNl
L1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAppbmRleCBjMGQwNDRi
Zjg5MmEzYWY1MjM1MjNjNzQzNDU4MzBhMzlhMDViYWJkLi42ZWRmNGFiNGE4OTFiOTBiYmM3YTUy
YTU4ZTNiYTJjZTYwYTU3MjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv
RHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9E
cmF3aW5nQXJlYVByb3h5SW1wbC5jcHAKQEAgLTM0OCwxNiArMzQ4LDEwIEBAIHZvaWQgRHJhd2lu
Z0FyZWFQcm94eUltcGw6OmRpZFJlY2VpdmVMYXllclRyZWVIb3N0UHJveHlNZXNzYWdlKENvcmVJ
UEM6OkNvbm5lY3RpCiAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdFByb3h5LT5kaWRSZWNlaXZlTGF5
ZXJUcmVlSG9zdFByb3h5TWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGFyZ3VtZW50cyk7
CiB9CiAKLXZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnNldFZpc2libGVDb250ZW50c1JlY3RG
b3JTY2FsaW5nKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpc2libGVDb250ZW50c1JlY3QsIGZs
b2F0IHNjYWxlKQordm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2V0VmlzaWJsZUNvbnRlbnRz
UmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBz
Y2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvcikKIHsKICAg
ICBpZiAobV9sYXllclRyZWVIb3N0UHJveHkpCi0gICAgICAgIG1fbGF5ZXJUcmVlSG9zdFByb3h5
LT5zZXRWaXNpYmxlQ29udGVudHNSZWN0Rm9yU2NhbGluZyh2aXNpYmxlQ29udGVudHNSZWN0LCBz
Y2FsZSk7Ci19Ci0KLXZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnNldFZpc2libGVDb250ZW50
c1JlY3RGb3JQYW5uaW5nKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpc2libGVDb250ZW50c1Jl
Y3QsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHRyYWplY3RvcnlWZWN0b3IpCi17Ci0gICAg
aWYgKG1fbGF5ZXJUcmVlSG9zdFByb3h5KQotICAgICAgICBtX2xheWVyVHJlZUhvc3RQcm94eS0+
c2V0VmlzaWJsZUNvbnRlbnRzUmVjdEZvclBhbm5pbmcodmlzaWJsZUNvbnRlbnRzUmVjdCwgdHJh
amVjdG9yeVZlY3Rvcik7CisgICAgICAgIG1fbGF5ZXJUcmVlSG9zdFByb3h5LT5zZXRWaXNpYmxl
Q29udGVudHNSZWN0KHZpc2libGVDb250ZW50c1JlY3QsIHNjYWxlLCB0cmFqZWN0b3J5VmVjdG9y
KTsKIH0KIAogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6cGFpbnRMYXllclRyZWUoQmFja2lu
Z1N0b3JlOjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCBjb250ZXh0KQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmggYi9Tb3VyY2UvV2Vi
S2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaAppbmRleCA2MTMwNzNiYWJiYWM1
MDIyNWVhMDFkOTljOGQyNWMyOTE1NmFiOTU0Li4yZDU3NDE3YTA5MGQ3NjcwNzViY2VmYWFlZmQx
OWJkYTU2ZDk0MDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2lu
Z0FyZWFQcm94eUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0Fy
ZWFQcm94eUltcGwuaApAQCAtNzgsOCArNzgsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNJbkFj
Y2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkgY29uc3QgeyByZXR1cm4gIW1fbGF5ZXJUcmVlQ29u
dGV4dC5pc0VtcHR5KCk7IH0KIAogI2lmIFVTRShVSV9TSURFX0NPTVBPU0lUSU5HKQotICAgIHZp
cnR1YWwgdm9pZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0Rm9yU2NhbGluZyhjb25zdCBXZWJDb3Jl
OjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSk7Ci0gICAgdmlydHVh
bCB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3RGb3JQYW5uaW5nKGNvbnN0IFdlYkNvcmU6Oklu
dFJlY3QmIHZpc2libGVDb250ZW50c1JlY3QsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmKTsK
KyAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBXZWJDb3JlOjpJ
bnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6
RmxvYXRQb2ludCYgdHJhamVjdG9yeSk7CiAgICAgdmlydHVhbCB2b2lkIHBhaW50VG9DdXJyZW50
R0xDb250ZXh0KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4JiwgZmxvYXQgb3Bh
Y2l0eSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHBhaW50
TGF5ZXJUcmVlKEJhY2tpbmdTdG9yZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQpOwogICAgIHZv
aWQgZGlkUmVjZWl2ZUxheWVyVHJlZUhvc3RQcm94eU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlv
biosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJUcmVlSG9zdFByb3h5LmNwcCBi
L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXllclRyZWVIb3N0UHJveHkuY3BwCmluZGV4IGU3
NjBhN2RhZWY5ODJmYWYyMzFiNDY5YWU1YmEwZTQyODgxNzY5Y2MuLjAwNGM5NTFmYjgzNGNlNGM0
ZWRhN2I0OTFjZDIyMTFjMTk3OWU2ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv
Y2Vzcy9MYXllclRyZWVIb3N0UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz
cy9MYXllclRyZWVIb3N0UHJveHkuY3BwCkBAIC0xMTgsMTUgKzExOCwxMCBAQCB2b2lkIExheWVy
VHJlZUhvc3RQcm94eTo6ZGVzdHJveURpcmVjdGx5Q29tcG9zaXRlZEltYWdlKGludDY0X3Qga2V5
KQogICAgIGRpc3BhdGNoVXBkYXRlKGJpbmQoJldlYkxheWVyVHJlZVJlbmRlcmVyOjpkZXN0cm95
SW1hZ2UsIG1fcmVuZGVyZXIuZ2V0KCksIGtleSkpOwogfQogCi12b2lkIExheWVyVHJlZUhvc3RQ
cm94eTo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdEZvclBhbm5pbmcoY29uc3QgSW50UmVjdCYgcmVj
dCwgY29uc3QgRmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvcikKK3ZvaWQgTGF5ZXJUcmVlSG9z
dFByb3h5OjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QsIGZsb2F0
IHNjYWxlLCBjb25zdCBGbG9hdFBvaW50JiB0cmFqZWN0b3J5VmVjdG9yKQogewotICAgIG1fZHJh
d2luZ0FyZWFQcm94eS0+cGFnZSgpLT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OkxheWVyVHJl
ZUhvc3Q6OlNldFZpc2libGVDb250ZW50c1JlY3RGb3JQYW5uaW5nKHJlY3QsIHRyYWplY3RvcnlW
ZWN0b3IpLCBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2UoKS0+cGFnZUlEKCkpOwotfQotCi12b2lk
IExheWVyVHJlZUhvc3RQcm94eTo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdEZvclNjYWxpbmcoY29u
c3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgc2NhbGUpCi17Ci0gICAgbV9yZW5kZXJlci0+c2V0Vmlz
aWJsZUNvbnRlbnRzUmVjdEZvclNjYWxpbmcocmVjdCwgc2NhbGUpOwotICAgIG1fZHJhd2luZ0Fy
ZWFQcm94eS0+cGFnZSgpLT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OkxheWVyVHJlZUhvc3Q6
OlNldFZpc2libGVDb250ZW50c1JlY3RGb3JTY2FsaW5nKHJlY3QsIHNjYWxlKSwgbV9kcmF3aW5n
QXJlYVByb3h5LT5wYWdlKCktPnBhZ2VJRCgpKTsKKyAgICBtX3JlbmRlcmVyLT5zZXRWaXNpYmxl
Q29udGVudHNSZWN0KHJlY3QsIHNjYWxlKTsKKyAgICBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2Uo
KS0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpMYXllclRyZWVIb3N0OjpTZXRWaXNpYmxlQ29u
dGVudHNSZWN0KHJlY3QsIHNjYWxlLCB0cmFqZWN0b3J5VmVjdG9yKSwgbV9kcmF3aW5nQXJlYVBy
b3h5LT5wYWdlKCktPnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBMYXllclRyZWVIb3N0UHJveHk6OnJl
bmRlck5leHRGcmFtZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5
ZXJUcmVlSG9zdFByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJUcmVlSG9z
dFByb3h5LmgKaW5kZXggZjZjMzFkMWJjN2FmNzQxMTJmMDBjOWE3NzI0ZTRkZDFlYzMyZGQ1Zi4u
MjU4N2MxZjIxYTliZmZkYjhmMjYxMjgyOGRhNGIzNjRjYzU0YTQ5ZiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xheWVyVHJlZUhvc3RQcm94eS5oCisrKyBiL1NvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9MYXllclRyZWVIb3N0UHJveHkuaApAQCAtNTQsOCArNTQsNyBAQCBw
dWJsaWM6CiAgICAgdm9pZCBwYWludFRvQ3VycmVudEdMQ29udGV4dChjb25zdCBXZWJDb3JlOjpU
cmFuc2Zvcm1hdGlvbk1hdHJpeCYsIGZsb2F0IG9wYWNpdHksIGNvbnN0IFdlYkNvcmU6OkZsb2F0
UmVjdCYgY2xpcCk7CiAgICAgdm9pZCBwYWludFRvR3JhcGhpY3NDb250ZXh0KEJhY2tpbmdTdG9y
ZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQpOwogICAgIHZvaWQgcHVyZ2VHTFJlc291cmNlcygp
OwotICAgIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdEZvclNjYWxpbmcoY29uc3QgV2ViQ29y
ZTo6SW50UmVjdCYsIGZsb2F0KTsKLSAgICB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3RGb3JQ
YW5uaW5nKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50
Jik7CisgICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJl
Y3QmLCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeSk7
CiAgICAgdm9pZCBkaWRSZW5kZXJGcmFtZSgpOwogICAgIHZvaWQgY3JlYXRlVGlsZUZvckxheWVy
KGludCBsYXllcklELCBpbnQgdGlsZUlELCBjb25zdCBXZWJLaXQ6OlVwZGF0ZUluZm8mKTsKICAg
ICB2b2lkIHVwZGF0ZVRpbGVGb3JMYXllcihpbnQgbGF5ZXJJRCwgaW50IHRpbGVJRCwgY29uc3Qg
V2ViS2l0OjpVcGRhdGVJbmZvJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl
c3MvV2ViTGF5ZXJUcmVlUmVuZGVyZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl
YkxheWVyVHJlZVJlbmRlcmVyLmNwcAppbmRleCBmMmMwNDk1OTI0ZmFlNGU2NGU3YjY4NjViMDcy
ZjgwZjQ5NThmNGJmLi4yMDIyOWYzNzg2OGI3ZDM1NjcyNWRlOWEwZWE1ZGQ3ZWMxMTg5Y2ExIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTGF5ZXJUcmVlUmVuZGVyZXIu
Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMYXllclRyZWVSZW5kZXJlci5j
cHAKQEAgLTE1NSw3ICsxNTUsNyBAQCB2b2lkIFdlYkxheWVyVHJlZVJlbmRlcmVyOjpwYWludFRv
R3JhcGhpY3NDb250ZXh0KFFQYWludGVyKiBwYWludGVyKQogICAgIG1fdGV4dHVyZU1hcHBlci0+
c2V0R3JhcGhpY3NDb250ZXh0KDApOwogfQogCi12b2lkIFdlYkxheWVyVHJlZVJlbmRlcmVyOjpz
ZXRWaXNpYmxlQ29udGVudHNSZWN0Rm9yU2NhbGluZyhjb25zdCBJbnRSZWN0JiByZWN0LCBmbG9h
dCBzY2FsZSkKK3ZvaWQgV2ViTGF5ZXJUcmVlUmVuZGVyZXI6OnNldFZpc2libGVDb250ZW50c1Jl
Y3QoY29uc3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgc2NhbGUpCiB7CiAgICAgbV92aXNpYmxlQ29u
dGVudHNSZWN0ID0gcmVjdDsKICAgICBtX2NvbnRlbnRzU2NhbGUgPSBzY2FsZTsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMYXllclRyZWVSZW5kZXJlci5oIGIvU291
cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxheWVyVHJlZVJlbmRlcmVyLmgKaW5kZXggNmM3ODg2
NTJhOWViYTBiZWU2N2JlMzM2ZTcwMDQ5ZDFmZDJhZjhkZC4uZjI1ODQ4OTJkYThjNmQ2ZmMzNDMx
NGM0YjQzMDdlYmY2MjY1MDcwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz
L1dlYkxheWVyVHJlZVJlbmRlcmVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl
YkxheWVyVHJlZVJlbmRlcmVyLmgKQEAgLTUxLDcgKzUxLDcgQEAgcHVibGljOgogICAgIHZvaWQg
cGFpbnRUb0N1cnJlbnRHTENvbnRleHQoY29uc3QgV2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRy
aXgmLCBmbG9hdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0Jik7CiAgICAgdm9pZCBwYWludFRv
R3JhcGhpY3NDb250ZXh0KEJhY2tpbmdTdG9yZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQpOwog
ICAgIHZvaWQgc3luY1JlbW90ZUNvbnRlbnQoKTsKLSAgICB2b2lkIHNldFZpc2libGVDb250ZW50
c1JlY3RGb3JTY2FsaW5nKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBmbG9hdCk7CisgICAgdm9p
ZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBmbG9hdCBz
Y2FsZSk7CiAKICAgICB2b2lkIGRldGFjaCgpOwogICAgIHZvaWQgYXBwZW5kVXBkYXRlKGNvbnN0
IEZ1bmN0aW9uPHZvaWQoKT4mKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl
c3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl
YlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCmluZGV4IDZmMzM2YTVjZDZhMjE0MThhY2M0NDA3Y2M3OWNi
NzJmNzBmNmZlMmIuLjAzNDllMjRlNzFjYWM5MmFlYTYxODQ0MDZhNzZhYzc1ZDg0ZDc3MzMgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0
LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3Qu
aApAQCAtODAsOCArODAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHJlc3VtZVJlbmRl
cmluZygpIHsgfQogCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCi0gICAgdmlydHVhbCB2
b2lkIHNldFZpc2libGVDb250ZW50c1JlY3RGb3JTY2FsaW5nKGNvbnN0IFdlYkNvcmU6OkludFJl
Y3QmLCBmbG9hdCBzY2FsZSkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIHNldFZpc2libGVDb250ZW50
c1JlY3RGb3JQYW5uaW5nKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBjb25zdCBXZWJDb3JlOjpG
bG9hdFBvaW50JikgeyB9CisgICAgdmlydHVhbCB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3Qo
Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIGZsb2F0IHNjYWxlLCBjb25zdCBXZWJDb3JlOjpGbG9h
dFBvaW50JikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3RGb3JM
YXllcihpbnQgbGF5ZXJJRCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIHsgfQogICAgIHZpcnR1
YWwgdm9pZCByZW5kZXJOZXh0RnJhbWUoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcHVyZ2VCYWNr
aW5nU3RvcmVzKCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl
YlBhZ2UvTGF5ZXJUcmVlSG9zdC5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl
c3MvV2ViUGFnZS9MYXllclRyZWVIb3N0Lm1lc3NhZ2VzLmluCmluZGV4IDcwZmE4NTg0MTAyZjhl
MjdkYWNjYzFjZDM2NmY4YmZlMWY4NWRmM2YuLjg5MjBkZTI3ZjI4YjkyOWUxNTdlZjRhY2MzMTk2
YzNkOTQ4ZTQ4YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn
ZS9MYXllclRyZWVIb3N0Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl
c3MvV2ViUGFnZS9MYXllclRyZWVIb3N0Lm1lc3NhZ2VzLmluCkBAIC0yMCw4ICsyMCw3IEBACiAK
ICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKIG1lc3NhZ2VzIC0+IExheWVyVHJlZUhvc3Qg
ewotICAgIFNldFZpc2libGVDb250ZW50c1JlY3RGb3JQYW5uaW5nKFdlYkNvcmU6OkludFJlY3Qg
dmlzaWJsZUNvbnRlbnRzUmVjdCwgV2ViQ29yZTo6RmxvYXRQb2ludCB0cmFqZWN0b3J5VmVjdG9y
eSkKLSAgICBTZXRWaXNpYmxlQ29udGVudHNSZWN0Rm9yU2NhbGluZyhXZWJDb3JlOjpJbnRSZWN0
IHZpc2libGVDb250ZW50c1JlY3QsIGZsb2F0IHNjYWxlKQorICAgIFNldFZpc2libGVDb250ZW50
c1JlY3QoV2ViQ29yZTo6SW50UmVjdCB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwg
V2ViQ29yZTo6RmxvYXRQb2ludCB0cmFqZWN0b3J5VmVjdG9yeSkKICAgICBSZW5kZXJOZXh0RnJh
bWUoKQogICAgIFB1cmdlQmFja2luZ1N0b3JlcygpCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmNwcCBiL1NvdXJjZS9X
ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuY3BwCmluZGV4IDIx
Mzc0MzAwM2I3ZjJkY2MzMzA0YjkwMTlmZTdhYTdmZWQ4MjlkMTguLjQ2OGE1ZTVjNGU3MTcxYjQ5
NDY3NDEyZmMxNmRiZGM1OGI0NTVmYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy
b2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy
L1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuY3BwCkBAIC00MTUsMjQgKzQx
NSwyNiBAQCBXZWJDb3JlOjpJbnRSZWN0IExheWVyVHJlZUhvc3RRdDo6dmlzaWJsZUNvbnRlbnRz
UmVjdCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fdmlzaWJsZUNvbnRlbnRzUmVjdDsKIH0KIAotdm9p
ZCBMYXllclRyZWVIb3N0UXQ6OnNldFZpc2libGVDb250ZW50c1JlY3RGb3JTY2FsaW5nKGNvbnN0
IEludFJlY3QmIHJlY3QsIGZsb2F0IHNjYWxlKQordm9pZCBMYXllclRyZWVIb3N0UXQ6OnNldFZp
c2libGVDb250ZW50c1JlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgc2NhbGUsIGNvbnN0
IEZsb2F0UG9pbnQmIHRyYWplY3RvcnlWZWN0b3IpCiB7Ci0gICAgbV92aXNpYmxlQ29udGVudHNS
ZWN0ID0gcmVjdDsKLSAgICBtX2NvbnRlbnRzU2NhbGUgPSBzY2FsZTsKKyAgICBib29sIGNvbnRl
bnRzUmVjdERpZENoYW5nZSA9IHJlY3QgIT0gbV92aXNpYmxlQ29udGVudHNSZWN0OworICAgIGJv
b2wgY29udGVudHNTY2FsZURpZENoYW5nZSA9IHNjYWxlICE9IG1fY29udGVudHNTY2FsZTsKIAot
ICAgIEhhc2hTZXQ8V2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcio+OjppdGVyYXRvciBlbmQgPSBt
X3JlZ2lzdGVyZWRMYXllcnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoU2V0PFdlYkNvcmU6OldlYkdy
YXBoaWNzTGF5ZXIqPjo6aXRlcmF0b3IgaXQgPSBtX3JlZ2lzdGVyZWRMYXllcnMuYmVnaW4oKTsg
aXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgICgqaXQpLT5zZXRDb250ZW50c1NjYWxlKHNjYWxl
KTsKLSAgICAgICAgKCppdCktPmFkanVzdFZpc2libGVSZWN0KCk7Ci0gICAgfQotICAgIHNjaGVk
dWxlTGF5ZXJGbHVzaCgpOwotfQorICAgIGlmICh0cmFqZWN0b3J5VmVjdG9yICE9IEZsb2F0UG9p
bnQ6Onplcm8oKSkKKyAgICAgICAgdG9XZWJHcmFwaGljc0xheWVyKG1fbm9uQ29tcG9zaXRlZENv
bnRlbnRMYXllci5nZXQoKSktPnNldFZpc2libGVDb250ZW50UmVjdFRyYWplY3RvcnlWZWN0b3Io
dHJhamVjdG9yeVZlY3Rvcik7CiAKLXZvaWQgTGF5ZXJUcmVlSG9zdFF0OjpzZXRWaXNpYmxlQ29u
dGVudHNSZWN0Rm9yUGFubmluZyhjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBGbG9hdFBvaW50
JiB0cmFqZWN0b3J5VmVjdG9yKQotewotICAgIG1fdmlzaWJsZUNvbnRlbnRzUmVjdCA9IHJlY3Q7
CisgICAgaWYgKGNvbnRlbnRzUmVjdERpZENoYW5nZSB8fCBjb250ZW50c1NjYWxlRGlkQ2hhbmdl
KSB7CisgICAgICAgIG1fdmlzaWJsZUNvbnRlbnRzUmVjdCA9IHJlY3Q7CisgICAgICAgIG1fY29u
dGVudHNTY2FsZSA9IHNjYWxlOwogCi0gICAgdG9XZWJHcmFwaGljc0xheWVyKG1fbm9uQ29tcG9z
aXRlZENvbnRlbnRMYXllci5nZXQoKSktPnNldFZpc2libGVDb250ZW50UmVjdFRyYWplY3RvcnlW
ZWN0b3IodHJhamVjdG9yeVZlY3Rvcik7CisgICAgICAgIEhhc2hTZXQ8V2ViQ29yZTo6V2ViR3Jh
cGhpY3NMYXllcio+OjppdGVyYXRvciBlbmQgPSBtX3JlZ2lzdGVyZWRMYXllcnMuZW5kKCk7Cisg
ICAgICAgIGZvciAoSGFzaFNldDxXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyKj46Oml0ZXJhdG9y
IGl0ID0gbV9yZWdpc3RlcmVkTGF5ZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAg
ICAgICAgICAgaWYgKGNvbnRlbnRzU2NhbGVEaWRDaGFuZ2UpCisgICAgICAgICAgICAgICAgKCpp
dCktPnNldENvbnRlbnRzU2NhbGUoc2NhbGUpOworICAgICAgICAgICAgaWYgKGNvbnRlbnRzUmVj
dERpZENoYW5nZSkKKyAgICAgICAgICAgICAgICAoKml0KS0+YWRqdXN0VmlzaWJsZVJlY3QoKTsK
KyAgICAgICAgfQorICAgIH0KIAogICAgIHNjaGVkdWxlTGF5ZXJGbHVzaCgpOwogfQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhvc3RR
dC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhvc3RR
dC5oCmluZGV4IDlkYjg1Yjc4ZDY1MzMwZWU1NTQ1Nzg3MmRkZDgwNTkzYTkzYjBjYzQuLjA4ZjBl
NjRiNzRiM2QxM2RjMWY0YmI2Zjc1YmJiNDFlZmZmMDU1OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuaAorKysgYi9Tb3Vy
Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmgKQEAgLTcw
LDggKzcwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCByZW5kZXJOZXh0RnJhbWUoKTsK
ICAgICB2aXJ0dWFsIHZvaWQgcHVyZ2VCYWNraW5nU3RvcmVzKCk7CiAgICAgdmlydHVhbCBib29s
IGxheWVyVHJlZVRpbGVVcGRhdGVzQWxsb3dlZCgpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBz
ZXRWaXNpYmxlQ29udGVudHNSZWN0Rm9yU2NhbGluZyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jiwg
ZmxvYXQgc2NhbGUpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0Rm9y
UGFubmluZyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2lu
dCYpOworICAgIHZpcnR1YWwgdm9pZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNv
cmU6OkludFJlY3QmLCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYpOwog
ICAgIHZpcnR1YWwgdm9pZCBkaWRTeW5jQ29tcG9zaXRpbmdTdGF0ZUZvckxheWVyKGNvbnN0IFdl
YkxheWVySW5mbyYpOwogICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hMYXllcihXZWJDb3JlOjpXZWJH
cmFwaGljc0xheWVyKik7CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaExheWVyKFdlYkNvcmU6Oldl
YkdyYXBoaWNzTGF5ZXIqKTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>