<?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>33455</bug_id>
          
          <creation_ts>2010-01-10 17:22:08 -0800</creation_ts>
          <short_desc>Allows plugins to participate in accelerated compositing</short_desc>
          <delta_ts>2010-01-11 16:16:12 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Layout and Rendering</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Mac</rep_platform>
          <op_sys>OS X 10.5</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="Simon Fraser (smfr)">simon.fraser</reporter>
          <assigned_to name="Simon Fraser (smfr)">simon.fraser</assigned_to>
          <cc>abarth</cc>
    
    <cc>eric</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>179202</commentid>
    <comment_count>0</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2010-01-10 17:22:08 -0800</bug_when>
    <thetext>Plugins that support the Core Animation rendering model should be able to integrate into the WebCore accelerated compositing mode.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>179203</commentid>
    <comment_count>1</comment_count>
      <attachid>46248</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2010-01-10 17:24:15 -0800</bug_when>
    <thetext>Created attachment 46248
Part 1 patch: some preparatory renaming</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>179205</commentid>
    <comment_count>2</comment_count>
      <attachid>46248</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2010-01-10 17:34:23 -0800</bug_when>
    <thetext>Comment on attachment 46248
Part 1 patch: some preparatory renaming

&gt; -            videoGraphicsLayer-&gt;setContentsToVideo((PlatformLayer *)m_qtVideoLayer.get());
&gt; +            videoGraphicsLayer-&gt;setContentsToMedia((PlatformLayer *)m_qtVideoLayer.get());

&gt; -            videoGraphicsLayer-&gt;setContentsToVideo((PlatformLayer *)m_qtVideoLayer.get());
&gt; +            videoGraphicsLayer-&gt;setContentsToMedia((PlatformLayer *)m_qtVideoLayer.get());

C++ style cast instead?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>179230</commentid>
    <comment_count>3</comment_count>
      <attachid>46248</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2010-01-10 19:48:06 -0800</bug_when>
    <thetext>Comment on attachment 46248
Part 1 patch: some preparatory renaming

http://trac.webkit.org/changeset/53059</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>179564</commentid>
    <comment_count>4</comment_count>
      <attachid>46312</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2010-01-11 15:04:42 -0800</bug_when>
    <thetext>Created attachment 46312
Main patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>179581</commentid>
    <comment_count>5</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2010-01-11 15:43:04 -0800</bug_when>
    <thetext>Maybe Adam knows why all the bubbles are red here?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>179583</commentid>
    <comment_count>6</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2010-01-11 15:45:17 -0800</bug_when>
    <thetext>Never mind, looks like the patch just failed to apply, which is why it&apos;s red everywhere.  I think Adam was going to change that to purple at some point.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>179584</commentid>
    <comment_count>7</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2010-01-11 15:46:13 -0800</bug_when>
    <thetext>I think it doesn&apos;t like that my patch is missing the base64-encoded PNG images.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>179602</commentid>
    <comment_count>8</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2010-01-11 16:16:12 -0800</bug_when>
    <thetext>http://trac.webkit.org/changeset/53110</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>46248</attachid>
            <date>2010-01-10 17:24:15 -0800</date>
            <delta_ts>2010-01-10 23:14:16 -0800</delta_ts>
            <desc>Part 1 patch: some preparatory renaming</desc>
            <filename>33455_patch.txt</filename>
            <type>text/plain</type>
            <size>6524</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg
YTQ2MzA5MC4uMDYxMzRlYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi
Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wMS0xMCAgU2ltb24gRnJhc2Vy
ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBBbGxvd3MgcGx1Z2lucyB0byBwYXJ0aWNpcGF0ZSBpbiBhY2Nl
bGVyYXRlZCBjb21wb3NpdGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MzM0NTUKKworICAgICAgICBQYXJ0IDE6IHJlbmFtZSBzZXRDb250ZW50c1Rv
VmlkZW8oKSBvbiBHcmFwaGljc0xheWVyIHRvIHNldENvbnRlbnRzVG9NZWRpYSgpCisgICAgICAg
IHRvIG1ha2UgaXQgbW9yZSBnZW5lcmFsLiBSZW5hbWUgYXNzb2NpYXRlZCBlbnVtcyBhbmQgbWV0
aG9kcyBzaW1pbGFybHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xh
eWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpzZXRDb250ZW50c1RvTWVk
aWEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0xheWVyQ0EuaDoK
KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6KToKKyAgICAgICAgKiBwbGF0Zm9y
bS9ncmFwaGljcy9tYWMvR3JhcGhpY3NMYXllckNBLm1tOgorICAgICAgICAoV2ViQ29yZTo6R3Jh
cGhpY3NMYXllckNBOjpzZXRDb250ZW50c1RvTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6R3Jh
cGhpY3NMYXllckNBOjpjb21taXRMYXllckNoYW5nZXMpOgorICAgICAgICAoV2ViQ29yZTo6R3Jh
cGhpY3NMYXllckNBOjp1cGRhdGVDb250ZW50c01lZGlhTGF5ZXIpOgorICAgICAgICAqIHBsYXRm
b3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbToKKyAgICAgICAgKFdl
YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6Y3JlYXRlUVRNb3ZpZUxheWVyKToKKyAgICAgICAg
KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6YWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNo
YW5nZWQpOgorCiAyMDEwLTAxLTA4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu
Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9X
ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaCBiL1dlYkNvcmUvcGxhdGZv
cm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCmluZGV4IDFhZDdhMWUuLmMwYjAyNDUgMTAwNjQ0
Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCisrKyBiL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCkBAIC0yNzAsNyArMjcwLDcg
QEAgcHVibGljOgogICAgIAogICAgIC8vIExheWVyIGNvbnRlbnRzCiAgICAgdmlydHVhbCB2b2lk
IHNldENvbnRlbnRzVG9JbWFnZShJbWFnZSopIHsgfQotICAgIHZpcnR1YWwgdm9pZCBzZXRDb250
ZW50c1RvVmlkZW8oUGxhdGZvcm1MYXllciopIHsgfQorICAgIHZpcnR1YWwgdm9pZCBzZXRDb250
ZW50c1RvTWVkaWEoUGxhdGZvcm1MYXllciopIHsgfSAvLyB2aWRlbyBvciBwbHVnLWluCiAgICAg
dmlydHVhbCB2b2lkIHNldENvbnRlbnRzQmFja2dyb3VuZENvbG9yKGNvbnN0IENvbG9yJikgeyB9
CiAgICAgCiAjaWYgRU5BQkxFKDNEX0NBTlZBUykKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv
cm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9tYWMvR3JhcGhpY3NMYXllckNBLmgKaW5kZXggMzg1MDZmNi4uNDJlMjdiYyAxMDA2NDQK
LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NMYXllckNBLmgKKysr
IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NMYXllckNBLmgKQEAgLTEw
NCw3ICsxMDQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHBhdXNlQW5pbWF0aW9uKGNv
bnN0IFN0cmluZyYga2V5ZnJhbWVzTmFtZSwgZG91YmxlIHRpbWVPZmZzZXQpOwogICAgIAogICAg
IHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c1RvSW1hZ2UoSW1hZ2UqKTsKLSAgICB2aXJ0dWFsIHZv
aWQgc2V0Q29udGVudHNUb1ZpZGVvKFBsYXRmb3JtTGF5ZXIqKTsKKyAgICB2aXJ0dWFsIHZvaWQg
c2V0Q29udGVudHNUb01lZGlhKFBsYXRmb3JtTGF5ZXIqKTsKICNpZiBFTkFCTEUoM0RfQ0FOVkFT
KQogICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c1RvR3JhcGhpY3NDb250ZXh0M0QoY29uc3Qg
R3JhcGhpY3NDb250ZXh0M0QqKTsKICNlbmRpZgpAQCAtMTc4LDcgKzE3OCw3IEBAIHByaXZhdGU6
CiAgICAgdm9pZCB1cGRhdGVMYXllckJhY2tncm91bmRDb2xvcigpOwogCiAgICAgdm9pZCB1cGRh
dGVDb250ZW50c0ltYWdlKCk7Ci0gICAgdm9pZCB1cGRhdGVDb250ZW50c1ZpZGVvKCk7CisgICAg
dm9pZCB1cGRhdGVDb250ZW50c01lZGlhTGF5ZXIoKTsKICNpZiBFTkFCTEUoM0RfQ0FOVkFTKQog
ICAgIHZvaWQgdXBkYXRlQ29udGVudHNHcmFwaGljc0NvbnRleHQzRCgpOwogI2VuZGlmCkBAIC0y
MTksNyArMjE5LDcgQEAgcHJpdmF0ZToKICAgICAgICAgQW5pbWF0aW9uQ2hhbmdlZCA9IDEgPDwg
MTUsCiAgICAgICAgIERpcnR5UmVjdHNDaGFuZ2VkID0gMSA8PCAxNiwKICAgICAgICAgQ29udGVu
dHNJbWFnZUNoYW5nZWQgPSAxIDw8IDE3LAotICAgICAgICBDb250ZW50c1ZpZGVvQ2hhbmdlZCA9
IDEgPDwgMTgsCisgICAgICAgIENvbnRlbnRzTWVkaWFMYXllckNoYW5nZWQgPSAxIDw8IDE4LAog
I2lmIEVOQUJMRSgzRF9DQU5WQVMpCiAgICAgICAgIENvbnRlbnRzR3JhcGhpY3NDb250ZXh0M0RD
aGFuZ2VkID0gMSA8PCAxOSwKICNlbmRpZgpAQCAtMjM5LDcgKzIzOSw3IEBAIHByaXZhdGU6CiAg
ICAgZW51bSBDb250ZW50c0xheWVyUHVycG9zZSB7CiAgICAgICAgIE5vQ29udGVudHNMYXllciA9
IDAsCiAgICAgICAgIENvbnRlbnRzTGF5ZXJGb3JJbWFnZSwKLSAgICAgICAgQ29udGVudHNMYXll
ckZvclZpZGVvCisgICAgICAgIENvbnRlbnRzTGF5ZXJGb3JNZWRpYQogI2lmIEVOQUJMRSgzRF9D
QU5WQVMpCiAgICAgICAgICxDb250ZW50c0xheWVyRm9yR3JhcGhpY3NMYXllcjNECiAjZW5kaWYK
ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJD
QS5tbSBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5tbQpp
bmRleCBlMzJmM2U3Li5hNzA3YTYyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL21hYy9HcmFwaGljc0xheWVyQ0EubW0KKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy9tYWMvR3JhcGhpY3NMYXllckNBLm1tCkBAIC03MjgsMTUgKzcyOCwxNSBAQCB2b2lkIEdyYXBo
aWNzTGF5ZXJDQTo6c2V0Q29udGVudHNUb0ltYWdlKEltYWdlKiBpbWFnZSkKICAgICBub3RlTGF5
ZXJQcm9wZXJ0eUNoYW5nZWQoQ29udGVudHNJbWFnZUNoYW5nZWQpOwogfQogCi12b2lkIEdyYXBo
aWNzTGF5ZXJDQTo6c2V0Q29udGVudHNUb1ZpZGVvKFBsYXRmb3JtTGF5ZXIqIHZpZGVvTGF5ZXIp
Cit2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c2V0Q29udGVudHNUb01lZGlhKFBsYXRmb3JtTGF5ZXIq
IG1lZGlhTGF5ZXIpCiB7Ci0gICAgaWYgKHZpZGVvTGF5ZXIgIT0gbV9jb250ZW50c0xheWVyLmdl
dCgpKQorICAgIGlmIChtZWRpYUxheWVyICE9IG1fY29udGVudHNMYXllci5nZXQoKSkKICAgICAg
ICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkKENoaWxkcmVuQ2hhbmdlZCk7CiAKLSAgICBtX2Nv
bnRlbnRzTGF5ZXIgPSB2aWRlb0xheWVyOwotICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZChD
b250ZW50c1ZpZGVvQ2hhbmdlZCk7CisgICAgbV9jb250ZW50c0xheWVyID0gbWVkaWFMYXllcjsK
KyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWQoQ29udGVudHNNZWRpYUxheWVyQ2hhbmdlZCk7
CiAKLSAgICBtX2NvbnRlbnRzTGF5ZXJQdXJwb3NlID0gdmlkZW9MYXllciA/IENvbnRlbnRzTGF5
ZXJGb3JWaWRlbyA6IE5vQ29udGVudHNMYXllcjsKKyAgICBtX2NvbnRlbnRzTGF5ZXJQdXJwb3Nl
ID0gbWVkaWFMYXllciA/IENvbnRlbnRzTGF5ZXJGb3JNZWRpYSA6IE5vQ29udGVudHNMYXllcjsK
IH0KIAogdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldEdlb21ldHJ5T3JpZW50YXRpb24oQ29tcG9z
aXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9uIG9yaWVudGF0aW9uKQpAQCAtNzk4LDggKzc5OCw4
IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpjb21taXRMYXllckNoYW5nZXMoKQogICAgIGlmICht
X3VuY29tbWl0dGVkQ2hhbmdlcyAmIENvbnRlbnRzSW1hZ2VDaGFuZ2VkKSAvLyBOZWVkcyB0byBo
YXBwZW4gYmVmb3JlIENoaWxkcmVuQ2hhbmdlZAogICAgICAgICB1cGRhdGVDb250ZW50c0ltYWdl
KCk7CiAgICAgICAgIAotICAgIGlmIChtX3VuY29tbWl0dGVkQ2hhbmdlcyAmIENvbnRlbnRzVmlk
ZW9DaGFuZ2VkKSAvLyBOZWVkcyB0byBoYXBwZW4gYmVmb3JlIENoaWxkcmVuQ2hhbmdlZAotICAg
ICAgICB1cGRhdGVDb250ZW50c1ZpZGVvKCk7CisgICAgaWYgKG1fdW5jb21taXR0ZWRDaGFuZ2Vz
ICYgQ29udGVudHNNZWRpYUxheWVyQ2hhbmdlZCkgLy8gTmVlZHMgdG8gaGFwcGVuIGJlZm9yZSBD
aGlsZHJlbkNoYW5nZWQKKyAgICAgICAgdXBkYXRlQ29udGVudHNNZWRpYUxheWVyKCk7CiAgICAg
CiAjaWYgRU5BQkxFKDNEX0NBTlZBUykKICAgICBpZiAobV91bmNvbW1pdHRlZENoYW5nZXMgJiBD
b250ZW50c0dyYXBoaWNzQ29udGV4dDNEQ2hhbmdlZCkgLy8gTmVlZHMgdG8gaGFwcGVuIGJlZm9y
ZSBDaGlsZHJlbkNoYW5nZWQKQEAgLTExNDcsNyArMTE0Nyw3IEBAIHZvaWQgR3JhcGhpY3NMYXll
ckNBOjp1cGRhdGVDb250ZW50c0ltYWdlKCkKICAgICB9CiB9CiAKLXZvaWQgR3JhcGhpY3NMYXll
ckNBOjp1cGRhdGVDb250ZW50c1ZpZGVvKCkKK3ZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRhdGVD
b250ZW50c01lZGlhTGF5ZXIoKQogewogICAgIC8vIFZpZGVvIGxheWVyIHdhcyBzZXQgYXMgbV9j
b250ZW50c0xheWVyLCBhbmQgd2lsbCBnZXQgcGFyZW50ZWQgaW4gdXBkYXRlU3VibGF5ZXJMaXN0
KCkuCiAgICAgaWYgKG1fY29udGVudHNMYXllcikgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW0gYi9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQppbmRleCBkZmI1
OTU4Li4yMzY3NGMyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9N
ZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQpAQCAtNDQ5LDcgKzQ0OSw3IEBAIHZvaWQg
TWVkaWFQbGF5ZXJQcml2YXRlOjpjcmVhdGVRVE1vdmllTGF5ZXIoKQogICAgICAgICAvLyBsYXRl
ciB2aWEgYWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoKS4KICAgICAgICAgR3JhcGhp
Y3NMYXllciogdmlkZW9HcmFwaGljc0xheWVyID0gbV9wbGF5ZXItPm1lZGlhUGxheWVyQ2xpZW50
KCktPm1lZGlhUGxheWVyR3JhcGhpY3NMYXllcihtX3BsYXllcik7CiAgICAgICAgIGlmICh2aWRl
b0dyYXBoaWNzTGF5ZXIpCi0gICAgICAgICAgICB2aWRlb0dyYXBoaWNzTGF5ZXItPnNldENvbnRl
bnRzVG9WaWRlbygoUGxhdGZvcm1MYXllciAqKW1fcXRWaWRlb0xheWVyLmdldCgpKTsKKyAgICAg
ICAgICAgIHZpZGVvR3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNUb01lZGlhKChQbGF0Zm9ybUxh
eWVyICopbV9xdFZpZGVvTGF5ZXIuZ2V0KCkpOwogICAgIH0KICNlbmRpZgogfQpAQCAtMTQwNCw3
ICsxNDA0LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OmFjY2VsZXJhdGVkUmVuZGVyaW5n
U3RhdGVDaGFuZ2VkKCkKICAgICBpZiAoY3VycmVudFJlbmRlcmluZ01vZGUoKSA9PSBNZWRpYVJl
bmRlcmluZ01vdmllTGF5ZXIpIHsKICAgICAgICAgR3JhcGhpY3NMYXllciogdmlkZW9HcmFwaGlj
c0xheWVyID0gbV9wbGF5ZXItPm1lZGlhUGxheWVyQ2xpZW50KCktPm1lZGlhUGxheWVyR3JhcGhp
Y3NMYXllcihtX3BsYXllcik7CiAgICAgICAgIGlmICh2aWRlb0dyYXBoaWNzTGF5ZXIpCi0gICAg
ICAgICAgICB2aWRlb0dyYXBoaWNzTGF5ZXItPnNldENvbnRlbnRzVG9WaWRlbygoUGxhdGZvcm1M
YXllciAqKW1fcXRWaWRlb0xheWVyLmdldCgpKTsKKyAgICAgICAgICAgIHZpZGVvR3JhcGhpY3NM
YXllci0+c2V0Q29udGVudHNUb01lZGlhKChQbGF0Zm9ybUxheWVyICopbV9xdFZpZGVvTGF5ZXIu
Z2V0KCkpOwogICAgIH0KIH0KICNlbmRpZgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>46312</attachid>
            <date>2010-01-11 15:04:42 -0800</date>
            <delta_ts>2010-01-11 15:28:24 -0800</delta_ts>
            <desc>Main patch</desc>
            <filename>33455_patch2.txt</filename>
            <type>text/plain</type>
            <size>18033</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCBiNWM2YWZlLi4wNzQ0NGQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDEt
MTEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTMzNDU1CisgICAgICAgIEFsbG93cyBwbHVnaW5zIHRvIHBhcnRp
Y2lwYXRlIGluIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nCisgICAgICAgIAorICAgICAgICBDaGFu
Z2UgdGhlIHRlc3RjYXNlIHRvIG1ha2UgdGhlIGVtYmVkcyBwb3NpdGlvbjogcmVsYXRpdmUgc28g
dGhhdCB0aGUgYmVoYXZpb3IKKyAgICAgICAgb2YgdGhlIHRlc3QgaXMgbm90IGFmZmVjdGVkIGJ5
IHdoZXRoZXIgV2ViQ29yZSBkZWNpZGVzIHRvIHB1dCBwbHVnaW5zIGludG8KKyAgICAgICAgUmVu
ZGVyTGF5ZXJzLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL3BsdWdpbnMvZW1iZWQtYXR0cmli
dXRlcy1zdHlsZS1leHBlY3RlZC5jaGVja3N1bToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvcGx1
Z2lucy9lbWJlZC1hdHRyaWJ1dGVzLXN0eWxlLWV4cGVjdGVkLnBuZzoKKyAgICAgICAgKiBwbGF0
Zm9ybS9tYWMvcGx1Z2lucy9lbWJlZC1hdHRyaWJ1dGVzLXN0eWxlLWV4cGVjdGVkLnR4dDoKKyAg
ICAgICAgKiBwbHVnaW5zL2VtYmVkLWF0dHJpYnV0ZXMtc3R5bGUuaHRtbDoKKwogMjAxMC0wMS0x
MSAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z25zQGdub21lLm9yZz4KIAogICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM0NzIKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL3BsYXRmb3JtL21hYy9wbHVnaW5zL2VtYmVkLWF0dHJpYnV0ZXMtc3R5bGUtZXhw
ZWN0ZWQuY2hlY2tzdW0gYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvcGx1Z2lucy9lbWJlZC1h
dHRyaWJ1dGVzLXN0eWxlLWV4cGVjdGVkLmNoZWNrc3VtCmluZGV4IDQ0ZGZiOGEuLmRmYTk1NmMg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9wbHVnaW5zL2VtYmVkLWF0dHJp
YnV0ZXMtc3R5bGUtZXhwZWN0ZWQuY2hlY2tzdW0KKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v
bWFjL3BsdWdpbnMvZW1iZWQtYXR0cmlidXRlcy1zdHlsZS1leHBlY3RlZC5jaGVja3N1bQpAQCAt
MSArMSBAQAotY2VkNGI1MTkyMzJjMGFiZTI0ZjE0ZGJjOGRiNTk1ODEKXCBObyBuZXdsaW5lIGF0
IGVuZCBvZiBmaWxlCisxMmYwMzYyYmNhZWIyODAyYjE3NzYwZDE1MzA3Yjg3ZQpcIE5vIG5ld2xp
bmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9w
bHVnaW5zL2VtYmVkLWF0dHJpYnV0ZXMtc3R5bGUtZXhwZWN0ZWQucG5nIGIvTGF5b3V0VGVzdHMv
cGxhdGZvcm0vbWFjL3BsdWdpbnMvZW1iZWQtYXR0cmlidXRlcy1zdHlsZS1leHBlY3RlZC5wbmcK
aW5kZXggN2QyOTU1NS4uMTM4MmUzYiAxMDA2NDQKQmluYXJ5IGZpbGVzIGEvTGF5b3V0VGVzdHMv
cGxhdGZvcm0vbWFjL3BsdWdpbnMvZW1iZWQtYXR0cmlidXRlcy1zdHlsZS1leHBlY3RlZC5wbmcg
YW5kIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL3BsdWdpbnMvZW1iZWQtYXR0cmlidXRlcy1z
dHlsZS1leHBlY3RlZC5wbmcgZGlmZmVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y
bS9tYWMvcGx1Z2lucy9lbWJlZC1hdHRyaWJ1dGVzLXN0eWxlLWV4cGVjdGVkLnR4dCBiL0xheW91
dFRlc3RzL3BsYXRmb3JtL21hYy9wbHVnaW5zL2VtYmVkLWF0dHJpYnV0ZXMtc3R5bGUtZXhwZWN0
ZWQudHh0CmluZGV4IDJhNTI2ODIuLmY3ZWJkNTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs
YXRmb3JtL21hYy9wbHVnaW5zL2VtYmVkLWF0dHJpYnV0ZXMtc3R5bGUtZXhwZWN0ZWQudHh0Cisr
KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9wbHVnaW5zL2VtYmVkLWF0dHJpYnV0ZXMtc3R5
bGUtZXhwZWN0ZWQudHh0CkBAIC0xMiwxNyArMTIsMjAgQEAgbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4
MDB4NjAwCiAgICAgICBSZW5kZXJCbG9jayB7SFJ9IGF0ICgwLDUyKSBzaXplIDc4NHgyIFtib3Jk
ZXI6ICgxcHggaW5zZXQgIzAwMDAwMCldCiAgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw2
Mikgc2l6ZSA3ODR4MAogICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsNjIpIHNpemUgNzg0
eDEwNAotICAgICAgICBSZW5kZXJFbWJlZGRlZE9iamVjdCB7RU1CRUR9IGF0ICgwLDApIHNpemUg
NTB4MTAwCiAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoNTAsODYpIHNpemUgMTIyeDE4
CiAgICAgICAgICAgdGV4dCBydW4gYXQgKDUwLDg2KSB3aWR0aCA0OiAiICIKICAgICAgICAgICB0
ZXh0IHJ1biBhdCAoNTQsODYpIHdpZHRoIDExODogInZhbGlnbiB0b3AgYXR0cmlidXRlIgogICAg
ICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMTY2KSBzaXplIDc4NHgxMDQKLSAgICAgICAgUmVu
ZGVyRW1iZWRkZWRPYmplY3Qge0VNQkVEfSBhdCAoMCwwKSBzaXplIDUweDEwMAogICAgICAgICBS
ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDUwLDg2KSBzaXplIDEyOHgxOAogICAgICAgICAgIHRleHQg
cnVuIGF0ICg1MCw4Nikgd2lkdGggNDogIiAiCiAgICAgICAgICAgdGV4dCBydW4gYXQgKDU0LDg2
KSB3aWR0aCAxMjQ6ICJib3JkZXIgNXB4IGF0dHJpYnV0ZSIKICAgICAgIFJlbmRlckJsb2NrIHtE
SVZ9IGF0ICgwLDI3MCkgc2l6ZSA3ODR4MTA2Ci0gICAgICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0
IHtFTUJFRH0gYXQgKDAsMCkgc2l6ZSA1MngxMDIgW2JvcmRlcjogKDFweCBkYXNoZWQgIzAwMDAw
MCldCiAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoNTIsODgpIHNpemUgMTAyeDE4CiAg
ICAgICAgICAgdGV4dCBydW4gYXQgKDUyLDg4KSB3aWR0aCA0OiAiICIKICAgICAgICAgICB0ZXh0
IHJ1biBhdCAoNTYsODgpIHdpZHRoIDk4OiAiaGlkZGVuIGF0dHJpYnV0ZSIKK2xheWVyIGF0ICg4
LDcwKSBzaXplIDUweDEwMAorICBSZW5kZXJFbWJlZGRlZE9iamVjdCB7RU1CRUR9IGF0ICgwLDAp
IHNpemUgNTB4MTAwCitsYXllciBhdCAoOCwxNzQpIHNpemUgNTB4MTAwCisgIFJlbmRlckVtYmVk
ZGVkT2JqZWN0IHtFTUJFRH0gYXQgKDAsMCkgc2l6ZSA1MHgxMDAKK2xheWVyIGF0ICg4LDI3OCkg
c2l6ZSA1MngxMDIKKyAgUmVuZGVyRW1iZWRkZWRPYmplY3Qge0VNQkVEfSBhdCAoMCwwKSBzaXpl
IDUyeDEwMiBbYm9yZGVyOiAoMXB4IGRhc2hlZCAjMDAwMDAwKV0KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL3BsdWdpbnMvZW1iZWQtYXR0cmlidXRlcy1zdHlsZS5odG1sIGIvTGF5b3V0VGVzdHMv
cGx1Z2lucy9lbWJlZC1hdHRyaWJ1dGVzLXN0eWxlLmh0bWwKaW5kZXggNmNhNDBjZS4uZWI0MjY2
YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGx1Z2lucy9lbWJlZC1hdHRyaWJ1dGVzLXN0eWxl
Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvcGx1Z2lucy9lbWJlZC1hdHRyaWJ1dGVzLXN0eWxlLmh0
bWwKQEAgLTIsNiArMiw3IEBACiA8aGVhZD4KIDxzdHlsZT4KIGVtYmVkIHsKKyAgICBwb3NpdGlv
bjogcmVsYXRpdmU7CiAgICAgd2lkdGg6IDUwcHg7IAogICAgIGhlaWdodDogMTAwcHg7CiB9CmRp
ZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGJh
MTkwYjQuLmFkM2Q5OTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNv
cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTAtMDEtMTEgIFNpbW9uIEZyYXNlciAg
PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTMzNDU1CisgICAgICAgIEFsbG93cyBwbHVnaW5zIHRvIHBhcnRpY2lwYXRlIGluIGFjY2VsZXJh
dGVkIGNvbXBvc2l0aW5nCisKKyAgICAgICAgRm9yIHBsdWdpbnMgdXNpbmcgdGhlIENvcmVBbmlt
YXRpb24gcmVuZGVyaW5nIG1vZGUsIGhvc3QgdGhlaXIgQ0FMYXllcnMgaW4gdGhlCisgICAgICAg
IGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGxheWVyIHRyZWUuCisgICAgICAgIAorICAgICAgICBU
aGlzIHJlcXVpcmVzIG1ha2luZyBub3JtYWwgZmxvdyBSZW5kZXJMYXllcnMgZm9yIFJlbmRlckVt
YmVkZGVkT2JqZWN0cyB3aGVuIHRoZXkgcmVwcmVzZW50CisgICAgICAgIGEgcGx1Z2luIHVzaW5n
IHRoaXMgbW9kZS4KKyAgICAgICAgCisgICAgICAgICogV2ViQ29yZS5iYXNlLmV4cDogRXhwb3J0
IE5vZGU6OnNldE5lZWRzU3R5bGVSZWNhbGMoKSBmb3IgdXNlIGJ5IFdlYktpdC4KKyAgICAgICAg
KiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IFJlLW9yZGVyIGZpbGVzIGZvciBz
b3J0aW5nLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0Lmg6Cisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0OjpyZXF1aXJlc0xheWVyKTogTWFrZSBhIGxheWVy
IGlmIHRoZSBwbHVnaW4gaXMgdXNpbmcKKyAgICAgICAgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcg
bW9kZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0OjphbGxvd3NBY2Nl
bGVyYXRlZENvbXBvc2l0aW5nKTogQXNrcyB3aGV0aGVyIHRoZSBwbHVnaW4gaGFzCisgICAgICAg
IGEgbGF5ZXIsIHZpYSBQbHVnaW5XaWRnZXQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy
TGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNob3VsZEJlTm9ybWFs
Rmxvd09ubHkpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmlzU2VsZlBhaW50aW5n
TGF5ZXIpOgorICAgICAgICBSZW5kZXJFbWJlZGRlZE9iamVjdHMgc2hvdWxkIGJlIG5vcm1hbCBm
bG93IGxheWVycywgYW5kIHNlbGYtcGFpbnRpbmcgbGF5ZXJzLgorICAgICAgICAKKyAgICAgICAg
KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl
bmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckNvbmZpZ3VyYXRpb24pOgorICAg
ICAgICBQYXJlbnQgdGhlIHBsdWdpbidzIGxheWVyIGluIHRoZSBHcmFwaGljc0xheWVyIHdoZW4g
dXBkYXRpbmcgdGhlIGxheWVyIGNvbmZpZ3VyYXRpb24uCisgICAgICAgIAorICAgICAgICAqIHJl
bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu
ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29t
cG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJl
bmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclBsdWdpbik6CisgICAg
ICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0cyB0aGF0IGFsbG93IGFjY2VsZXJhdGVkIGNvbXBvc2l0
aW5nIHRyaXAgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9kZQorICAgICAgICBmb3IgdGhlIHBh
Z2UuCisKIDIwMTAtMDEtMDYgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9y
Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCmRpZmYgLS1naXQg
YS9XZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAgYi9XZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAKaW5k
ZXggMzM5OWE0ZS4uNzk4YTNjNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhw
CisrKyBiL1dlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cApAQCAtODgzLDYgKzg4Myw3IEBAIF9fWk5L
N1dlYkNvcmU0S1VSTGN2UDVOU1VSTEV2CiBfX1pOSzdXZWJDb3JlNE5vZGUxNGlzRGVzY2VuZGFu
dE9mRVBLUzBfCiBfX1pOSzdXZWJDb3JlNE5vZGUxOGdldFN1YnJlc291cmNlVVJMc0VSTjNXVEYx
MUxpc3RIYXNoU2V0SU5TXzRLVVJMRU5TXzhLVVJMSGFzaEVFRQogX19aTks3V2ViQ29yZTROb2Rl
OW5vZGVJbmRleEV2CitfX1pON1dlYkNvcmU0Tm9kZTE5c2V0TmVlZHNTdHlsZVJlY2FsY0VOU18x
NVN0eWxlQ2hhbmdlVHlwZUUKIF9fWk5LN1dlYkNvcmU0UGFnZTEwcGx1Z2luRGF0YUV2CiBfX1pO
SzdXZWJDb3JlNFBhZ2UzNGluTG93UXVhbGl0eUltYWdlSW50ZXJwb2xhdGlvbk1vZGVFdgogX19a
Tks3V2ViQ29yZTRQYWdlOWdyb3VwTmFtZUV2CmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUu
eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJv
amVjdC5wYnhwcm9qCmluZGV4IDk4MDMzZmYuLjUyNDRiNmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv
V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1dlYkNvcmUvV2ViQ29yZS54
Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xNTQ2NCw2ICsxNTQ2NCw4IEBACiAJCQkJOTM5
MkYxNDEwQUQxODVGNDAwNjkxQkQ0IC8qIFJlbmRlckNvdW50ZXIuaCAqLywKIAkJCQlCQzc3Q0VD
NzBGRjAxQ0JFMDA3MDg4N0IgLyogUmVuZGVyRGF0YUdyaWQuY3BwICovLAogCQkJCUJDNzdDRUIy
MEZGMDE3RjIwMDcwODg3QiAvKiBSZW5kZXJEYXRhR3JpZC5oICovLAorCQkJCTBGNUI3QTUyMTBG
NjVEN0EwMDM3NjMwMiAvKiBSZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAgKi8sCisJCQkJMEY1QjdB
NTMxMEY2NUQ3QTAwMzc2MzAyIC8qIFJlbmRlckVtYmVkZGVkT2JqZWN0LmggKi8sCiAJCQkJQThF
QTczQUYwQTE5MDBFMzAwQThFRjVGIC8qIFJlbmRlckZpZWxkc2V0LmNwcCAqLywKIAkJCQlBOEVB
NzNCMDBBMTkwMEUzMDBBOEVGNUYgLyogUmVuZGVyRmllbGRzZXQuaCAqLywKIAkJCQkwNjZDNzcy
RTBBQjYwM0ZEMDAyMzhDQzQgLyogUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wuY3BwICovLApAQCAt
MTU1MTUsOCArMTU1MTcsNiBAQAogCQkJCUE4NzFERUNEMEExNTMwQzcwMEIxMkE2OCAvKiBSZW5k
ZXJQYXJ0T2JqZWN0LmggKi8sCiAJCQkJODUzQ0E5RUUwQUVFQzY1NzAwMjM3MkRDIC8qIFJlbmRl
clBhdGguY3BwICovLAogCQkJCTg1M0NBOUVGMEFFRUM2NTcwMDIzNzJEQyAvKiBSZW5kZXJQYXRo
LmggKi8sCi0JCQkJMEY1QjdBNTIxMEY2NUQ3QTAwMzc2MzAyIC8qIFJlbmRlckVtYmVkZGVkT2Jq
ZWN0LmNwcCAqLywKLQkJCQkwRjVCN0E1MzEwRjY1RDdBMDAzNzYzMDIgLyogUmVuZGVyRW1iZWRk
ZWRPYmplY3QuaCAqLywKIAkJCQlBODcxREZERTBBMTUzNzZCMDBCMTJBNjggLyogUmVuZGVyUmVw
bGFjZWQuY3BwICovLAogCQkJCUE4NzFERkRGMEExNTM3NkIwMEIxMkE2OCAvKiBSZW5kZXJSZXBs
YWNlZC5oICovLAogCQkJCUJDQTg0NkQ0MERDNjdBMzUwMDI2QzMwOSAvKiBSZW5kZXJSZXBsaWNh
LmNwcCAqLywKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2Jq
ZWN0LmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcAppbmRl
eCBhZDQyYjA0Li5kYjMyODA4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJF
bWJlZGRlZE9iamVjdC5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRP
YmplY3QuY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiSFRNTFBhcmFtRWxlbWVudC5o
IgogI2luY2x1ZGUgIk1JTUVUeXBlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJQYWdlLmgiCisjaW5j
bHVkZSAiUGx1Z2luV2lkZ2V0LmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgogI2luY2x1ZGUg
IlJlbmRlcldpZGdldFByb3RlY3Rvci5oIgogI2luY2x1ZGUgIlRleHQuaCIKQEAgLTQxLDYgKzQy
LDEwIEBACiAjaW5jbHVkZSAiSFRNTFZpZGVvRWxlbWVudC5oIgogI2VuZGlmCiAKKyNpZiBVU0Uo
QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisjaW5jbHVkZSAiUGx1Z2luV2lkZ2V0LmgiCisjZW5k
aWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwpA
QCAtNTcsNiArNjIsMjEgQEAgUmVuZGVyRW1iZWRkZWRPYmplY3Q6On5SZW5kZXJFbWJlZGRlZE9i
amVjdCgpCiAgICAgICAgIGZyYW1lVmlldygpLT5yZW1vdmVXaWRnZXRUb1VwZGF0ZSh0aGlzKTsK
IH0KIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKK2Jvb2wgUmVuZGVyRW1iZWRk
ZWRPYmplY3Q6OnJlcXVpcmVzTGF5ZXIoKSBjb25zdAoreworICAgIGlmIChSZW5kZXJQYXJ0T2Jq
ZWN0OjpyZXF1aXJlc0xheWVyKCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIAorICAgIHJl
dHVybiBhbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCk7Cit9CisKK2Jvb2wgUmVuZGVyRW1i
ZWRkZWRPYmplY3Q6OmFsbG93c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSBjb25zdAoreworICAg
IHJldHVybiB3aWRnZXQoKSAmJiB3aWRnZXQoKS0+aXNQbHVnaW5XaWRnZXQoKSAmJiBzdGF0aWNf
Y2FzdDxQbHVnaW5XaWRnZXQqPih3aWRnZXQoKSktPnBsYXRmb3JtTGF5ZXIoKTsKK30KKyNlbmRp
ZgorCiBzdGF0aWMgYm9vbCBpc1VSTEFsbG93ZWQoRG9jdW1lbnQqIGRvYywgY29uc3QgU3RyaW5n
JiB1cmwpCiB7CiAgICAgaWYgKGRvYy0+ZnJhbWUoKS0+cGFnZSgpLT5mcmFtZUNvdW50KCkgPj0g
MjAwKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3Qu
aCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmgKaW5kZXggYWQxOTEx
ZS4uYmRhZWE5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRP
YmplY3QuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5oCkBA
IC0zNSwxMCArMzUsMTggQEAgcHVibGljOgogCiAgICAgdm9pZCB1cGRhdGVXaWRnZXQoYm9vbCBv
bmx5Q3JlYXRlTm9uTmV0c2NhcGVQbHVnaW5zKTsKIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q
T1NJVElORykKKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygp
IGNvbnN0OworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgdmlydHVhbCBjb25zdCBjaGFyKiByZW5k
ZXJOYW1lKCkgY29uc3QgeyByZXR1cm4gIlJlbmRlckVtYmVkZGVkT2JqZWN0IjsgfQogICAgIHZp
cnR1YWwgYm9vbCBpc0VtYmVkZGVkT2JqZWN0KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCisj
aWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIHZpcnR1YWwgYm9vbCByZXF1aXJl
c0xheWVyKCkgY29uc3Q7CisjZW5kaWYKKwogICAgIHZpcnR1YWwgdm9pZCBsYXlvdXQoKTsKIH07
CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA2ZWE3NjU5Li4wMDYzZWEzIDEwMDY0
NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0zMzAyLDcgKzMzMDIsNyBAQCB2b2lkIFJlbmRl
ckxheWVyOjpyZXBhaW50SW5jbHVkaW5nTm9uQ29tcG9zaXRpbmdEZXNjZW5kYW50cyhSZW5kZXJC
b3hNb2RlbE9iamVjdAogCiBib29sIFJlbmRlckxheWVyOjpzaG91bGRCZU5vcm1hbEZsb3dPbmx5
KCkgY29uc3QKIHsKLSAgICByZXR1cm4gKHJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xpcCgpIHx8
IHJlbmRlcmVyKCktPmhhc1JlZmxlY3Rpb24oKSB8fCByZW5kZXJlcigpLT5oYXNNYXNrKCkgfHwg
cmVuZGVyZXIoKS0+aXNWaWRlbygpKSAmJgorICAgIHJldHVybiAocmVuZGVyZXIoKS0+aGFzT3Zl
cmZsb3dDbGlwKCkgfHwgcmVuZGVyZXIoKS0+aGFzUmVmbGVjdGlvbigpIHx8IHJlbmRlcmVyKCkt
Pmhhc01hc2soKSB8fCByZW5kZXJlcigpLT5pc1ZpZGVvKCkgfHwgcmVuZGVyZXIoKS0+aXNFbWJl
ZGRlZE9iamVjdCgpKSAmJgogICAgICAgICAgICAhcmVuZGVyZXIoKS0+aXNQb3NpdGlvbmVkKCkg
JiYKICAgICAgICAgICAgIXJlbmRlcmVyKCktPmlzUmVsUG9zaXRpb25lZCgpICYmCiAgICAgICAg
ICAgICFyZW5kZXJlcigpLT5oYXNUcmFuc2Zvcm0oKSAmJgpAQCAtMzMxMSw3ICszMzExLDcgQEAg
Ym9vbCBSZW5kZXJMYXllcjo6c2hvdWxkQmVOb3JtYWxGbG93T25seSgpIGNvbnN0CiAKIGJvb2wg
UmVuZGVyTGF5ZXI6OmlzU2VsZlBhaW50aW5nTGF5ZXIoKSBjb25zdAogewotICAgIHJldHVybiAh
aXNOb3JtYWxGbG93T25seSgpIHx8IHJlbmRlcmVyKCktPmhhc1JlZmxlY3Rpb24oKSB8fCByZW5k
ZXJlcigpLT5oYXNNYXNrKCkgfHwgcmVuZGVyZXIoKS0+aXNUYWJsZVJvdygpIHx8IHJlbmRlcmVy
KCktPmlzVmlkZW8oKTsKKyAgICByZXR1cm4gIWlzTm9ybWFsRmxvd09ubHkoKSB8fCByZW5kZXJl
cigpLT5oYXNSZWZsZWN0aW9uKCkgfHwgcmVuZGVyZXIoKS0+aGFzTWFzaygpIHx8IHJlbmRlcmVy
KCktPmlzVGFibGVSb3coKSB8fCByZW5kZXJlcigpLT5pc1ZpZGVvKCkgfHwgcmVuZGVyZXIoKS0+
aXNFbWJlZGRlZE9iamVjdCgpOwogfQogCiB2b2lkIFJlbmRlckxheWVyOjpzdHlsZUNoYW5nZWQo
U3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKikKZGlmZiAtLWdpdCBhL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGQzODI5NGIuLmMxNGU4MDggMTAwNjQ0Ci0t
LSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtNDEsOSArNDEsMTEgQEAKICNp
bmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JUaW1lbGluZUFnZW50Lmgi
CiAjaW5jbHVkZSAiS2V5ZnJhbWVMaXN0LmgiCisjaW5jbHVkZSAiUGx1Z2luV2lkZ2V0LmgiCiAj
aW5jbHVkZSAiUmVuZGVyQm94LmgiCiAjaW5jbHVkZSAiUmVuZGVySW1hZ2UuaCIKICNpbmNsdWRl
ICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKKyNpbmNsdWRlICJSZW5kZXJFbWJlZGRlZE9iamVj
dC5oIgogI2luY2x1ZGUgIlJlbmRlclZpZGVvLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgog
I2luY2x1ZGUgIlNldHRpbmdzLmgiCkBAIC0xOTcsNiArMTk5LDExIEBAIGJvb2wgUmVuZGVyTGF5
ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyQ29uZmlndXJhdGlvbigpCiAgICAgaWYgKGlz
RGlyZWN0bHlDb21wb3NpdGVkSW1hZ2UoKSkKICAgICAgICAgdXBkYXRlSW1hZ2VDb250ZW50cygp
OwogCisgICAgaWYgKHJlbmRlcmVyKCktPmlzRW1iZWRkZWRPYmplY3QoKSAmJiB0b1JlbmRlckVt
YmVkZGVkT2JqZWN0KHJlbmRlcmVyKCkpLT5hbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkp
IHsKKyAgICAgICAgUGx1Z2luV2lkZ2V0KiBwbHVnaW5XaWRnZXQgPSBzdGF0aWNfY2FzdDxQbHVn
aW5XaWRnZXQqPih0b1JlbmRlckVtYmVkZGVkT2JqZWN0KHJlbmRlcmVyKCkpLT53aWRnZXQoKSk7
CisgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNUb01lZGlhKHBsdWdpbldpZGdl
dC0+cGxhdGZvcm1MYXllcigpKTsKKyAgICB9CisKICNpZiBFTkFCTEUoM0RfQ0FOVkFTKSAgICAK
ICAgICBpZiAoaXMzRENhbnZhcyhyZW5kZXJlcigpKSkgewogICAgICAgICBIVE1MQ2FudmFzRWxl
bWVudCogY2FudmFzID0gc3RhdGljX2Nhc3Q8SFRNTENhbnZhc0VsZW1lbnQqPihyZW5kZXJlcigp
LT5ub2RlKCkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w
b3NpdG9yLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAK
aW5kZXggZjJmZmI1Ny4uY2JjMTg0OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll
ckNvbXBvc2l0b3IuY3BwCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVkZSAiSFRNTENhbnZhc0Vs
ZW1lbnQuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXJCYWNraW5n
LmgiCisjaW5jbHVkZSAiUmVuZGVyRW1iZWRkZWRPYmplY3QuaCIKICNpbmNsdWRlICJSZW5kZXJW
aWRlby5oIgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgpA
QCAtNTksNiArNjAsOCBAQCBib29sIFdlYkNvcmVIYXMzRFJlbmRlcmluZyA9IHRydWU7CiAKIG5h
bWVzcGFjZSBXZWJDb3JlIHsKIAordXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKKwogc3RydWN0
IENvbXBvc2l0aW5nU3RhdGUgewogICAgIENvbXBvc2l0aW5nU3RhdGUoUmVuZGVyTGF5ZXIqIGNv
bXBBbmNlc3RvcikKICAgICAgICAgOiBtX2NvbXBvc2l0aW5nQW5jZXN0b3IoY29tcEFuY2VzdG9y
KQpAQCAtODg1LDE1ICs4ODgsMTcgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6Om5lZWRz
VG9CZUNvbXBvc2l0ZWQoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyKSBjb25zdAogLy8gVXNlIG5l
ZWRzVG9CZUNvbXBvc2l0ZWQoKSB0byBkZXRlcm1pbmUgaWYgYSBSTCBhY3R1YWxseSBuZWVkcyBh
IGNvbXBvc2l0aW5nIGxheWVyLgogLy8gc3RhdGljCiBib29sIFJlbmRlckxheWVyQ29tcG9zaXRv
cjo6cmVxdWlyZXNDb21wb3NpdGluZ0xheWVyKGNvbnN0IFJlbmRlckxheWVyKiBsYXllcikgY29u
c3QKLXsgICAgCit7CisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGxheWVyLT5yZW5kZXJl
cigpOwogICAgIC8vIFRoZSByb290IGxheWVyIGFsd2F5cyBoYXMgYSBjb21wb3NpdGluZyBsYXll
ciwgYnV0IGl0IG1heSBub3QgaGF2ZSBiYWNraW5nLgogICAgIHJldHVybiAoaW5Db21wb3NpdGlu
Z01vZGUoKSAmJiBsYXllci0+aXNSb290TGF5ZXIoKSkgfHwKLSAgICAgICAgICAgICByZXF1aXJl
c0NvbXBvc2l0aW5nRm9yVHJhbnNmb3JtKGxheWVyLT5yZW5kZXJlcigpKSB8fAotICAgICAgICAg
ICAgIHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JWaWRlbyhsYXllci0+cmVuZGVyZXIoKSkgfHwKLSAg
ICAgICAgICAgICByZXF1aXJlc0NvbXBvc2l0aW5nRm9yQ2FudmFzKGxheWVyLT5yZW5kZXJlcigp
KSB8fAotICAgICAgICAgICAgIGxheWVyLT5yZW5kZXJlcigpLT5zdHlsZSgpLT5iYWNrZmFjZVZp
c2liaWxpdHkoKSA9PSBCYWNrZmFjZVZpc2liaWxpdHlIaWRkZW4gfHwKKyAgICAgICAgICAgICBy
ZXF1aXJlc0NvbXBvc2l0aW5nRm9yVHJhbnNmb3JtKHJlbmRlcmVyKSB8fAorICAgICAgICAgICAg
IHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JWaWRlbyhyZW5kZXJlcikgfHwKKyAgICAgICAgICAgICBy
ZXF1aXJlc0NvbXBvc2l0aW5nRm9yQ2FudmFzKHJlbmRlcmVyKSB8fAorICAgICAgICAgICAgIHJl
cXVpcmVzQ29tcG9zaXRpbmdGb3JQbHVnaW4ocmVuZGVyZXIpIHx8CisgICAgICAgICAgICAgcmVu
ZGVyZXItPnN0eWxlKCktPmJhY2tmYWNlVmlzaWJpbGl0eSgpID09IEJhY2tmYWNlVmlzaWJpbGl0
eUhpZGRlbiB8fAogICAgICAgICAgICAgIGNsaXBzQ29tcG9zaXRpbmdEZXNjZW5kYW50cyhsYXll
cikgfHwKLSAgICAgICAgICAgICByZXF1aXJlc0NvbXBvc2l0aW5nRm9yQW5pbWF0aW9uKGxheWVy
LT5yZW5kZXJlcigpKTsKKyAgICAgICAgICAgICByZXF1aXJlc0NvbXBvc2l0aW5nRm9yQW5pbWF0
aW9uKHJlbmRlcmVyKTsKIH0KIAogLy8gUmV0dXJuIHRydWUgaWYgdGhlIGdpdmVuIGxheWVyIGhh
cyBzb21lIGFuY2VzdG9yIGluIHRoZSBSZW5kZXJMYXllciBoaWVyYXJjaHkgdGhhdCBjbGlwcywK
QEAgLTk3NSw2ICs5ODAsMTEgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVz
Q29tcG9zaXRpbmdGb3JDYW52YXMoUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKICAgICByZXR1cm4g
ZmFsc2U7CiB9CiAKK2Jvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0
aW5nRm9yUGx1Z2luKFJlbmRlck9iamVjdCogcmVuZGVyZXIpIGNvbnN0Cit7CisgICAgcmV0dXJu
IHJlbmRlcmVyLT5pc0VtYmVkZGVkT2JqZWN0KCkgJiYgdG9SZW5kZXJFbWJlZGRlZE9iamVjdChy
ZW5kZXJlciktPmFsbG93c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKTsKK30KKwogYm9vbCBSZW5k
ZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JBbmltYXRpb24oUmVuZGVy
T2JqZWN0KiByZW5kZXJlcikgY29uc3QKIHsKICAgICBpZiAoQW5pbWF0aW9uQ29udHJvbGxlciog
YW5pbUNvbnRyb2xsZXIgPSByZW5kZXJlci0+YW5pbWF0aW9uKCkpIHsKZGlmZiAtLWdpdCBhL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggNzM2ODNmMy4uYTljN2VhMCAxMDA2NDQK
LS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAgLTE3Myw2ICsxNzMsNyBA
QCBwcml2YXRlOgogICAgIGJvb2wgcmVxdWlyZXNDb21wb3NpdGluZ0ZvclRyYW5zZm9ybShSZW5k
ZXJPYmplY3QqKSBjb25zdDsKICAgICBib29sIHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JWaWRlbyhS
ZW5kZXJPYmplY3QqKSBjb25zdDsKICAgICBib29sIHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JDYW52
YXMoUmVuZGVyT2JqZWN0KikgY29uc3Q7CisgICAgYm9vbCByZXF1aXJlc0NvbXBvc2l0aW5nRm9y
UGx1Z2luKFJlbmRlck9iamVjdCopIGNvbnN0OwogICAgIGJvb2wgcmVxdWlyZXNDb21wb3NpdGlu
Z1doZW5EZXNjZW5kYW50c0FyZUNvbXBvc2l0aW5nKFJlbmRlck9iamVjdCopIGNvbnN0OwogCiBw
cml2YXRlOgpkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9XZWJLaXQvbWFjL0No
YW5nZUxvZwppbmRleCA4YmI5OWQyLi4xODc4OWRmIDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL0No
YW5nZUxvZworKysgYi9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEw
LTAxLTExICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzQ1NQorICAgICAgICBBbGxvd3MgcGx1Z2lucyB0byBw
YXJ0aWNpcGF0ZSBpbiBhY2NlbGVyYXRlZCBjb21wb3NpdGluZworCisgICAgICAgICogUGx1Z2lu
cy9Ib3N0ZWQvV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3Lm1tOgorICAgICAgICAoLVtXZWJI
b3N0ZWROZXRzY2FwZVBsdWdpblZpZXcgY3JlYXRlUGx1Z2luXSk6CisgICAgICAgICogUGx1Z2lu
cy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW06CisgICAgICAgICgtW1dlYk5ldHNjYXBlUGx1Z2lu
VmlldyBjcmVhdGVQbHVnaW5dKTogSWYgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgaXMKKyAgICAg
ICAgYXZhaWxhYmxlLCBkb24ndCB1c2UgYSBsYXllci1iYWNrZWQgTlNWaWV3IGZvciBwbHVnaW5z
LiBJbnN0ZWFkLCB0aWNrbGUgdGhlCisgICAgICAgIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGNv
ZGUgdmlhIHNldE5lZWRzU3R5bGVSZWNhbGMoU3ludGhldGljU3R5bGVDaGFuZ2UpLAorICAgICAg
ICB3aGljaCB3aWxsIHBhcmVudCB0aGUgcGx1Z2luJ3MgbGF5ZXIgaW4gdGhlIGFjY2VsZXJhdGVk
IGNvbXBvc2l0aW5nIGxheWVyCisgICAgICAgIHRyZWUuCisKIDIwMTAtMDEtMDkgIEFkYW0gQmFy
dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl
ci4KZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvV2ViSG9zdGVkTmV0c2Nh
cGVQbHVnaW5WaWV3Lm1tIGIvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRz
Y2FwZVBsdWdpblZpZXcubW0KaW5kZXggMWUxMGMxMC4uMTgxOWQ5MSAxMDA2NDQKLS0tIGEvV2Vi
S2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0KKysr
IGIvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcu
bW0KQEAgLTExNiw3ICsxMTYsMTEgQEAgZXh0ZXJuICJDIiB7CiAgICAgICAgIF9zb2Z0d2FyZVJl
bmRlcmVyID0gV0tTb2Z0d2FyZUNBUmVuZGVyZXJDcmVhdGUoX3Byb3h5LT5yZW5kZXJDb250ZXh0
SUQoKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIF9wbHVnaW5MYXllciA9IFdLTWFrZVJlbmRlckxh
eWVyKF9wcm94eS0+cmVuZGVyQ29udGV4dElEKCkpOwotICAgICAgICBzZWxmLndhbnRzTGF5ZXIg
PSBZRVM7CisKKyAgICAgICAgaWYgKGFjY2xlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpCisgICAg
ICAgICAgICBbc2VsZiBlbGVtZW50XS0+c2V0TmVlZHNTdHlsZVJlY2FsYyhTeW50aGV0aWNTdHls
ZUNoYW5nZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHNlbGYud2FudHNMYXllciA9IFlF
UzsKICAgICB9CiAgICAgCiAgICAgLy8gVXBkYXRlIHRoZSB3aW5kb3cgZnJhbWUuCmRpZmYgLS1n
aXQgYS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3Lm1tIGIvV2ViS2l0
L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luVmlldy5tbQppbmRleCAwMGM3YjQyLi43MDU3
ZGE0IDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3
Lm1tCisrKyBiL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW0KQEAg
LTEwODksMTAgKzEwODksMTggQEAgc3RhdGljIGlubGluZSB2b2lkIGdldE5QUmVjdChjb25zdCBO
U1JlY3QmIG5yLCBOUFJlY3QmIG5wcikKICAgICBpZiAoZHJhd2luZ01vZGVsID09IE5QRHJhd2lu
Z01vZGVsQ29yZUFuaW1hdGlvbikgewogICAgICAgICB2b2lkICp2YWx1ZSA9IDA7CiAgICAgICAg
IGlmIChbX3BsdWdpblBhY2thZ2UuZ2V0KCkgcGx1Z2luRnVuY3NdLT5nZXR2YWx1ZShwbHVnaW4s
IE5QUFZwbHVnaW5Db3JlQW5pbWF0aW9uTGF5ZXIsICZ2YWx1ZSkgPT0gTlBFUlJfTk9fRVJST1Ig
JiYgdmFsdWUpIHsKLSAgICAgICAgICAgIAorCiAgICAgICAgICAgICAvLyBUaGUgcGx1Zy1pbiBn
aXZlcyB1cyBhIHJldGFpbmVkIGxheWVyLgogICAgICAgICAgICAgX3BsdWdpbkxheWVyLmFkb3B0
TlMoKENBTGF5ZXIgKil2YWx1ZSk7Ci0gICAgICAgICAgICBbc2VsZiBzZXRXYW50c0xheWVyOllF
U107CisKKyAgICAgICAgICAgIEJPT0wgYWNjbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCA9IGZh
bHNlOworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICAgICAgICAgIGFjY2xl
cmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQgPSBbW1tzZWxmIHdlYlZpZXddIHByZWZlcmVuY2VzXSBh
Y2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZF07CisjZW5kaWYKKyAgICAgICAgICAgIGlmIChh
Y2NsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKQorICAgICAgICAgICAgICAgIFtzZWxmIGVsZW1l
bnRdLT5zZXROZWVkc1N0eWxlUmVjYWxjKFN5bnRoZXRpY1N0eWxlQ2hhbmdlKTsKKyAgICAgICAg
ICAgIGVsc2UKKyAgICAgICAgICAgICAgICBbc2VsZiBzZXRXYW50c0xheWVyOllFU107CiAgICAg
ICAgICAgICBMT0coUGx1Z2lucywgIiVAIGlzIHVzaW5nIENvcmUgQW5pbWF0aW9uIGRyYXdpbmcg
bW9kZWwgd2l0aCBsYXllciAlQCIsIF9wbHVnaW5QYWNrYWdlLmdldCgpLCBfcGx1Z2luTGF5ZXIu
Z2V0KCkpOwogICAgICAgICB9CiAK
</data>
<flag name="review"
          id="28557"
          type_id="1"
          status="+"
          setter="kdecker"
    />
          </attachment>
      

    </bug>

</bugzilla>