<?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>71859</bug_id>
          
          <creation_ts>2011-11-08 14:53:56 -0800</creation_ts>
          <short_desc>MHTML documents containing references to resources they don&apos;t include never finish loading</short_desc>
          <delta_ts>2012-06-25 19:06:14 -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>WebCore Misc.</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>REOPENED</bug_status>
          <resolution></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>
          <dependson>72109</dependson>
    
    <dependson>89935</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jay Civelli">jcivelli</reporter>
          <assigned_to name="Jay Civelli">jcivelli</assigned_to>
          <cc>abarth</cc>
    
    <cc>japhet</cc>
    
    <cc>jochen</cc>
    
    <cc>tonyg</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>498450</commentid>
    <comment_count>0</comment_count>
    <who name="Jay Civelli">jcivelli</who>
    <bug_when>2011-11-08 14:53:56 -0800</bug_when>
    <thetext>Save a page such as cnn.com to MHTML.
Load the generated MHTML.
The page gets loaded, but we never get a notification that the load stopped (and the progress never gets to 100%).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>498454</commentid>
    <comment_count>1</comment_count>
      <attachid>114159</attachid>
    <who name="Jay Civelli">jcivelli</who>
    <bug_when>2011-11-08 14:55:44 -0800</bug_when>
    <thetext>Created attachment 114159
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>498464</commentid>
    <comment_count>2</comment_count>
      <attachid>114163</attachid>
    <who name="Jay Civelli">jcivelli</who>
    <bug_when>2011-11-08 15:24:37 -0800</bug_when>
    <thetext>Created attachment 114163
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>498493</commentid>
    <comment_count>3</comment_count>
      <attachid>114163</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-11-08 16:09:49 -0800</bug_when>
    <thetext>Comment on attachment 114163
Patch

Test?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>499680</commentid>
    <comment_count>4</comment_count>
      <attachid>114442</attachid>
    <who name="Jay Civelli">jcivelli</who>
    <bug_when>2011-11-09 23:36:46 -0800</bug_when>
    <thetext>Created attachment 114442
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>499685</commentid>
    <comment_count>5</comment_count>
    <who name="Jay Civelli">jcivelli</who>
    <bug_when>2011-11-09 23:40:34 -0800</bug_when>
    <thetext>Added a Chromium test for this (as this cannot be tested with a LayoutTest).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>499689</commentid>
    <comment_count>6</comment_count>
      <attachid>114442</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-11-09 23:53:25 -0800</bug_when>
    <thetext>Comment on attachment 114442
Patch

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

&gt; Source/WebCore/loader/DocumentLoader.cpp:660
&gt; +        return true;
&gt; +    }
&gt; +    return false;

I would have combined these to &quot;return failLoad&quot;, but that&apos;s just a nit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>499723</commentid>
    <comment_count>7</comment_count>
      <attachid>114442</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-11-10 01:39:58 -0800</bug_when>
    <thetext>Comment on attachment 114442
Patch

Clearing flags on attachment: 114442

Committed r99826: &lt;http://trac.webkit.org/changeset/99826&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>499724</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-11-10 01:40:03 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>500632</commentid>
    <comment_count>9</comment_count>
    <who name="Tony Gentilcore">tonyg</who>
    <bug_when>2011-11-11 03:31:58 -0800</bug_when>
    <thetext>Reopening as I&apos;m rolling this out in bug 72109. Explanation in bug 72039.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>643035</commentid>
    <comment_count>10</comment_count>
      <attachid>146168</attachid>
    <who name="Jay Civelli">jcivelli</who>
    <bug_when>2012-06-06 18:13:43 -0700</bug_when>
    <thetext>Created attachment 146168
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>643038</commentid>
    <comment_count>11</comment_count>
    <who name="Jay Civelli">jcivelli</who>
    <bug_when>2012-06-06 18:14:36 -0700</bug_when>
    <thetext>Reviving this bug.
Uploaded a newer patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>643978</commentid>
    <comment_count>12</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2012-06-07 15:24:04 -0700</bug_when>
    <thetext>@japhet: Any interest in reviewing this patch?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>656754</commentid>
    <comment_count>13</comment_count>
      <attachid>146168</attachid>
    <who name="Nate Chapin">japhet</who>
    <bug_when>2012-06-25 11:41:15 -0700</bug_when>
    <thetext>Comment on attachment 146168
Patch

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

&gt; Source/WebCore/loader/DocumentLoader.cpp:694
&gt; +        // Schedule this loader without a resource so that resource completion/failure notifications are still fired.
&gt; +        m_pendingSubstituteResources.set(loader, 0);
&gt; +        deliverSubstituteResourcesAfterDelay();

It might make sense to be a little more explicit here that didFail() will get called via substituteResourceDeliveryTimerFired() for a null SubstituteResource. It wasn&apos;t immediately obvious to me that this was safe.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>656831</commentid>
    <comment_count>14</comment_count>
      <attachid>149348</attachid>
    <who name="Jay Civelli">jcivelli</who>
    <bug_when>2012-06-25 13:57:43 -0700</bug_when>
    <thetext>Created attachment 149348
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>657100</commentid>
    <comment_count>15</comment_count>
      <attachid>149348</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-25 18:12:22 -0700</bug_when>
    <thetext>Comment on attachment 149348
Patch for landing

Clearing flags on attachment: 149348

Committed r121206: &lt;http://trac.webkit.org/changeset/121206&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>657102</commentid>
    <comment_count>16</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-25 18:12:28 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>657158</commentid>
    <comment_count>17</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-06-25 19:06:14 -0700</bug_when>
    <thetext>Re-opened since this is blocked by 89935</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>114159</attachid>
            <date>2011-11-08 14:55:44 -0800</date>
            <delta_ts>2011-11-08 15:24:34 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-71859-20111108145543.patch</filename>
            <type>text/plain</type>
            <size>3758</size>
            <attacher name="Jay Civelli">jcivelli</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYTFiZmUzNDYzNjdlNDkx
YmNlNGFjMWMzN2EwYWVkOWE2ODAxN2I1Li45ZmM0YmRlMGYzYmM2NmY0OTFhN2YyZDBlYzYzODkz
MGRjN2U1ZDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMTEtMDggIEpheSBD
aXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCBwcm9ncmVzcyBs
b2FkIHJlcG9ydGluZyBmb3IgTUhUTUwgZG9jdW1lbnRzLgorCisgICAgICAgIE1IVE1MIGRvY3Vt
ZW50cyBjb250YWluaW5nIHJlZmVyZW5jZXMgdG8gcmVzb3VyY2VzIHRoZXkgZG9uJ3QgaW5jbHVk
ZQorICAgICAgICBuZXZlciBmaW5pc2ggbG9hZGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxODU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQpOgorCisy
MDExLTExLTA4ICBKYXkgQ2l2ZWxsaSAgPGpjaXZlbGxpQGNocm9taXVtLm9yZz4KKworICAgICAg
ICBGaXggTUhUTUwgZ2VuZXJhdGlvbiB0byB1c2UgdGhlIFF1b3RlZFByaW50YWJsZSBlbmNvZGlu
ZyBmb3IgdGV4dCByZXNvdXJjZXMuCisgICAgICAgIFRoaXMgd2FzIHJlZ3Jlc3NlZCB3aGVuIHdl
IGFkZGVkIGJpbmFyeSBlbmNvZGluZyBzdXBwb3J0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE4NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICAqIGxvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2
ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNSFRNTEFyY2hpdmU6OmdlbmVyYXRlTUhUTUxEYXRh
KToKKwogMjAxMS0xMS0wOCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg
ICAgU3BlY3VsYXRpdmUgZml4IGZvciBjcmFzaGVzIHNlZW4gaW4gRG9jdW1lbnRXcml0ZXI6OmRl
cHJlY2F0ZWRGcmFtZUVuY29kaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv
RG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy
LmNwcAppbmRleCBkNTFjYTE0NjUzMGUwNDg1ZmZiMzk4MGI5OTRjNmEzODllZDA1NmE1Li5lZTcy
NTllZTNmYjZiMTBmYTQyNTdjOTk3NTE0M2E0ZGNlMDdiOWNjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv
YWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTYzNiwxOSArNjM2LDI4IEBAIGJvb2wgRG9jdW1l
bnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQoUmVzb3VyY2VMb2FkZXIqIGxvYWRlciwgY29u
c3QgUmVzb3VyY2VSCiAgICAgaWYgKCFhcmNoaXZlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK
KyAgICBib29sIGZhaWxMb2FkID0gZmFsc2U7CiAgICAgc3dpdGNoIChhcmNoaXZlLT50eXBlKCkp
IHsKICNpZiBFTkFCTEUoV0VCX0FSQ0hJVkUpCiAgICAgY2FzZSBBcmNoaXZlOjpXZWJBcmNoaXZl
OgogICAgICAgICAvLyBXZWJBcmNoaXZlRGVidWdNb2RlIG1lYW5zIHdlIGZhaWwgbG9hZHMgaW5z
dGVhZCBvZiB0cnlpbmcgdG8gZmV0Y2ggdGhlbSBmcm9tIHRoZSBuZXR3b3JrIGlmIHRoZXkncmUg
bm90IGluIHRoZSBhcmNoaXZlLgotICAgICAgICByZXR1cm4gbV9mcmFtZS0+c2V0dGluZ3MoKS0+
d2ViQXJjaGl2ZURlYnVnTW9kZUVuYWJsZWQoKSAmJiBBcmNoaXZlRmFjdG9yeTo6aXNBcmNoaXZl
TWltZVR5cGUocmVzcG9uc2VNSU1FVHlwZSgpKTsKKyAgICAgICAgZmFpbExvYWQgPSBtX2ZyYW1l
LT5zZXR0aW5ncygpLT53ZWJBcmNoaXZlRGVidWdNb2RlRW5hYmxlZCgpICYmIEFyY2hpdmVGYWN0
b3J5Ojppc0FyY2hpdmVNaW1lVHlwZShyZXNwb25zZU1JTUVUeXBlKCkpOworICAgICAgICBicmVh
azsKICNlbmRpZgogI2lmIEVOQUJMRShNSFRNTCkKICAgICBjYXNlIEFyY2hpdmU6Ok1IVE1MOgot
ICAgICAgICByZXR1cm4gdHJ1ZTsgLy8gQWx3YXlzIGZhaWwgdGhlIGxvYWQgZm9yIHJlc291cmNl
cyBub3QgaW5jbHVkZWQgaW4gdGhlIE1IVE1MLgorICAgICAgLy8gQWx3YXlzIGZhaWwgdGhlIGxv
YWQgZm9yIHJlc291cmNlcyBub3QgaW5jbHVkZWQgaW4gdGhlIE1IVE1MLgorICAgICAgICBmYWls
TG9hZCA9IHRydWU7CisgICAgICAgIGJyZWFrOwogI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAg
ICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKyAgICBpZiAoZmFpbExvYWQpIHsKKyAgICAgICAgbG9h
ZGVyLT5jYW5jZWwoKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBm
YWxzZTsKIH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCX0FSQ0hJVkUpCiAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwCmluZGV4IDI5
M2M5MjcxMTY0MmVkOWI3ODc1YzkyMTM4MTNkNWFkMDVkN2JlNDcuLmNhY2YwZDBkNjk5NjUwMDM2
NDI0NzhmZGUzNTU3MTI5MzEzM2Q0MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h
ZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcApAQCAtMTc4LDcgKzE3OCwxNCBAQCBQ
YXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gTUhUTUxBcmNoaXZlOjpnZW5lcmF0ZU1IVE1MRGF0YShQ
YWdlKiBwYWdlLCBib29sIHVzZUJpbgogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiQ29u
dGVudC1UeXBlOiAiKTsKICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQocmVzb3VyY2UubWlt
ZVR5cGUpOwogCi0gICAgICAgIGNvbnN0IGNoYXIqIGNvbnRlbnRFbmNvZGluZyA9IHVzZUJpbmFy
eUVuY29kaW5nID8gYmluYXJ5IDogYmFzZTY0OworICAgICAgICBjb25zdCBjaGFyKiBjb250ZW50
RW5jb2Rpbmc7CisgICAgICAgIGlmICh1c2VCaW5hcnlFbmNvZGluZykKKyAgICAgICAgICAgIGNv
bnRlbnRFbmNvZGluZyA9IGJpbmFyeTsKKyAgICAgICAgZWxzZSBpZiAoTUlNRVR5cGVSZWdpc3Ry
eTo6aXNTdXBwb3J0ZWRKYXZhU2NyaXB0TUlNRVR5cGUocmVzb3VyY2UubWltZVR5cGUpIHx8IE1J
TUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9uSW1hZ2VNSU1FVHlwZShyZXNvdXJjZS5taW1l
VHlwZSkpCisgICAgICAgICAgICBjb250ZW50RW5jb2RpbmcgPSBxdW90ZWRQcmludGFibGU7Cisg
ICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNvbnRlbnRFbmNvZGluZyA9IGJhc2U2NDsKKwogICAg
ICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiXHJcbkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6
ICIpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZChjb250ZW50RW5jb2RpbmcpOwogICAg
ICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiXHJcbkNvbnRlbnQtTG9jYXRpb246ICIpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>114163</attachid>
            <date>2011-11-08 15:24:37 -0800</date>
            <delta_ts>2011-11-09 23:36:42 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-71859-20111108152436.patch</filename>
            <type>text/plain</type>
            <size>2198</size>
            <attacher name="Jay Civelli">jcivelli</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTk2MTgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNWNlYThjOTE1NmFhYWM3
MjkzMDAxODMxZTNjMjUyMGUyNzBlMTU0Li4yZmRkNDFkNzIzMTZiY2NlOTZhNDgxMDdkZjdiMTAw
NmVjYTllNzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTEtMDggIEpheSBD
aXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCBwcm9ncmVzcyBs
b2FkIHJlcG9ydGluZyBmb3IgTUhUTUwgZG9jdW1lbnRzLgorCisgICAgICAgIE1IVE1MIGRvY3Vt
ZW50cyBjb250YWluaW5nIHJlZmVyZW5jZXMgdG8gcmVzb3VyY2VzIHRoZXkgZG9uJ3QgaW5jbHVk
ZQorICAgICAgICBuZXZlciBmaW5pc2ggbG9hZGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxODU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQpOgorCiAy
MDExLTExLTA4ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAg
IFRvd2FyZHMgOCBCaXQgU3RyaW5nczogVGVtcGxhdGl6ZSBKU0M6OlBhcnNlciBjbGFzcyBieSBM
ZXhlciB0eXBlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk
ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCBk
NTFjYTE0NjUzMGUwNDg1ZmZiMzk4MGI5OTRjNmEzODllZDA1NmE1Li4yMjdlYzVkMWJkZDg3MTkz
NGY2NTg2YWFkMWJkZmMxYjE4NmQ4YTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk
ZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu
dExvYWRlci5jcHAKQEAgLTYzNiwxOSArNjM2LDI4IEBAIGJvb2wgRG9jdW1lbnRMb2FkZXI6OnNj
aGVkdWxlQXJjaGl2ZUxvYWQoUmVzb3VyY2VMb2FkZXIqIGxvYWRlciwgY29uc3QgUmVzb3VyY2VS
CiAgICAgaWYgKCFhcmNoaXZlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBib29sIGZh
aWxMb2FkID0gZmFsc2U7CiAgICAgc3dpdGNoIChhcmNoaXZlLT50eXBlKCkpIHsKICNpZiBFTkFC
TEUoV0VCX0FSQ0hJVkUpCiAgICAgY2FzZSBBcmNoaXZlOjpXZWJBcmNoaXZlOgogICAgICAgICAv
LyBXZWJBcmNoaXZlRGVidWdNb2RlIG1lYW5zIHdlIGZhaWwgbG9hZHMgaW5zdGVhZCBvZiB0cnlp
bmcgdG8gZmV0Y2ggdGhlbSBmcm9tIHRoZSBuZXR3b3JrIGlmIHRoZXkncmUgbm90IGluIHRoZSBh
cmNoaXZlLgotICAgICAgICByZXR1cm4gbV9mcmFtZS0+c2V0dGluZ3MoKS0+d2ViQXJjaGl2ZURl
YnVnTW9kZUVuYWJsZWQoKSAmJiBBcmNoaXZlRmFjdG9yeTo6aXNBcmNoaXZlTWltZVR5cGUocmVz
cG9uc2VNSU1FVHlwZSgpKTsKKyAgICAgICAgZmFpbExvYWQgPSBtX2ZyYW1lLT5zZXR0aW5ncygp
LT53ZWJBcmNoaXZlRGVidWdNb2RlRW5hYmxlZCgpICYmIEFyY2hpdmVGYWN0b3J5Ojppc0FyY2hp
dmVNaW1lVHlwZShyZXNwb25zZU1JTUVUeXBlKCkpOworICAgICAgICBicmVhazsKICNlbmRpZgog
I2lmIEVOQUJMRShNSFRNTCkKICAgICBjYXNlIEFyY2hpdmU6Ok1IVE1MOgotICAgICAgICByZXR1
cm4gdHJ1ZTsgLy8gQWx3YXlzIGZhaWwgdGhlIGxvYWQgZm9yIHJlc291cmNlcyBub3QgaW5jbHVk
ZWQgaW4gdGhlIE1IVE1MLgorICAgICAgICAvLyBBbHdheXMgZmFpbCB0aGUgbG9hZCBmb3IgcmVz
b3VyY2VzIG5vdCBpbmNsdWRlZCBpbiB0aGUgTUhUTUwuCisgICAgICAgIGZhaWxMb2FkID0gdHJ1
ZTsKKyAgICAgICAgYnJlYWs7CiAjZW5kaWYKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4g
ZmFsc2U7CiAgICAgfQorICAgIGlmIChmYWlsTG9hZCkgeworICAgICAgICBsb2FkZXItPmNhbmNl
bCgpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOwogfQog
I2VuZGlmIC8vIEVOQUJMRShXRUJfQVJDSElWRSkKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>114442</attachid>
            <date>2011-11-09 23:36:46 -0800</date>
            <delta_ts>2012-06-06 18:13:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-71859-20111109233644.patch</filename>
            <type>text/plain</type>
            <size>13923</size>
            <attacher name="Jay Civelli">jcivelli</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTk3NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpvbGQgbW9kZSAxMDA3NTUKbmV3IG1v
ZGUgMTAwNjQ0CmluZGV4IDhiOTBmNjc2Y2MzN2RkOTMxYjc3MWRhOGQ3NGI5ZDYyYWZhY2E2NWEu
LjdjYWMyM2VmOGIxMWE2YTUyMDdjMDUzNGQ2NmIxYmMyMWI0YWI4YWMKLS0tIGEvU291cmNlL1dl
YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx
LDE2IEBACisyMDExLTExLTA5ICBKYXkgQ2l2ZWxsaSAgPGpjaXZlbGxpQGNocm9taXVtLm9yZz4K
KworICAgICAgICBGaXggcHJvZ3Jlc3MgbG9hZCByZXBvcnRpbmcgZm9yIE1IVE1MIGRvY3VtZW50
cy4KKworICAgICAgICBNSFRNTCBkb2N1bWVudHMgY29udGFpbmluZyByZWZlcmVuY2VzIHRvIHJl
c291cmNlcyB0aGV5IGRvbid0IGluY2x1ZGUKKyAgICAgICAgbmV2ZXIgZmluaXNoIGxvYWRpbmcu
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTg1OQor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVy
L0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpz
Y2hlZHVsZUFyY2hpdmVMb2FkKToKKwogMjAxMS0xMS0wOSAgS2VuIEJ1Y2hhbmFuICA8a2VucmJA
Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIEluZGVudGF0aW9uIGVycm9yIGluIFJlbmRlck9iamVj
dDo6Y29udGFpbmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv
ZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDRmMWZhMTU0MDUzM2Jl
MTRhNGY2ZTNhMGQ3MDZkMWFiOTQyODRhNTQuLjNlYmMwZDAxY2MyMGI5Y2UwOTdkNThmZDFhYzY0
MGNhZWM5ZjU2Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n
CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK
KzIwMTEtMTEtMDkgIEpheSBDaXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgorCisgICAg
ICAgIEZpeCBwcm9ncmVzcyBsb2FkIHJlcG9ydGluZyBmb3IgTUhUTUwgZG9jdW1lbnRzLgorCisg
ICAgICAgIE1IVE1MIGRvY3VtZW50cyBjb250YWluaW5nIHJlZmVyZW5jZXMgdG8gcmVzb3VyY2Vz
IHRoZXkgZG9uJ3QgaW5jbHVkZQorICAgICAgICBuZXZlciBmaW5pc2ggbG9hZGluZy4KKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxODU5CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9GcmFtZVRl
c3RIZWxwZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVUZXN0SGVscGVyczo6cmVnaXN0
ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVUZXN0SGVscGVy
czo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkKToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVUZXN0SGVs
cGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQpOgorICAgICAgICAqIHRlc3RzL0ZyYW1lVGVzdEhl
bHBlcnMuaDoKKyAgICAgICAgKiB0ZXN0cy9XZWJGcmFtZVRlc3QuY3BwOgorICAgICAgICAoV2Vi
S2l0OjpXZWJGcmFtZVRlc3Q6OnJlZ2lzdGVyTW9ja2VkSHR0cFVSTExvYWQpOgorICAgICAgICAo
V2ViS2l0OjpXZWJGcmFtZVRlc3Q6OnJlZ2lzdGVyTW9ja2VkQ2hyb21lVVJMTG9hZCk6CisgICAg
ICAgIChXZWJLaXQ6OlRFU1RfRik6CisgICAgICAgICogdGVzdHMvV2ViVmlld1Rlc3QuY3BwOgor
ICAgICAgICAoV2ViS2l0OjpURVNUX0YpOgorICAgICAgICAqIHRlc3RzL2RhdGEvcGFnZV93aXRo
X2ltYWdlLm1odDogQWRkZWQuCisKIDIwMTEtMTEtMDkgIEhlbnJpayBHcnVuZWxsICA8Z3J1bmVs
bEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkaW5nIG1pc3NpbmcgaW1wbGVtZW50YXRpb24g
b2YgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpsYWJlbCgpLgpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggZDUxY2ExNDY1MzBlMDQ4NWZmYjM5ODBiOTk0YzZh
Mzg5ZWQwNTZhNS4uMjI3ZWM1ZDFiZGQ4NzE5MzRmNjU4NmFhZDFiZGZjMWIxODZkOGE5MSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC02MzYsMTkgKzYzNiwy
OCBAQCBib29sIERvY3VtZW50TG9hZGVyOjpzY2hlZHVsZUFyY2hpdmVMb2FkKFJlc291cmNlTG9h
ZGVyKiBsb2FkZXIsIGNvbnN0IFJlc291cmNlUgogICAgIGlmICghYXJjaGl2ZSkKICAgICAgICAg
cmV0dXJuIGZhbHNlOwogCisgICAgYm9vbCBmYWlsTG9hZCA9IGZhbHNlOwogICAgIHN3aXRjaCAo
YXJjaGl2ZS0+dHlwZSgpKSB7CiAjaWYgRU5BQkxFKFdFQl9BUkNISVZFKQogICAgIGNhc2UgQXJj
aGl2ZTo6V2ViQXJjaGl2ZToKICAgICAgICAgLy8gV2ViQXJjaGl2ZURlYnVnTW9kZSBtZWFucyB3
ZSBmYWlsIGxvYWRzIGluc3RlYWQgb2YgdHJ5aW5nIHRvIGZldGNoIHRoZW0gZnJvbSB0aGUgbmV0
d29yayBpZiB0aGV5J3JlIG5vdCBpbiB0aGUgYXJjaGl2ZS4KLSAgICAgICAgcmV0dXJuIG1fZnJh
bWUtPnNldHRpbmdzKCktPndlYkFyY2hpdmVEZWJ1Z01vZGVFbmFibGVkKCkgJiYgQXJjaGl2ZUZh
Y3Rvcnk6OmlzQXJjaGl2ZU1pbWVUeXBlKHJlc3BvbnNlTUlNRVR5cGUoKSk7CisgICAgICAgIGZh
aWxMb2FkID0gbV9mcmFtZS0+c2V0dGluZ3MoKS0+d2ViQXJjaGl2ZURlYnVnTW9kZUVuYWJsZWQo
KSAmJiBBcmNoaXZlRmFjdG9yeTo6aXNBcmNoaXZlTWltZVR5cGUocmVzcG9uc2VNSU1FVHlwZSgp
KTsKKyAgICAgICAgYnJlYWs7CiAjZW5kaWYKICNpZiBFTkFCTEUoTUhUTUwpCiAgICAgY2FzZSBB
cmNoaXZlOjpNSFRNTDoKLSAgICAgICAgcmV0dXJuIHRydWU7IC8vIEFsd2F5cyBmYWlsIHRoZSBs
b2FkIGZvciByZXNvdXJjZXMgbm90IGluY2x1ZGVkIGluIHRoZSBNSFRNTC4KKyAgICAgICAgLy8g
QWx3YXlzIGZhaWwgdGhlIGxvYWQgZm9yIHJlc291cmNlcyBub3QgaW5jbHVkZWQgaW4gdGhlIE1I
VE1MLgorICAgICAgICBmYWlsTG9hZCA9IHRydWU7CisgICAgICAgIGJyZWFrOwogI2VuZGlmCiAg
ICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKyAgICBpZiAoZmFpbExv
YWQpIHsKKyAgICAgICAgbG9hZGVyLT5jYW5jZWwoKTsKKyAgICAgICAgcmV0dXJuIHRydWU7Cisg
ICAgfQorICAgIHJldHVybiBmYWxzZTsKIH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCX0FSQ0hJVkUp
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRnJhbWVUZXN0SGVs
cGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0ZyYW1lVGVzdEhlbHBlcnMu
Y3BwCmluZGV4IDIzMjU4NGJjYzhiZDQzOTc0MmRiN2EzNzIxOTdkZWI4YWNhZDNjOTUuLjFlNTI2
ZjZlNWRhYzI0N2IyZDk1Y2M5NDYwODI3ZTgwMmQyNmE5NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvY2hyb21pdW0vdGVzdHMvRnJhbWVUZXN0SGVscGVycy5jcHAKKysrIGIvU291cmNlL1dl
YktpdC9jaHJvbWl1bS90ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmNwcApAQCAtNDUsMTcgKzQ1LDIy
IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIG5hbWVzcGFjZSBGcmFtZVRlc3RIZWxwZXJzIHsKIAot
dm9pZCByZWdpc3Rlck1vY2tlZFVSTExvYWQoY29uc3Qgc3RkOjpzdHJpbmcmIGJhc2UsIGNvbnN0
IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSkKK3ZvaWQgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1M
KGNvbnN0IHN0ZDo6c3RyaW5nJiBiYXNlLCBjb25zdCBzdGQ6OnN0cmluZyYgZmlsZU5hbWUpCiB7
Ci0gICAgV2ViVVJMUmVzcG9uc2UgcmVzcG9uc2U7Ci0gICAgcmVzcG9uc2UuaW5pdGlhbGl6ZSgp
OwotICAgIHJlc3BvbnNlLnNldE1JTUVUeXBlKCJ0ZXh0L2h0bWwiKTsKKyAgICByZWdpc3Rlck1v
Y2tlZFVSTExvYWQoYmFzZSwgZmlsZU5hbWUsICJ0ZXh0L2h0bWwiKTsKK30KKwordm9pZCByZWdp
c3Rlck1vY2tlZFVSTExvYWQoY29uc3Qgc3RkOjpzdHJpbmcmIGJhc2UsIGNvbnN0IHN0ZDo6c3Ry
aW5nJiBmaWxlTmFtZSwgY29uc3Qgc3RkOjpzdHJpbmcmIG1pbWVUeXBlKQoreworICAgIEdVUkwg
dXJsKGJhc2UgKyBmaWxlTmFtZSk7CisgICAgV2ViVVJMUmVzcG9uc2UgcmVzcG9uc2UodXJsKTsK
KyAgICByZXNwb25zZS5zZXRNSU1FVHlwZShXZWJTdHJpbmc6OmZyb21VVEY4KG1pbWVUeXBlKSk7
CiAKICAgICBzdGQ6OnN0cmluZyBmaWxlUGF0aCA9IHdlYmtpdF9zdXBwb3J0OjpHZXRXZWJLaXRS
b290RGlyKCkudXRmOCgpOwogICAgIGZpbGVQYXRoICs9ICIvU291cmNlL1dlYktpdC9jaHJvbWl1
bS90ZXN0cy9kYXRhLyI7CiAgICAgZmlsZVBhdGggKz0gZmlsZU5hbWU7CiAKLSAgICB3ZWJraXRf
c3VwcG9ydDo6UmVnaXN0ZXJNb2NrZWRVUkwoR1VSTChiYXNlICsgZmlsZU5hbWUpLCByZXNwb25z
ZSwgV2ViU3RyaW5nOjpmcm9tVVRGOChmaWxlUGF0aCkpOworICAgIHdlYmtpdF9zdXBwb3J0OjpS
ZWdpc3Rlck1vY2tlZFVSTCh1cmwsIHJlc3BvbnNlLCBXZWJTdHJpbmc6OmZyb21VVEY4KGZpbGVQ
YXRoKSk7CiB9CiAKIHZvaWQgbG9hZEZyYW1lKFdlYkZyYW1lKiBmcmFtZSwgY29uc3Qgc3RkOjpz
dHJpbmcmIHVybCkKQEAgLTg0LDEyICs4OSwxNyBAQCBzdGF0aWMgV2ViVmlld0NsaWVudCogZGVm
YXVsdFdlYlZpZXdDbGllbnQoKQogICAgIHJldHVybiAmY2xpZW50OwogfQogCi1XZWJWaWV3KiBj
cmVhdGVXZWJWaWV3QW5kTG9hZChjb25zdCBzdGQ6OnN0cmluZyYgdXJsLCBib29sIGVuYWJsZUph
dmFzY3JpcHQsIFdlYkZyYW1lQ2xpZW50KiB3ZWJGcmFtZUNsaWVudCkKK1dlYlZpZXcqIGNyZWF0
ZVdlYlZpZXdBbmRMb2FkKGNvbnN0IHN0ZDo6c3RyaW5nJiB1cmwsIGJvb2wgZW5hYmxlSmF2YXNj
cmlwdCwgV2ViVmlld0NsaWVudCogd2ViVmlld0NsaWVudCwgV2ViRnJhbWVDbGllbnQqIHdlYkZy
YW1lQ2xpZW50KQogeworICAgIGlmICghd2ViVmlld0NsaWVudCkKKyAgICAgICAgd2ViVmlld0Ns
aWVudCA9IGRlZmF1bHRXZWJWaWV3Q2xpZW50KCk7CiAgICAgaWYgKCF3ZWJGcmFtZUNsaWVudCkK
ICAgICAgICAgd2ViRnJhbWVDbGllbnQgPSBkZWZhdWx0V2ViRnJhbWVDbGllbnQoKTsKLSAgICBX
ZWJWaWV3KiB3ZWJWaWV3ID0gV2ViVmlldzo6Y3JlYXRlKGRlZmF1bHRXZWJWaWV3Q2xpZW50KCkp
OwotICAgIHdlYlZpZXctPnNldHRpbmdzKCktPnNldEphdmFTY3JpcHRFbmFibGVkKGVuYWJsZUph
dmFzY3JpcHQpOworICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBXZWJWaWV3OjpjcmVhdGUod2ViVmll
d0NsaWVudCk7CisgICAgV2ViU2V0dGluZ3MqIHNldHRpbmdzID0gd2ViVmlldy0+c2V0dGluZ3Mo
KTsKKyAgICBzZXR0aW5ncy0+c2V0SW1hZ2VzRW5hYmxlZCh0cnVlKTsKKyAgICBzZXR0aW5ncy0+
c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KHRydWUpOworICAgIHNldHRpbmdzLT5zZXRKYXZh
U2NyaXB0RW5hYmxlZChlbmFibGVKYXZhc2NyaXB0KTsKICAgICB3ZWJWaWV3LT5pbml0aWFsaXpl
TWFpbkZyYW1lKHdlYkZyYW1lQ2xpZW50KTsKIAogICAgIGxvYWRGcmFtZSh3ZWJWaWV3LT5tYWlu
RnJhbWUoKSwgdXJsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv
RnJhbWVUZXN0SGVscGVycy5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GcmFtZVRl
c3RIZWxwZXJzLmgKaW5kZXggZDJjMWZhM2UxZTM0NWUzOTE2YmQ4NjMxMmVmNTVjNzljMjhlNzFi
ZS4uOTU1ODg5ZTM2ODRiOTUxOGQzNDMzZmM1OTQyMmNhOWVjZjRkYjBlMiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmgKKysrIGIvU291
cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmgKQEAgLTM4LDE0ICsz
OCwxNiBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIFdlYkZyYW1lOwogY2xhc3MgV2ViRnJh
bWVDbGllbnQ7CiBjbGFzcyBXZWJWaWV3OworY2xhc3MgV2ViVmlld0NsaWVudDsKIAogbmFtZXNw
YWNlIEZyYW1lVGVzdEhlbHBlcnMgewogCi12b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChjb25z
dCBzdGQ6OnN0cmluZyYgYmFzZSwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKTsKK3ZvaWQg
cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKGNvbnN0IHN0ZDo6c3RyaW5nJiBiYXNlLCBjb25z
dCBzdGQ6OnN0cmluZyYgZmlsZU5hbWUpOwordm9pZCByZWdpc3Rlck1vY2tlZFVSTExvYWQoY29u
c3Qgc3RkOjpzdHJpbmcmIGJhc2UsIGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSwgY29uc3Qg
c3RkOjpzdHJpbmcmIG1pbWVUeXBlKTsKIAogdm9pZCBsb2FkRnJhbWUoV2ViRnJhbWUqLCBjb25z
dCBzdGQ6OnN0cmluZyYgdXJsKTsKIAotV2ViVmlldyogY3JlYXRlV2ViVmlld0FuZExvYWQoY29u
c3Qgc3RkOjpzdHJpbmcmIHVybCwgYm9vbCBlbmFibGVKYXZhc2NyaXB0ID0gZmFsc2UsIFdlYkZy
YW1lQ2xpZW50KiA9IDApOworV2ViVmlldyogY3JlYXRlV2ViVmlld0FuZExvYWQoY29uc3Qgc3Rk
OjpzdHJpbmcmIHVybCwgYm9vbCBlbmFibGVKYXZhc2NyaXB0ID0gZmFsc2UsIFdlYlZpZXdDbGll
bnQqICA9IDAsIFdlYkZyYW1lQ2xpZW50KiA9IDApOwogCiB9IC8vIG5hbWVzcGFjZSBGcmFtZVRl
c3RIZWxwZXJzCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p
dW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAppbmRleCAyYjJlYTc2MDE1YzQ2YmY3OTNiZmNmYTEy
MjJkYTM5OGYxMzdmNjE2Li4wMWY2MDljODFiNDVlMTBkOGYzNGFkNTM5ZDFmNTQxMDNhOWI3MWM5
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5j
cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCkBA
IC02NCwxMiArNjQsMTIgQEAgcHVibGljOgogCiAgICAgdm9pZCByZWdpc3Rlck1vY2tlZEh0dHBV
UkxMb2FkKGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSkKICAgICB7Ci0gICAgICAgIEZyYW1l
VGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZChtX2Jhc2VVUkwsIGZpbGVOYW1lKTsK
KyAgICAgICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKG1f
YmFzZVVSTCwgZmlsZU5hbWUpOwogICAgIH0KIAogICAgIHZvaWQgcmVnaXN0ZXJNb2NrZWRDaHJv
bWVVUkxMb2FkKGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSkKICAgICB7Ci0gICAgICAgIEZy
YW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZChtX2Nocm9tZVVSTCwgZmlsZU5h
bWUpOworICAgICAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1vY2tlZFVSTExvYWRBc0hU
TUwobV9jaHJvbWVVUkwsIGZpbGVOYW1lKTsKICAgICB9CiAKIHByb3RlY3RlZDoKQEAgLTE3NSw3
ICsxNzUsNyBAQCBURVNUX0YoV2ViRnJhbWVUZXN0LCBSZWxvYWREb2VzbnRTZXRSZWRpcmVjdCkK
ICAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJmb3JtLmh0bWwiKTsKIAogICAgIFRlc3RS
ZWxvYWREb2VzbnRSZWRpcmVjdFdlYkZyYW1lQ2xpZW50IHdlYkZyYW1lQ2xpZW50OwotICAgIFdl
YlZpZXcqIHdlYlZpZXcgPSBGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZCht
X2Jhc2VVUkwgKyAiZm9ybS5odG1sIiwgZmFsc2UsICZ3ZWJGcmFtZUNsaWVudCk7CisgICAgV2Vi
Vmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2FkKG1f
YmFzZVVSTCArICJmb3JtLmh0bWwiLCBmYWxzZSwgMCwgJndlYkZyYW1lQ2xpZW50KTsKIAogICAg
IHdlYlZpZXctPm1haW5GcmFtZSgpLT5yZWxvYWQodHJ1ZSk7CiAgICAgLy8gc3RhcnQgcmVsb2Fk
IGJlZm9yZSByZXF1ZXN0IGlzIGRlbGl2ZXJlZC4KQEAgLTI2OCw3ICsyNjgsNyBAQCBURVNUX0Yo
V2ViRnJhbWVUZXN0LCBDb250ZXh0Tm90aWZpY2F0aW9uc0xvYWRVbmxvYWQpCiAKICAgICAvLyBM
b2FkIGEgZnJhbWUgd2l0aCBhbiBpZnJhbWUsIG1ha2Ugc3VyZSB3ZSBnZXQgdGhlIHJpZ2h0IGNy
ZWF0ZSBub3RpZmljYXRpb25zLgogICAgIENvbnRleHRMaWZldGltZVRlc3RXZWJGcmFtZUNsaWVu
dCB3ZWJGcmFtZUNsaWVudDsKLSAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVy
czo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgImNvbnRleHRfbm90aWZpY2F0aW9u
c190ZXN0Lmh0bWwiLCB0cnVlLCAmd2ViRnJhbWVDbGllbnQpOworICAgIFdlYlZpZXcqIHdlYlZp
ZXcgPSBGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZChtX2Jhc2VVUkwgKyAi
Y29udGV4dF9ub3RpZmljYXRpb25zX3Rlc3QuaHRtbCIsIHRydWUsIDAsICZ3ZWJGcmFtZUNsaWVu
dCk7CiAKICAgICBXZWJGcmFtZSogbWFpbkZyYW1lID0gd2ViVmlldy0+bWFpbkZyYW1lKCk7CiAg
ICAgV2ViRnJhbWUqIGNoaWxkRnJhbWUgPSBtYWluRnJhbWUtPmZpcnN0Q2hpbGQoKTsKQEAgLTMw
Niw3ICszMDYsNyBAQCBURVNUX0YoV2ViRnJhbWVUZXN0LCBDb250ZXh0Tm90aWZpY2F0aW9uc1Jl
bG9hZCkKICAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJjb250ZXh0X25vdGlmaWNhdGlv
bnNfdGVzdF9mcmFtZS5odG1sIik7CiAKICAgICBDb250ZXh0TGlmZXRpbWVUZXN0V2ViRnJhbWVD
bGllbnQgd2ViRnJhbWVDbGllbnQ7Ci0gICAgV2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhl
bHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2FkKG1fYmFzZVVSTCArICJjb250ZXh0X25vdGlmaWNh
dGlvbnNfdGVzdC5odG1sIiwgdHJ1ZSwgJndlYkZyYW1lQ2xpZW50KTsKKyAgICBXZWJWaWV3KiB3
ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJM
ICsgImNvbnRleHRfbm90aWZpY2F0aW9uc190ZXN0Lmh0bWwiLCB0cnVlLCAwLCAmd2ViRnJhbWVD
bGllbnQpOwogCiAgICAgLy8gUmVmcmVzaCwgd2Ugc2hvdWxkIGdldCB0d28gcmVsZWFzZSBub3Rp
ZmljYXRpb25zIGFuZCB0d28gbW9yZSBjcmVhdGUgbm90aWZpY2F0aW9ucy4KICAgICB3ZWJWaWV3
LT5tYWluRnJhbWUoKS0+cmVsb2FkKGZhbHNlKTsKQEAgLTM0NSw3ICszNDUsNyBAQCBURVNUX0Yo
V2ViRnJhbWVUZXN0LCBDb250ZXh0Tm90aWZpY2F0aW9uc0lzb2xhdGVkV29ybGRzKQogICAgIHJl
Z2lzdGVyTW9ja2VkSHR0cFVSTExvYWQoImNvbnRleHRfbm90aWZpY2F0aW9uc190ZXN0X2ZyYW1l
Lmh0bWwiKTsKIAogICAgIENvbnRleHRMaWZldGltZVRlc3RXZWJGcmFtZUNsaWVudCB3ZWJGcmFt
ZUNsaWVudDsKLSAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRl
V2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgImNvbnRleHRfbm90aWZpY2F0aW9uc190ZXN0Lmh0
bWwiLCB0cnVlLCAmd2ViRnJhbWVDbGllbnQpOworICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBGcmFt
ZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZChtX2Jhc2VVUkwgKyAiY29udGV4dF9u
b3RpZmljYXRpb25zX3Rlc3QuaHRtbCIsIHRydWUsIDAsICZ3ZWJGcmFtZUNsaWVudCk7CiAKICAg
ICAvLyBBZGQgYW4gaXNvbGF0ZWQgd29ybGQuCiAgICAgd2ViRnJhbWVDbGllbnQucmVzZXQoKTsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViVmlld1Rlc3QuY3Bw
IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKaW5kZXggNjdm
MmIyZTc3OGFmZmYzMzI4NDY3ZTY4MmZmNjYyYWNhNzM2NGFlNi4uYTAwZTRhOTMzZWUyZDUwZDA5
OWY4NDEyYzhiYjdmNzY3ZjYwNDFhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1
bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0
cy9XZWJWaWV3VGVzdC5jcHAKQEAgLTM3LDYgKzM3LDcgQEAKICNpbmNsdWRlICJXZWJEb2N1bWVu
dC5oIgogI2luY2x1ZGUgIldlYkZyYW1lLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVJbXBsLmgiCisj
aW5jbHVkZSAiV2ViVmlld0NsaWVudC5oIgogI2luY2x1ZGUgPGd0ZXN0L2d0ZXN0Lmg+CiAjaW5j
bHVkZSA8d2Via2l0L3N1cHBvcnQvd2Via2l0X3N1cHBvcnQuaD4KIApAQCAtNjIsNyArNjMsNyBA
QCBwcm90ZWN0ZWQ6CiAKIFRFU1RfRihXZWJWaWV3VGVzdCwgRm9jdXNJc0luYWN0aXZlKQogewot
ICAgIEZyYW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZChtX2Jhc2VVUkwsICJ2
aXNpYmxlX2lmcmFtZS5odG1sIik7CisgICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2Nr
ZWRVUkxMb2FkQXNIVE1MKG1fYmFzZVVSTCwgInZpc2libGVfaWZyYW1lLmh0bWwiKTsKICAgICBX
ZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQo
bV9iYXNlVVJMICsgInZpc2libGVfaWZyYW1lLmh0bWwiKTsKIAogICAgIHdlYlZpZXctPnNldEZv
Y3VzKHRydWUpOwpAQCAtNzksNCArODAsNDEgQEAgVEVTVF9GKFdlYlZpZXdUZXN0LCBGb2N1c0lz
SW5hY3RpdmUpCiAgICAgd2ViVmlldy0+Y2xvc2UoKTsKIH0KIAorY2xhc3MgVGVzdFdlYlZpZXdD
bGllbnQgOiBwdWJsaWMgV2ViVmlld0NsaWVudCB7CitwdWJsaWM6CisgICAgVGVzdFdlYlZpZXdD
bGllbnQoKSA6IG1fZGlkU3RhcnRMb2FkaW5nKGZhbHNlKSwgbV9kaWRTdG9wTG9hZGluZyhmYWxz
ZSksIG1fbG9hZFByb2dyZXNzKDApIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRTdGFydExvYWRp
bmcoKSB7IG1fZGlkU3RhcnRMb2FkaW5nID0gdHJ1ZTsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRT
dG9wTG9hZGluZygpIHsgbV9kaWRTdG9wTG9hZGluZyA9IHRydWU7IH0KKyAgICB2aXJ0dWFsIHZv
aWQgZGlkQ2hhbmdlTG9hZFByb2dyZXNzKFdlYkZyYW1lKiwgZG91YmxlIGxvYWRQcm9ncmVzcykg
eyBtX2xvYWRQcm9ncmVzcyA9IGxvYWRQcm9ncmVzczsgfQorCisgICAgYm9vbCBsb2FkaW5nU3Rh
cnRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlkU3RhcnRMb2FkaW5nOyB9CisgICAgYm9vbCBsb2Fk
aW5nU3RvcHBlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlkU3RvcExvYWRpbmc7IH0KKyAgICBkb3Vi
bGUgbG9hZFByb2dyZXNzKCkgY29uc3QgeyByZXR1cm4gbV9sb2FkUHJvZ3Jlc3M7IH0KKworcHJp
dmF0ZToKKyAgICBib29sIG1fZGlkU3RhcnRMb2FkaW5nOworICAgIGJvb2wgbV9kaWRTdG9wTG9h
ZGluZzsKKyAgICBkb3VibGUgbV9sb2FkUHJvZ3Jlc3M7Cit9OworCitURVNUX0YoV2ViVmlld1Rl
c3QsIE1IVE1MV2l0aE1pc3NpbmdSZXNvdXJjZUZpbmlzaGVzTG9hZGluZykKK3sKKyAgICBUZXN0
V2ViVmlld0NsaWVudCB3ZWJWaWV3Q2xpZW50OworCisgICAgc3RkOjpzdHJpbmcgZmlsZU5hbWUg
PSAicGFnZV93aXRoX2ltYWdlLm1odCI7CisgICAgc3RkOjpzdHJpbmcgZmlsZURpciA9IHdlYmtp
dF9zdXBwb3J0OjpHZXRXZWJLaXRSb290RGlyKCkudXRmOCgpOworICAgIGZpbGVEaXIuYXBwZW5k
KCIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhLyIpOworICAgIC8vIE1ha2luZyBm
aWxlIGxvYWRpbmcgd29ya3MgaW4gdW5pdC10ZXN0cyB3b3VsZCByZXF1aXJlIHNvbWUgYWRkaXRp
b25hbCB3b3JrLgorICAgIC8vIE1vY2tpbmcgdGhlbSBhcyByZWd1bGFyIFVSTHMgd29ya3MgZmlu
ZSBpbiB0aGUgbWVhbnRpbWUuCisgICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRV
UkxMb2FkKCJmaWxlOi8vIiArIGZpbGVEaXIsIGZpbGVOYW1lLCAibXVsdGlwYXJ0L3JlbGF0ZWQi
KTsKKyAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmll
d0FuZExvYWQoImZpbGU6Ly8iICsgZmlsZURpciArIGZpbGVOYW1lLCB0cnVlLCAmd2ViVmlld0Ns
aWVudCk7CisKKyAgICBFWFBFQ1RfVFJVRSh3ZWJWaWV3Q2xpZW50LmxvYWRpbmdTdGFydGVkKCkp
OworICAgIEVYUEVDVF9UUlVFKHdlYlZpZXdDbGllbnQubG9hZGluZ1N0b3BwZWQoKSk7CisgICAg
RVhQRUNUX0VRKDEuMCwgd2ViVmlld0NsaWVudC5sb2FkUHJvZ3Jlc3MoKSk7CisKKyAgICAvLyBD
bG9zZSB0aGUgV2ViVmlldyBhZnRlciBjaGVja2luZyB0aGUgbG9hZGluZyBzdGF0ZSBhbmQgcHJv
Z3Jlc3MsIGFzIHRoZSBjbG9zZSgpIGNhbGwgdHJpZ2dlcnMgYSBzdG9wIGxvYWRpbmcgY2FsbGJh
Y2suCisgICAgd2ViVmlldy0+Y2xvc2UoKTsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhL3BhZ2Vfd2l0aF9pbWFnZS5taHQgYi9Tb3VyY2UvV2Vi
S2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvcGFnZV93aXRoX2ltYWdlLm1odApuZXcgZmlsZSBtb2Rl
IDEwMDc1NQppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43
MzVhNzk1YTViZjRkNDNmMzBmOGYyNjUwODEzNGIxOWI3ZjliMmNmCi0tLSAvZGV2L251bGwKKysr
IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhL3BhZ2Vfd2l0aF9pbWFnZS5taHQK
QEAgLTAsMCArMSwzMSBAQAorRnJvbTogPFNhdmVkIGJ5IFVuTUhUPg0KK1N1YmplY3Q6ID0/aXNv
LTIwMjItanA/Qj9VR0ZuWlNCM2FYUm9JSE54ZFdGeVpRPT0/PQ0KK0RhdGU6IFdlZCwgTWF5IDE4
IDIwMTEgMTY6Mzg6MzMgR01ULTA3MDANCitNSU1FLVZlcnNpb246IDEuMA0KK0NvbnRlbnQtVHlw
ZTogbXVsdGlwYXJ0L3JlbGF0ZWQ7DQorCWJvdW5kYXJ5PSItLS0tPV9OZXh0UGFydF8wMDBfMDAw
MF8wMkM4QTVFRS5EODk2Q0E2QiI7DQorCXR5cGU9InRleHQvaHRtbCINCisNCistLS0tLS09X05l
eHRQYXJ0XzAwMF8wMDAwXzAyQzhBNUVFLkQ4OTZDQTZCDQorQ29udGVudC1UeXBlOiB0ZXh0L2h0
bWw7IGNoYXJzZXQ9IklTTy04ODU5LTEiDQorQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogcXVv
dGVkLXByaW50YWJsZQ0KK0NvbnRlbnQtTG9jYXRpb246IGh0dHA6Ly9sb2NhbGhvc3QvcGFnZV93
aXRoX2ltYWdlLmh0bWwNCisNCis8aHRtbD48aGVhZD48bWV0YSBodHRwLWVxdWl2PTNEIkNvbnRl
bnQtVHlwZSIgY29udGVudD0zRCJ0ZXh0L2h0bWw7IGNoYXJzZXQ9DQorPTNEaXNvLTg4NTktMSI+
DQorDQorDQorPHRpdGxlPlBhZ2Ugd2l0aCBzcXVhcmU8L3RpdGxlPg0KKzxzY3JpcHQ+DQoraWYg
KHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgew0KKyAgbGF5b3V0VGVzdENvbnRyb2xsZXIu
ZHVtcEFzVGV4dCgpOw0KK30NCisNCis8L3NjcmlwdD4NCis8YmFzZSBocmVmPTNEImh0dHA6Ly9s
b2NhbGhvc3QvIj48L2Jhc2U+PC9oZWFkPjxib2R5Pg0KK1RoaXMgaXMgYSByZWQgc3F1YXJlOjxi
cj4NCis8aW1nIG9uZXJyb3I9M0QiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJiN4Mjc7ZXJyb3Im
I3gyNzspLmlubmVySFRNTCs9M0QmI3g9DQorMjc7RmFpbGVkIHRvIGxvYWQgaW1hZ2UhJiN4Mjc7
IiBzcmM9M0QicmVzb3VyY2VzL3JlZF9zcXVhcmUucG5nIj4NCis8ZGl2IGlkPTNEImVycm9yIj48
L2Rpdj4NCis8L2JvZHk+PC9odG1sPg0KKy0tLS0tLT1fTmV4dFBhcnRfMDAwXzAwMDBfMDJDOEE1
RUUuRDg5NkNBNkItLQ0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>146168</attachid>
            <date>2012-06-06 18:13:43 -0700</date>
            <delta_ts>2012-06-25 13:57:33 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-71859-20120606181343.patch</filename>
            <type>text/plain</type>
            <size>13042</size>
            <attacher name="Jay Civelli">jcivelli</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjE0MWExYjU3NjZkZjdh
ZWVjNzgyNmI0MDQ3ZDgwNWY3NTA2OWI3OS4uNGQ3Njc5N2I3YjNjOTAzN2MwODQwMDI3MDQwYjUw
NWJlMTFhNzhiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTA2ICBKYXkg
Q2l2ZWxsaSAgPGpjaXZlbGxpQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggcHJvZ3Jlc3Mg
bG9hZCByZXBvcnRpbmcgZm9yIE1IVE1MIGRvY3VtZW50cy4KKworICAgICAgICBNSFRNTCBkb2N1
bWVudHMgY29udGFpbmluZyByZWZlcmVuY2VzIHRvIHJlc291cmNlcyB0aGV5IGRvbid0IGluY2x1
ZGUKKyAgICAgICAgbmV2ZXIgZmluaXNoIGxvYWRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTg1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpzY2hlZHVsZUFyY2hpdmVMb2FkKToKKwog
MjAxMi0wNi0wNiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAg
PHJkYXI6Ly9wcm9ibGVtLzExNTc1MTEyPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTg4NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDZhZjkzOGJh
ZGY0NzNjYTkwMWFhMDkxNGYzNDI4ZGU2YWUyNjU4OTUuLjllM2Q3ZWQ1ODUwZWNiZjEwODUzNzBk
NDFlZjdiZDU5OTRmMTllNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh
bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs
NDAgQEAKKzIwMTItMDYtMDYgIEpheSBDaXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgor
CisgICAgICAgIEZpeCBwcm9ncmVzcyBsb2FkIHJlcG9ydGluZyBmb3IgTUhUTUwgZG9jdW1lbnRz
LgorCisgICAgICAgIE1IVE1MIGRvY3VtZW50cyBjb250YWluaW5nIHJlZmVyZW5jZXMgdG8gcmVz
b3VyY2VzIHRoZXkgZG9uJ3QgaW5jbHVkZQorICAgICAgICBuZXZlciBmaW5pc2ggbG9hZGluZy4K
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxODU5CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9F
dmVudExpc3RlbmVyVGVzdC5jcHA6CisgICAgICAgICogdGVzdHMvRnJhbWVUZXN0SGVscGVycy5j
cHA6CisgICAgICAgIChGcmFtZVRlc3RIZWxwZXJzKToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVU
ZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkKToKKyAgICAgICAgKFdlYktpdDo6RnJh
bWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKToKKyAgICAgICAgKFdl
YktpdDo6RnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQpOgorICAgICAgICAq
IHRlc3RzL0ZyYW1lVGVzdEhlbHBlcnMuaDoKKyAgICAgICAgKEZyYW1lVGVzdEhlbHBlcnMpOgor
ICAgICAgICAqIHRlc3RzL0xpc3RlbmVyTGVha1Rlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpM
aXN0ZW5lckxlYWtUZXN0OjpSdW5UZXN0KToKKyAgICAgICAgKiB0ZXN0cy9XZWJGcmFtZVRlc3Qu
Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVRlc3Q6OnJlZ2lzdGVyTW9ja2VkSHR0cFVS
TExvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVRlc3Q6OnJlZ2lzdGVyTW9ja2VkQ2hy
b21lVVJMTG9hZCk6CisgICAgICAgICogdGVzdHMvV2ViVmlld1Rlc3QuY3BwOgorICAgICAgICAo
V2ViS2l0OjpURVNUX0YpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3VGVzdDo6dGVzdEF1dG9S
ZXNpemUpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3VGVzdDo6dGVzdFRleHRJbnB1dFR5cGUp
OgorICAgICAgICAoVGVzdFdlYlZpZXdDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpUZXN0V2Vi
Vmlld0NsaWVudDo6VGVzdFdlYlZpZXdDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpUZXN0V2Vi
Vmlld0NsaWVudDo6ZGlkU3RhcnRMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6VGVzdFdlYlZp
ZXdDbGllbnQ6OmRpZFN0b3BMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6VGVzdFdlYlZpZXdD
bGllbnQ6OmRpZENoYW5nZUxvYWRQcm9ncmVzcyk6CisgICAgICAgIChXZWJLaXQ6OlRlc3RXZWJW
aWV3Q2xpZW50Ojpsb2FkaW5nU3RhcnRlZCk6CisgICAgICAgIChXZWJLaXQ6OlRlc3RXZWJWaWV3
Q2xpZW50Ojpsb2FkaW5nU3RvcHBlZCk6CisgICAgICAgIChXZWJLaXQ6OlRlc3RXZWJWaWV3Q2xp
ZW50Ojpsb2FkUHJvZ3Jlc3MpOgorICAgICAgICAoV2ViS2l0KToKKwogMjAxMi0wNi0wNiAgSmFt
ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0g
VW5yZXZpZXdlZCBidWlsZCBmaXgsIGFkZCBhbiBhcHBhcmVudGx5IHVzZWQgaW5jbHVkZSBvZiBP
d25BcnJheVB0ci5oIGJhY2sgdG8gR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmgKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IDMwMmE3YWQyODVkMTFlMWViMDM0
YWMwYWE3Y2E1MjJjZTliNmM5YWUuLjkzM2EwOWU4NDQ0OWQ5ZmNlNTQzNTZlOWUyYjkzMzZkNDMy
MjFhMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5j
cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAtNjg5
LDYgKzY4OSw5IEBAIGJvb2wgRG9jdW1lbnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQoUmVz
b3VyY2VMb2FkZXIqIGxvYWRlciwgY29uc3QgUmVzb3VyY2VSCiAjZW5kaWYKICNpZiBFTkFCTEUo
TUhUTUwpCiAgICAgY2FzZSBBcmNoaXZlOjpNSFRNTDoKKyAgICAgICAgLy8gU2NoZWR1bGUgdGhp
cyBsb2FkZXIgd2l0aG91dCBhIHJlc291cmNlIHNvIHRoYXQgcmVzb3VyY2UgY29tcGxldGlvbi9m
YWlsdXJlIG5vdGlmaWNhdGlvbnMgYXJlIHN0aWxsIGZpcmVkLgorICAgICAgICBtX3BlbmRpbmdT
dWJzdGl0dXRlUmVzb3VyY2VzLnNldChsb2FkZXIsIDApOworICAgICAgICBkZWxpdmVyU3Vic3Rp
dHV0ZVJlc291cmNlc0FmdGVyRGVsYXkoKTsKICAgICAgICAgcmV0dXJuIHRydWU7IC8vIEFsd2F5
cyBmYWlsIHRoZSBsb2FkIGZvciByZXNvdXJjZXMgbm90IGluY2x1ZGVkIGluIHRoZSBNSFRNTC4K
ICNlbmRpZgogICAgIGRlZmF1bHQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt
L3Rlc3RzL0V2ZW50TGlzdGVuZXJUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz
dHMvRXZlbnRMaXN0ZW5lclRlc3QuY3BwCmluZGV4IDc5OWFjNDAwN2M1YzkxZTYwNGZjNzNmZDZk
ZDljMDEyMGJhNGNkMmEuLjQ5MTZiNjUxMTE3NTNiY2Y5ZGE1NjYzZTQxZDA4ODI1ZmJkZGYwMTkg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRXZlbnRMaXN0ZW5lclRl
c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRXZlbnRMaXN0ZW5lclRl
c3QuY3BwCkBAIC03OCw3ICs3OCw3IEBAIHB1YmxpYzoKICAgICAgICAgc3RkOjpzdHJpbmcgYmFz
ZVVSTCgiaHR0cDovL3d3dy5leGFtcGxlLmNvbS8iKTsKICAgICAgICAgc3RkOjpzdHJpbmcgZmls
ZU5hbWUoImxpc3RlbmVyL211dGF0aW9uX2V2ZW50X2xpc3RlbmVyLmh0bWwiKTsKICAgICAgICAg
Ym9vbCBleGVjdXRlU2NyaXB0ID0gdHJ1ZTsKLSAgICAgICAgRnJhbWVUZXN0SGVscGVyczo6cmVn
aXN0ZXJNb2NrZWRVUkxMb2FkKGJhc2VVUkwsIGZpbGVOYW1lKTsKKyAgICAgICAgRnJhbWVUZXN0
SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKGJhc2VVUkwsIGZpbGVOYW1lKTsK
ICAgICAgICAgbV93ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExv
YWQoYmFzZVVSTCArIGZpbGVOYW1lLCBleGVjdXRlU2NyaXB0KTsKICAgICB9CiAKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRnJhbWVUZXN0SGVscGVycy5jcHAgYi9T
b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0ZyYW1lVGVzdEhlbHBlcnMuY3BwCmluZGV4IGU0
MDY0MTNkZDk1ZWIzMmMzZTAyYWEzNzUyNmEzM2M1NzMzZDI2OWIuLjZmYTM4M2U2NDBiMDcwZWMx
OTEwMjAxYmQyYTBkMzk3MWZkNDgwNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p
dW0vdGVzdHMvRnJhbWVUZXN0SGVscGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1
bS90ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmNwcApAQCAtNDYsMTYgKzQ2LDE2IEBACiBuYW1lc3Bh
Y2UgV2ViS2l0IHsKIG5hbWVzcGFjZSBGcmFtZVRlc3RIZWxwZXJzIHsKIAotdm9pZCByZWdpc3Rl
ck1vY2tlZFVSTExvYWQoY29uc3Qgc3RkOjpzdHJpbmcmIGJhc2UsIGNvbnN0IHN0ZDo6c3RyaW5n
JiBmaWxlTmFtZSkKKwordm9pZCByZWdpc3Rlck1vY2tlZFVSTExvYWQoY29uc3Qgc3RkOjpzdHJp
bmcmIGJhc2UsIGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSwgY29uc3Qgc3RkOjpzdHJpbmcm
IG1pbWVUeXBlKQogewotICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKGJhc2UgKyBmaWxl
TmFtZSksIGZpbGVOYW1lKTsKKyAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTChiYXNlICsg
ZmlsZU5hbWUpLCBmaWxlTmFtZSwgbWltZVR5cGUpOwogfQogCi12b2lkIHJlZ2lzdGVyTW9ja2Vk
VVJMTG9hZChHVVJMIHVybCwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKQordm9pZCByZWdp
c3Rlck1vY2tlZFVSTExvYWQoY29uc3QgR1VSTCYgdXJsLCBjb25zdCBzdGQ6OnN0cmluZyYgZmls
ZU5hbWUsIGNvbnN0IHN0ZDo6c3RyaW5nJiBtaW1lVHlwZSkKIHsKLSAgICBXZWJVUkxSZXNwb25z
ZSByZXNwb25zZTsKLSAgICByZXNwb25zZS5pbml0aWFsaXplKCk7Ci0gICAgcmVzcG9uc2Uuc2V0
TUlNRVR5cGUoInRleHQvaHRtbCIpOworICAgIFdlYlVSTFJlc3BvbnNlIHJlc3BvbnNlKHVybCk7
CisgICAgcmVzcG9uc2Uuc2V0TUlNRVR5cGUoV2ViU3RyaW5nOjpmcm9tVVRGOChtaW1lVHlwZSkp
OwogCiAgICAgc3RkOjpzdHJpbmcgZmlsZVBhdGggPSB3ZWJraXRfc3VwcG9ydDo6R2V0V2ViS2l0
Um9vdERpcigpLnV0ZjgoKTsKICAgICBmaWxlUGF0aCArPSAiL1NvdXJjZS9XZWJLaXQvY2hyb21p
dW0vdGVzdHMvZGF0YS8iOwpAQCAtNjQsNiArNjQsMTYgQEAgdm9pZCByZWdpc3Rlck1vY2tlZFVS
TExvYWQoR1VSTCB1cmwsIGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSkKICAgICB3ZWJraXRf
c3VwcG9ydDo6UmVnaXN0ZXJNb2NrZWRVUkwodXJsLCByZXNwb25zZSwgV2ViU3RyaW5nOjpmcm9t
VVRGOChmaWxlUGF0aCkpOwogfQogCit2b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZEFzSFRNTChj
b25zdCBzdGQ6OnN0cmluZyYgYmFzZSwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKQorewor
ICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZEFzSFRNTChHVVJMKGJhc2UgKyBmaWxlTmFtZSksIGZp
bGVOYW1lKTsKK30KKwordm9pZCByZWdpc3Rlck1vY2tlZFVSTExvYWRBc0hUTUwoY29uc3QgR1VS
TCYgdXJsLCBjb25zdCBzdGQ6OnN0cmluZyYgZmlsZU5hbWUpCit7CisgICAgcmVnaXN0ZXJNb2Nr
ZWRVUkxMb2FkKHVybCwgZmlsZU5hbWUsICJ0ZXh0L2h0bWwiKTsKK30KKwogdm9pZCBsb2FkRnJh
bWUoV2ViRnJhbWUqIGZyYW1lLCBjb25zdCBzdGQ6OnN0cmluZyYgdXJsKQogewogICAgIFdlYlVS
TFJlcXVlc3QgdXJsUmVxdWVzdDsKQEAgLTk3LDYgKzEwNyw4IEBAIFdlYlZpZXcqIGNyZWF0ZVdl
YlZpZXdBbmRMb2FkKGNvbnN0IHN0ZDo6c3RyaW5nJiB1cmwsIGJvb2wgZW5hYmxlSmF2YXNjcmlw
dCwgV2ViCiAgICAgaWYgKCF3ZWJWaWV3Q2xpZW50KQogICAgICAgICB3ZWJWaWV3Q2xpZW50ID0g
ZGVmYXVsdFdlYlZpZXdDbGllbnQoKTsKICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gV2ViVmlldzo6
Y3JlYXRlKHdlYlZpZXdDbGllbnQpOworICAgIHdlYlZpZXctPnNldHRpbmdzKCktPnNldEltYWdl
c0VuYWJsZWQodHJ1ZSk7CisgICAgd2ViVmlldy0+c2V0dGluZ3MoKS0+c2V0TG9hZHNJbWFnZXNB
dXRvbWF0aWNhbGx5KHRydWUpOwogICAgIHdlYlZpZXctPnNldHRpbmdzKCktPnNldEphdmFTY3Jp
cHRFbmFibGVkKGVuYWJsZUphdmFzY3JpcHQpOwogICAgIHdlYlZpZXctPmluaXRpYWxpemVNYWlu
RnJhbWUod2ViRnJhbWVDbGllbnQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3Rlc3RzL0ZyYW1lVGVzdEhlbHBlcnMuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz
dHMvRnJhbWVUZXN0SGVscGVycy5oCmluZGV4IGZjMmZhMmQzNjFiMDFlMGI4YWIzMTAyZDYwZTcw
NDJhMzBkMGUzOGMuLjlmNzMxNDI5YjFmNzdmNjI4Yzk3OTFhMzY1NjdkM2RiM2Q0YTZmNTQgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRnJhbWVUZXN0SGVscGVycy5o
CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRnJhbWVUZXN0SGVscGVycy5oCkBA
IC00NCw5ICs0NCwxMSBAQCBjbGFzcyBXZWJWaWV3Q2xpZW50OwogCiBuYW1lc3BhY2UgRnJhbWVU
ZXN0SGVscGVycyB7CiAKLXZvaWQgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKGNvbnN0IHN0ZDo6c3Ry
aW5nJiBiYXNlLCBjb25zdCBzdGQ6OnN0cmluZyYgZmlsZU5hbWUpOwordm9pZCByZWdpc3Rlck1v
Y2tlZFVSTExvYWRBc0hUTUwoY29uc3Qgc3RkOjpzdHJpbmcmIGJhc2UsIGNvbnN0IHN0ZDo6c3Ry
aW5nJiBmaWxlTmFtZSk7CiAvLyBMaWtlIHRoZSBwcmV2aW91cyBvdmVybG9hZCwgYnV0IGl0IGFs
bG93cyBtb3JlIGZsZXhpYmlsaXR5IGluIHRoZSB1cmwgc2luY2UgaXQgaXMgZ2l2ZW4gYnkgdGhl
IGNhbGxlci4KLXZvaWQgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwsIGNvbnN0IHN0ZDo6c3Ry
aW5nJiBmaWxlTmFtZSk7Cit2b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZEFzSFRNTChjb25zdCBH
VVJMJiwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKTsKK3ZvaWQgcmVnaXN0ZXJNb2NrZWRV
UkxMb2FkKGNvbnN0IHN0ZDo6c3RyaW5nJiBiYXNlLCBjb25zdCBzdGQ6OnN0cmluZyYgZmlsZU5h
bWUsIGNvbnN0IHN0ZDo6c3RyaW5nJiBtaW1lVHlwZSk7Cit2b2lkIHJlZ2lzdGVyTW9ja2VkVVJM
TG9hZChjb25zdCBHVVJMJiwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBzdGQ6
OnN0cmluZyYgbWltZVR5cGUpOwogCiB2b2lkIGxvYWRGcmFtZShXZWJGcmFtZSosIGNvbnN0IHN0
ZDo6c3RyaW5nJiB1cmwpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rl
c3RzL0xpc3RlbmVyTGVha1Rlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9M
aXN0ZW5lckxlYWtUZXN0LmNwcAppbmRleCA1ZTMyMWM3MGQ4YTY3ODBjYjMyMWUwODAyZTM4OWY5
ZTFkNTdlNzg3Li5kNmFjMjZhNzkyODczMzVkNzQzY2U4NjM4ZTUxYTEzMzg4NjM1ZGQ1IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xpc3RlbmVyTGVha1Rlc3QuY3Bw
CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTGlzdGVuZXJMZWFrVGVzdC5jcHAK
QEAgLTkwLDcgKzkwLDcgQEAgcHVibGljOgogICAgICAgICBzdGQ6OnN0cmluZyBiYXNlVVJMKCJo
dHRwOi8vd3d3LmV4YW1wbGUuY29tLyIpOwogICAgICAgICBzdGQ6OnN0cmluZyBmaWxlTmFtZShm
aWxlbmFtZSk7CiAgICAgICAgIGJvb2wgZXhlY3V0ZVNjcmlwdCA9IHRydWU7Ci0gICAgICAgIEZy
YW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZChiYXNlVVJMLCBmaWxlTmFtZSk7
CisgICAgICAgIEZyYW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZEFzSFRNTChi
YXNlVVJMLCBmaWxlTmFtZSk7CiAgICAgICAgIG1fd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6
OmNyZWF0ZVdlYlZpZXdBbmRMb2FkKGJhc2VVUkwgKyBmaWxlTmFtZSwgZXhlY3V0ZVNjcmlwdCk7
CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZy
YW1lVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5j
cHAKaW5kZXggNGFhOTA1Yzc4MGNkMmM4N2RjOTQwMzEzM2EyNjU1ZmEyMjNlOTA0Ni4uZWU5OTdj
NDZmMzBlYWJmNWRmM2UxMTFlYzA4NTY1OGQxN2ZjMzZjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv
Y2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcApAQCAtNzIsMTIgKzcyLDEyIEBAIHB1Ymxp
YzoKIAogICAgIHZvaWQgcmVnaXN0ZXJNb2NrZWRIdHRwVVJMTG9hZChjb25zdCBzdGQ6OnN0cmlu
ZyYgZmlsZU5hbWUpCiAgICAgewotICAgICAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1v
Y2tlZFVSTExvYWQobV9iYXNlVVJMLCBmaWxlTmFtZSk7CisgICAgICAgIEZyYW1lVGVzdEhlbHBl
cnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZEFzSFRNTChtX2Jhc2VVUkwsIGZpbGVOYW1lKTsKICAg
ICB9CiAKICAgICB2b2lkIHJlZ2lzdGVyTW9ja2VkQ2hyb21lVVJMTG9hZChjb25zdCBzdGQ6OnN0
cmluZyYgZmlsZU5hbWUpCiAgICAgewotICAgICAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rl
ck1vY2tlZFVSTExvYWQobV9jaHJvbWVVUkwsIGZpbGVOYW1lKTsKKyAgICAgICAgRnJhbWVUZXN0
SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKG1fY2hyb21lVVJMLCBmaWxlTmFt
ZSk7CiAgICAgfQogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3Rlc3RzL1dlYlZpZXdUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv
V2ViVmlld1Rlc3QuY3BwCmluZGV4IGFlZjVjOTRjZWFhYmIxMDQwMmE2ODJhZTJhYWFmMWZlZTRm
ZGMwMDguLjZkZTkyMjMwY2RiZDcwZmE3YjUyYjkxODVkNjYyODkyNDY5MzdkY2YgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViVmlld1Rlc3QuY3BwCisrKyBiL1Nv
dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViVmlld1Rlc3QuY3BwCkBAIC0xMTcsNyArMTE3
LDcgQEAgcHJvdGVjdGVkOgogCiBURVNUX0YoV2ViVmlld1Rlc3QsIEZvY3VzSXNJbmFjdGl2ZSkK
IHsKLSAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1vY2tlZFVSTExvYWQobV9iYXNlVVJM
LCAidmlzaWJsZV9pZnJhbWUuaHRtbCIpOworICAgIEZyYW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVy
TW9ja2VkVVJMTG9hZEFzSFRNTChtX2Jhc2VVUkwsICJ2aXNpYmxlX2lmcmFtZS5odG1sIik7CiAg
ICAgV2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRM
b2FkKG1fYmFzZVVSTCArICJ2aXNpYmxlX2lmcmFtZS5odG1sIik7CiAKICAgICB3ZWJWaWV3LT5z
ZXRGb2N1cyh0cnVlKTsKQEAgLTE0NSw3ICsxNDUsNyBAQCBURVNUX0YoV2ViVmlld1Rlc3QsIEZv
Y3VzSXNJbmFjdGl2ZSkKIAogVEVTVF9GKFdlYlZpZXdUZXN0LCBBY3RpdmVTdGF0ZSkKIHsKLSAg
ICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1vY2tlZFVSTExvYWQobV9iYXNlVVJMLCAidmlz
aWJsZV9pZnJhbWUuaHRtbCIpOworICAgIEZyYW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2Vk
VVJMTG9hZEFzSFRNTChtX2Jhc2VVUkwsICJ2aXNpYmxlX2lmcmFtZS5odG1sIik7CiAgICAgV2Vi
Vmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2FkKG1f
YmFzZVVSTCArICJ2aXNpYmxlX2lmcmFtZS5odG1sIik7CiAKICAgICBBU1NFUlRfVFJVRSh3ZWJW
aWV3KTsKQEAgLTE2OSw3ICsxNjksNyBAQCB2b2lkIFdlYlZpZXdUZXN0Ojp0ZXN0QXV0b1Jlc2l6
ZShjb25zdCBXZWJTaXplJiBtaW5BdXRvUmVzaXplLCBjb25zdCBXZWJTaXplJiBtYQogewogICAg
IEF1dG9SZXNpemVXZWJWaWV3Q2xpZW50IGNsaWVudDsKICAgICBzdGQ6OnN0cmluZyB1cmwgPSBt
X2Jhc2VVUkwgKyAic3BlY2lmeV9zaXplLmh0bWw/IiArIHBhZ2VXaWR0aCArICI6IiArIHBhZ2VI
ZWlnaHQ7Ci0gICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwo
dXJsKSwgInNwZWNpZnlfc2l6ZS5odG1sIik7CisgICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0
ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKEdVUkwodXJsKSwgInNwZWNpZnlfc2l6ZS5odG1sIik7CiAg
ICAgV2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRM
b2FkKHVybCwgdHJ1ZSwgMCwgJmNsaWVudCk7CiAgICAgY2xpZW50LnRlc3REYXRhKCkuc2V0V2Vi
Vmlldyh3ZWJWaWV3KTsKIApAQCAtMjY4LDcgKzI2OCw3IEBAIFRFU1RfRihXZWJWaWV3VGVzdCwg
QXV0b1Jlc2l6ZU1heFNpemUpCiAKIHZvaWQgV2ViVmlld1Rlc3Q6OnRlc3RUZXh0SW5wdXRUeXBl
KFdlYlRleHRJbnB1dFR5cGUgZXhwZWN0ZWRUeXBlLCBjb25zdCBzdGQ6OnN0cmluZyYgaHRtbEZp
bGUpCiB7Ci0gICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkKG1fYmFz
ZVVSTCwgaHRtbEZpbGUpOworICAgIEZyYW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJM
TG9hZEFzSFRNTChtX2Jhc2VVUkwsIGh0bWxGaWxlKTsKICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0g
RnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgaHRtbEZp
bGUpOwogICAgIHdlYlZpZXctPnNldEluaXRpYWxGb2N1cyhmYWxzZSk7CiAgICAgRVhQRUNUX0VR
KGV4cGVjdGVkVHlwZSwgd2ViVmlldy0+dGV4dElucHV0VHlwZSgpKTsKQEAgLTMwNiw0ICszMDYs
NDIgQEAgVEVTVF9GKFdlYlZpZXdUZXN0LCBESVNBQkxFRF9UZXh0SW5wdXRUeXBlKQogCiB9CiAK
K2NsYXNzIFRlc3RXZWJWaWV3Q2xpZW50IDogcHVibGljIFdlYlZpZXdDbGllbnQgeworcHVibGlj
OgorICAgIFRlc3RXZWJWaWV3Q2xpZW50KCkgOiBtX2RpZFN0YXJ0TG9hZGluZyhmYWxzZSksIG1f
ZGlkU3RvcExvYWRpbmcoZmFsc2UpLCBtX2xvYWRQcm9ncmVzcygwKSB7IH0KKyAgICB2aXJ0dWFs
IHZvaWQgZGlkU3RhcnRMb2FkaW5nKCkgeyBtX2RpZFN0YXJ0TG9hZGluZyA9IHRydWU7IH0KKyAg
ICB2aXJ0dWFsIHZvaWQgZGlkU3RvcExvYWRpbmcoKSB7IG1fZGlkU3RvcExvYWRpbmcgPSB0cnVl
OyB9CisgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUxvYWRQcm9ncmVzcyhXZWJGcmFtZSosIGRv
dWJsZSBsb2FkUHJvZ3Jlc3MpIHsgbV9sb2FkUHJvZ3Jlc3MgPSBsb2FkUHJvZ3Jlc3M7IH0KKwor
ICAgIGJvb2wgbG9hZGluZ1N0YXJ0ZWQoKSBjb25zdCB7IHJldHVybiBtX2RpZFN0YXJ0TG9hZGlu
ZzsgfQorICAgIGJvb2wgbG9hZGluZ1N0b3BwZWQoKSBjb25zdCB7IHJldHVybiBtX2RpZFN0b3BM
b2FkaW5nOyB9CisgICAgZG91YmxlIGxvYWRQcm9ncmVzcygpIGNvbnN0IHsgcmV0dXJuIG1fbG9h
ZFByb2dyZXNzOyB9CisKK3ByaXZhdGU6CisgICAgYm9vbCBtX2RpZFN0YXJ0TG9hZGluZzsKKyAg
ICBib29sIG1fZGlkU3RvcExvYWRpbmc7CisgICAgZG91YmxlIG1fbG9hZFByb2dyZXNzOworfTsK
KworVEVTVF9GKFdlYlZpZXdUZXN0LCBNSFRNTFdpdGhNaXNzaW5nUmVzb3VyY2VGaW5pc2hlc0xv
YWRpbmcpCit7CisgICAgVGVzdFdlYlZpZXdDbGllbnQgd2ViVmlld0NsaWVudDsKKworICAgIHN0
ZDo6c3RyaW5nIGZpbGVOYW1lID0gInBhZ2Vfd2l0aF9pbWFnZS5taHQiOworICAgIHN0ZDo6c3Ry
aW5nIGZpbGVEaXIgPSB3ZWJraXRfc3VwcG9ydDo6R2V0V2ViS2l0Um9vdERpcigpLnV0ZjgoKTsK
KyAgICBmaWxlRGlyLmFwcGVuZCgiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS8i
KTsKKyAgICAvLyBNYWtpbmcgZmlsZSBsb2FkaW5nIHdvcmtzIGluIHVuaXQtdGVzdHMgd291bGQg
cmVxdWlyZSBzb21lIGFkZGl0aW9uYWwgd29yay4KKyAgICAvLyBNb2NraW5nIHRoZW0gYXMgcmVn
dWxhciBVUkxzIHdvcmtzIGZpbmUgaW4gdGhlIG1lYW50aW1lLgorICAgIEZyYW1lVGVzdEhlbHBl
cnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZCgiZmlsZTovLyIgKyBmaWxlRGlyLCBmaWxlTmFtZSwg
Im11bHRpcGFydC9yZWxhdGVkIik7CisgICAgV2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhl
bHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2FkKCJmaWxlOi8vIiArIGZpbGVEaXIgKyBmaWxlTmFt
ZSwgdHJ1ZSwgMCwgJndlYlZpZXdDbGllbnQpOworICAgIHdlYmtpdF9zdXBwb3J0OjpSdW5BbGxQ
ZW5kaW5nTWVzc2FnZXMoKTsKKworICAgIEVYUEVDVF9UUlVFKHdlYlZpZXdDbGllbnQubG9hZGlu
Z1N0YXJ0ZWQoKSk7CisgICAgRVhQRUNUX1RSVUUod2ViVmlld0NsaWVudC5sb2FkaW5nU3RvcHBl
ZCgpKTsKKyAgICBFWFBFQ1RfRVEoMS4wLCB3ZWJWaWV3Q2xpZW50LmxvYWRQcm9ncmVzcygpKTsK
KworICAgIC8vIENsb3NlIHRoZSBXZWJWaWV3IGFmdGVyIGNoZWNraW5nIHRoZSBsb2FkaW5nIHN0
YXRlIGFuZCBwcm9ncmVzcywgYXMgdGhlIGNsb3NlKCkgY2FsbCB0cmlnZ2VycyBhIHN0b3AgbG9h
ZGluZyBjYWxsYmFjay4KKyAgICB3ZWJWaWV3LT5jbG9zZSgpOworfQorCiB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>149348</attachid>
            <date>2012-06-25 13:57:43 -0700</date>
            <delta_ts>2012-06-25 18:12:21 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-71859-20120625135743.patch</filename>
            <type>text/plain</type>
            <size>14061</size>
            <attacher name="Jay Civelli">jcivelli</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg2MDcxOTRlOWQ4MmRm
OGY5ODJkNzRlNTk5ZWY5ODQyNTc4ODY3MS4uYTkyNGMwMjU4ZDliYzBiZTI0ZDRjM2NjNDI3YmE4
NjJhZGIyMTVhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTI1ICBKYXkg
Q2l2ZWxsaSAgPGpjaXZlbGxpQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggcHJvZ3Jlc3Mg
bG9hZCByZXBvcnRpbmcgZm9yIE1IVE1MIGRvY3VtZW50cy4KKworICAgICAgICBNSFRNTCBkb2N1
bWVudHMgY29udGFpbmluZyByZWZlcmVuY2VzIHRvIHJlc291cmNlcyB0aGV5IGRvbid0IGluY2x1
ZGUKKyAgICAgICAgbmV2ZXIgZmluaXNoIGxvYWRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTg1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5h
dGUgQ2hhcGluLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpzY2hlZHVsZUFyY2hpdmVMb2FkKToKKwogMjAx
Mi0wNi0yNSAgU2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg
UGx1bWIgU2Nyb2xsYmFyIGJ1dHRvbiBkaW1lbnNpb25zIGRvd24gdG8gV2ViVGhlbWVFbmdpbmUK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl
YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggODEzMjZjNTg0MTEyZmI4Y2Y2ZTUwNGUyZjk3
ZTM5Y2ZhYTBhOTUxOC4uYTEwM2QwNGYzYTdmNjZlNzk1ZmFhZDZkODIyM2Q0YmI2MzJlYTQwMSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNl
L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxMi0wNi0yNSAg
SmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IHByb2dy
ZXNzIGxvYWQgcmVwb3J0aW5nIGZvciBNSFRNTCBkb2N1bWVudHMuCisKKyAgICAgICAgTUhUTUwg
ZG9jdW1lbnRzIGNvbnRhaW5pbmcgcmVmZXJlbmNlcyB0byByZXNvdXJjZXMgdGhleSBkb24ndCBp
bmNsdWRlCisgICAgICAgIG5ldmVyIGZpbmlzaCBsb2FkaW5nLgorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE4NTkKKworICAgICAgICBSZXZpZXdlZCBi
eSBOYXRlIENoYXBpbi4KKworICAgICAgICAqIHRlc3RzL0V2ZW50TGlzdGVuZXJUZXN0LmNwcDoK
KyAgICAgICAgKiB0ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmNwcDoKKyAgICAgICAgKEZyYW1lVGVz
dEhlbHBlcnMpOgorICAgICAgICAoV2ViS2l0OjpGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1v
Y2tlZFVSTExvYWQpOgorICAgICAgICAoV2ViS2l0OjpGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rl
ck1vY2tlZFVSTExvYWRBc0hUTUwpOgorICAgICAgICAoV2ViS2l0OjpGcmFtZVRlc3RIZWxwZXJz
OjpjcmVhdGVXZWJWaWV3QW5kTG9hZCk6CisgICAgICAgICogdGVzdHMvRnJhbWVUZXN0SGVscGVy
cy5oOgorICAgICAgICAoRnJhbWVUZXN0SGVscGVycyk6CisgICAgICAgICogdGVzdHMvTGlzdGVu
ZXJMZWFrVGVzdC5jcHA6CisgICAgICAgIChXZWJLaXQ6Okxpc3RlbmVyTGVha1Rlc3Q6OlJ1blRl
c3QpOgorICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5jcHA6CisgICAgICAgIChXZWJLaXQ6
OldlYkZyYW1lVGVzdDo6cmVnaXN0ZXJNb2NrZWRIdHRwVVJMTG9hZCk6CisgICAgICAgIChXZWJL
aXQ6OldlYkZyYW1lVGVzdDo6cmVnaXN0ZXJNb2NrZWRDaHJvbWVVUkxMb2FkKToKKyAgICAgICAg
KiB0ZXN0cy9XZWJWaWV3VGVzdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlRFU1RfRik6CisgICAg
ICAgIChXZWJLaXQ6OldlYlZpZXdUZXN0Ojp0ZXN0QXV0b1Jlc2l6ZSk6CisgICAgICAgIChXZWJL
aXQ6OldlYlZpZXdUZXN0Ojp0ZXN0VGV4dElucHV0VHlwZSk6CisgICAgICAgIChUZXN0V2ViVmll
d0NsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OlRlc3RXZWJWaWV3Q2xpZW50OjpUZXN0V2ViVmll
d0NsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OlRlc3RXZWJWaWV3Q2xpZW50OjpkaWRTdGFydExv
YWRpbmcpOgorICAgICAgICAoV2ViS2l0OjpUZXN0V2ViVmlld0NsaWVudDo6ZGlkU3RvcExvYWRp
bmcpOgorICAgICAgICAoV2ViS2l0OjpUZXN0V2ViVmlld0NsaWVudDo6ZGlkQ2hhbmdlTG9hZFBy
b2dyZXNzKToKKyAgICAgICAgKFdlYktpdDo6VGVzdFdlYlZpZXdDbGllbnQ6OmxvYWRpbmdTdGFy
dGVkKToKKyAgICAgICAgKFdlYktpdDo6VGVzdFdlYlZpZXdDbGllbnQ6OmxvYWRpbmdTdG9wcGVk
KToKKyAgICAgICAgKFdlYktpdDo6VGVzdFdlYlZpZXdDbGllbnQ6OmxvYWRQcm9ncmVzcyk6Cisg
ICAgICAgIChXZWJLaXQpOgorCiAyMDEyLTA2LTI1ICBTY290dCBHcmFoYW0gIDxzY290dG1nQGNo
cm9taXVtLm9yZz4KIAogICAgICAgICBQbHVtYiBTY3JvbGxiYXIgYnV0dG9uIGRpbWVuc2lvbnMg
ZG93biB0byBXZWJUaGVtZUVuZ2luZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy
L0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl
ci5jcHAKaW5kZXggMzAyYTdhZDI4NWQxMWUxZWIwMzRhYzBhYTdjYTUyMmNlOWI2YzlhZS4uMWM0
ZGViZjlmOGQyN2Y4OTgzODdjNWMyZmFjMzQ0OWJlOTlhMDg4MyAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC02ODksNiArNjg5LDkgQEAgYm9vbCBEb2N1bWVu
dExvYWRlcjo6c2NoZWR1bGVBcmNoaXZlTG9hZChSZXNvdXJjZUxvYWRlciogbG9hZGVyLCBjb25z
dCBSZXNvdXJjZVIKICNlbmRpZgogI2lmIEVOQUJMRShNSFRNTCkKICAgICBjYXNlIEFyY2hpdmU6
Ok1IVE1MOgorICAgICAgICAvLyBTY2hlZHVsZSB0aGlzIGxvYWRlciB3aXRob3V0IGEgcmVzb3Vy
Y2Ugc28gdGhhdCByZXNvdXJjZSBjb21wbGV0aW9uL2ZhaWx1cmUgbm90aWZpY2F0aW9ucyBhcmUg
c3RpbGwgZmlyZWQgKHdoaWNoIHdpbGwgdHJpZ2dlciBhIGNhbGwgdG8gUmVzb3VyY2VMb2FkZXIu
ZGlkRmFpbCkuCisgICAgICAgIG1fcGVuZGluZ1N1YnN0aXR1dGVSZXNvdXJjZXMuc2V0KGxvYWRl
ciwgMCk7CisgICAgICAgIGRlbGl2ZXJTdWJzdGl0dXRlUmVzb3VyY2VzQWZ0ZXJEZWxheSgpOwog
ICAgICAgICByZXR1cm4gdHJ1ZTsgLy8gQWx3YXlzIGZhaWwgdGhlIGxvYWQgZm9yIHJlc291cmNl
cyBub3QgaW5jbHVkZWQgaW4gdGhlIE1IVE1MLgogI2VuZGlmCiAgICAgZGVmYXVsdDoKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRXZlbnRMaXN0ZW5lclRlc3QuY3Bw
IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9FdmVudExpc3RlbmVyVGVzdC5jcHAKaW5k
ZXggNzk5YWM0MDA3YzVjOTFlNjA0ZmM3M2ZkNmRkOWMwMTIwYmE0Y2QyYS4uNDkxNmI2NTExMTc1
M2JjZjlkYTU2NjNlNDFkMDg4MjVmYmRkZjAxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j
aHJvbWl1bS90ZXN0cy9FdmVudExpc3RlbmVyVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j
aHJvbWl1bS90ZXN0cy9FdmVudExpc3RlbmVyVGVzdC5jcHAKQEAgLTc4LDcgKzc4LDcgQEAgcHVi
bGljOgogICAgICAgICBzdGQ6OnN0cmluZyBiYXNlVVJMKCJodHRwOi8vd3d3LmV4YW1wbGUuY29t
LyIpOwogICAgICAgICBzdGQ6OnN0cmluZyBmaWxlTmFtZSgibGlzdGVuZXIvbXV0YXRpb25fZXZl
bnRfbGlzdGVuZXIuaHRtbCIpOwogICAgICAgICBib29sIGV4ZWN1dGVTY3JpcHQgPSB0cnVlOwot
ICAgICAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1vY2tlZFVSTExvYWQoYmFzZVVSTCwg
ZmlsZU5hbWUpOworICAgICAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1vY2tlZFVSTExv
YWRBc0hUTUwoYmFzZVVSTCwgZmlsZU5hbWUpOwogICAgICAgICBtX3dlYlZpZXcgPSBGcmFtZVRl
c3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZChiYXNlVVJMICsgZmlsZU5hbWUsIGV4ZWN1
dGVTY3JpcHQpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90
ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv
RnJhbWVUZXN0SGVscGVycy5jcHAKaW5kZXggZTQwNjQxM2RkOTVlYjMyYzNlMDJhYTM3NTI2YTMz
YzU3MzNkMjY5Yi4uNmZhMzgzZTY0MGIwNzBlYzE5MTAyMDFiZDJhMGQzOTcxZmQ0ODA1YSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmNw
cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0ZyYW1lVGVzdEhlbHBlcnMuY3Bw
CkBAIC00NiwxNiArNDYsMTYgQEAKIG5hbWVzcGFjZSBXZWJLaXQgewogbmFtZXNwYWNlIEZyYW1l
VGVzdEhlbHBlcnMgewogCi12b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChjb25zdCBzdGQ6OnN0
cmluZyYgYmFzZSwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKQorCit2b2lkIHJlZ2lzdGVy
TW9ja2VkVVJMTG9hZChjb25zdCBzdGQ6OnN0cmluZyYgYmFzZSwgY29uc3Qgc3RkOjpzdHJpbmcm
IGZpbGVOYW1lLCBjb25zdCBzdGQ6OnN0cmluZyYgbWltZVR5cGUpCiB7Ci0gICAgcmVnaXN0ZXJN
b2NrZWRVUkxMb2FkKEdVUkwoYmFzZSArIGZpbGVOYW1lKSwgZmlsZU5hbWUpOworICAgIHJlZ2lz
dGVyTW9ja2VkVVJMTG9hZChHVVJMKGJhc2UgKyBmaWxlTmFtZSksIGZpbGVOYW1lLCBtaW1lVHlw
ZSk7CiB9CiAKLXZvaWQgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwgdXJsLCBjb25zdCBzdGQ6
OnN0cmluZyYgZmlsZU5hbWUpCit2b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChjb25zdCBHVVJM
JiB1cmwsIGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSwgY29uc3Qgc3RkOjpzdHJpbmcmIG1p
bWVUeXBlKQogewotICAgIFdlYlVSTFJlc3BvbnNlIHJlc3BvbnNlOwotICAgIHJlc3BvbnNlLmlu
aXRpYWxpemUoKTsKLSAgICByZXNwb25zZS5zZXRNSU1FVHlwZSgidGV4dC9odG1sIik7CisgICAg
V2ViVVJMUmVzcG9uc2UgcmVzcG9uc2UodXJsKTsKKyAgICByZXNwb25zZS5zZXRNSU1FVHlwZShX
ZWJTdHJpbmc6OmZyb21VVEY4KG1pbWVUeXBlKSk7CiAKICAgICBzdGQ6OnN0cmluZyBmaWxlUGF0
aCA9IHdlYmtpdF9zdXBwb3J0OjpHZXRXZWJLaXRSb290RGlyKCkudXRmOCgpOwogICAgIGZpbGVQ
YXRoICs9ICIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhLyI7CkBAIC02NCw2ICs2
NCwxNiBAQCB2b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMIHVybCwgY29uc3Qgc3RkOjpz
dHJpbmcmIGZpbGVOYW1lKQogICAgIHdlYmtpdF9zdXBwb3J0OjpSZWdpc3Rlck1vY2tlZFVSTCh1
cmwsIHJlc3BvbnNlLCBXZWJTdHJpbmc6OmZyb21VVEY4KGZpbGVQYXRoKSk7CiB9CiAKK3ZvaWQg
cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKGNvbnN0IHN0ZDo6c3RyaW5nJiBiYXNlLCBjb25z
dCBzdGQ6OnN0cmluZyYgZmlsZU5hbWUpCit7CisgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNI
VE1MKEdVUkwoYmFzZSArIGZpbGVOYW1lKSwgZmlsZU5hbWUpOworfQorCit2b2lkIHJlZ2lzdGVy
TW9ja2VkVVJMTG9hZEFzSFRNTChjb25zdCBHVVJMJiB1cmwsIGNvbnN0IHN0ZDo6c3RyaW5nJiBm
aWxlTmFtZSkKK3sKKyAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQodXJsLCBmaWxlTmFtZSwgInRl
eHQvaHRtbCIpOworfQorCiB2b2lkIGxvYWRGcmFtZShXZWJGcmFtZSogZnJhbWUsIGNvbnN0IHN0
ZDo6c3RyaW5nJiB1cmwpCiB7CiAgICAgV2ViVVJMUmVxdWVzdCB1cmxSZXF1ZXN0OwpAQCAtOTcs
NiArMTA3LDggQEAgV2ViVmlldyogY3JlYXRlV2ViVmlld0FuZExvYWQoY29uc3Qgc3RkOjpzdHJp
bmcmIHVybCwgYm9vbCBlbmFibGVKYXZhc2NyaXB0LCBXZWIKICAgICBpZiAoIXdlYlZpZXdDbGll
bnQpCiAgICAgICAgIHdlYlZpZXdDbGllbnQgPSBkZWZhdWx0V2ViVmlld0NsaWVudCgpOwogICAg
IFdlYlZpZXcqIHdlYlZpZXcgPSBXZWJWaWV3OjpjcmVhdGUod2ViVmlld0NsaWVudCk7CisgICAg
d2ViVmlldy0+c2V0dGluZ3MoKS0+c2V0SW1hZ2VzRW5hYmxlZCh0cnVlKTsKKyAgICB3ZWJWaWV3
LT5zZXR0aW5ncygpLT5zZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkodHJ1ZSk7CiAgICAgd2Vi
Vmlldy0+c2V0dGluZ3MoKS0+c2V0SmF2YVNjcmlwdEVuYWJsZWQoZW5hYmxlSmF2YXNjcmlwdCk7
CiAgICAgd2ViVmlldy0+aW5pdGlhbGl6ZU1haW5GcmFtZSh3ZWJGcmFtZUNsaWVudCk7CiAKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRnJhbWVUZXN0SGVscGVycy5o
IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmgKaW5kZXgg
ZmMyZmEyZDM2MWIwMWUwYjhhYjMxMDJkNjBlNzA0MmEzMGQwZTM4Yy4uOWY3MzE0MjliMWY3N2Y2
MjhjOTc5MWEzNjU2N2QzZGIzZDRhNmY1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv
bWl1bS90ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1
bS90ZXN0cy9GcmFtZVRlc3RIZWxwZXJzLmgKQEAgLTQ0LDkgKzQ0LDExIEBAIGNsYXNzIFdlYlZp
ZXdDbGllbnQ7CiAKIG5hbWVzcGFjZSBGcmFtZVRlc3RIZWxwZXJzIHsKIAotdm9pZCByZWdpc3Rl
ck1vY2tlZFVSTExvYWQoY29uc3Qgc3RkOjpzdHJpbmcmIGJhc2UsIGNvbnN0IHN0ZDo6c3RyaW5n
JiBmaWxlTmFtZSk7Cit2b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZEFzSFRNTChjb25zdCBzdGQ6
OnN0cmluZyYgYmFzZSwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKTsKIC8vIExpa2UgdGhl
IHByZXZpb3VzIG92ZXJsb2FkLCBidXQgaXQgYWxsb3dzIG1vcmUgZmxleGliaWxpdHkgaW4gdGhl
IHVybCBzaW5jZSBpdCBpcyBnaXZlbiBieSB0aGUgY2FsbGVyLgotdm9pZCByZWdpc3Rlck1vY2tl
ZFVSTExvYWQoR1VSTCwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKTsKK3ZvaWQgcmVnaXN0
ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKGNvbnN0IEdVUkwmLCBjb25zdCBzdGQ6OnN0cmluZyYgZmls
ZU5hbWUpOwordm9pZCByZWdpc3Rlck1vY2tlZFVSTExvYWQoY29uc3Qgc3RkOjpzdHJpbmcmIGJh
c2UsIGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSwgY29uc3Qgc3RkOjpzdHJpbmcmIG1pbWVU
eXBlKTsKK3ZvaWQgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKGNvbnN0IEdVUkwmLCBjb25zdCBzdGQ6
OnN0cmluZyYgZmlsZU5hbWUsIGNvbnN0IHN0ZDo6c3RyaW5nJiBtaW1lVHlwZSk7CiAKIHZvaWQg
bG9hZEZyYW1lKFdlYkZyYW1lKiwgY29uc3Qgc3RkOjpzdHJpbmcmIHVybCk7CiAKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTGlzdGVuZXJMZWFrVGVzdC5jcHAgYi9T
b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xpc3RlbmVyTGVha1Rlc3QuY3BwCmluZGV4IDVl
MzIxYzcwZDhhNjc4MGNiMzIxZTA4MDJlMzg5ZjllMWQ1N2U3ODcuLmQ2YWMyNmE3OTI4NzMzNWQ3
NDNjZTg2MzhlNTFhMTMzODg2MzVkZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p
dW0vdGVzdHMvTGlzdGVuZXJMZWFrVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1
bS90ZXN0cy9MaXN0ZW5lckxlYWtUZXN0LmNwcApAQCAtOTAsNyArOTAsNyBAQCBwdWJsaWM6CiAg
ICAgICAgIHN0ZDo6c3RyaW5nIGJhc2VVUkwoImh0dHA6Ly93d3cuZXhhbXBsZS5jb20vIik7CiAg
ICAgICAgIHN0ZDo6c3RyaW5nIGZpbGVOYW1lKGZpbGVuYW1lKTsKICAgICAgICAgYm9vbCBleGVj
dXRlU2NyaXB0ID0gdHJ1ZTsKLSAgICAgICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2Nr
ZWRVUkxMb2FkKGJhc2VVUkwsIGZpbGVOYW1lKTsKKyAgICAgICAgRnJhbWVUZXN0SGVscGVyczo6
cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKGJhc2VVUkwsIGZpbGVOYW1lKTsKICAgICAgICAg
bV93ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQoYmFzZVVS
TCArIGZpbGVOYW1lLCBleGVjdXRlU2NyaXB0KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQv
Y2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAppbmRleCA0MDcwNTgwOGQ4NWJhMGRlMDA3
ODk4YWZlNmEyYzc2MTY1Y2MyNDQ0Li5iODg0NzMzMTcxZGUyN2RmZjAzOTQwNDBjOTYwODIyZjQ4
YzRkYWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1l
VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3Qu
Y3BwCkBAIC03MywxMiArNzMsMTIgQEAgcHVibGljOgogCiAgICAgdm9pZCByZWdpc3Rlck1vY2tl
ZEh0dHBVUkxMb2FkKGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSkKICAgICB7Ci0gICAgICAg
IEZyYW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZChtX2Jhc2VVUkwsIGZpbGVO
YW1lKTsKKyAgICAgICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNI
VE1MKG1fYmFzZVVSTCwgZmlsZU5hbWUpOwogICAgIH0KIAogICAgIHZvaWQgcmVnaXN0ZXJNb2Nr
ZWRDaHJvbWVVUkxMb2FkKGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSkKICAgICB7Ci0gICAg
ICAgIEZyYW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZChtX2Nocm9tZVVSTCwg
ZmlsZU5hbWUpOworICAgICAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1vY2tlZFVSTExv
YWRBc0hUTUwobV9jaHJvbWVVUkwsIGZpbGVOYW1lKTsKICAgICB9CiAKIHByb3RlY3RlZDoKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViVmlld1Rlc3QuY3BwIGIv
U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKaW5kZXggZjg1OGZl
N2I1ODFlN2IxODNjNGI0YmQ1YTMzNzI3NGJlMDYxOWM1OS4uYTZjOWUwNGM1ZTQ3YzBkOTc1NTJj
ZWM4NzY0NzM1MDA3NjQ1NmVlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90
ZXN0cy9XZWJWaWV3VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9X
ZWJWaWV3VGVzdC5jcHAKQEAgLTExNyw3ICsxMTcsNyBAQCBwcm90ZWN0ZWQ6CiAKIFRFU1RfRihX
ZWJWaWV3VGVzdCwgRm9jdXNJc0luYWN0aXZlKQogewotICAgIEZyYW1lVGVzdEhlbHBlcnM6OnJl
Z2lzdGVyTW9ja2VkVVJMTG9hZChtX2Jhc2VVUkwsICJ2aXNpYmxlX2lmcmFtZS5odG1sIik7Cisg
ICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKG1fYmFzZVVS
TCwgInZpc2libGVfaWZyYW1lLmh0bWwiKTsKICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVU
ZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgInZpc2libGVfaWZy
YW1lLmh0bWwiKTsKIAogICAgIHdlYlZpZXctPnNldEZvY3VzKHRydWUpOwpAQCAtMTQ1LDcgKzE0
NSw3IEBAIFRFU1RfRihXZWJWaWV3VGVzdCwgRm9jdXNJc0luYWN0aXZlKQogCiBURVNUX0YoV2Vi
Vmlld1Rlc3QsIEFjdGl2ZVN0YXRlKQogewotICAgIEZyYW1lVGVzdEhlbHBlcnM6OnJlZ2lzdGVy
TW9ja2VkVVJMTG9hZChtX2Jhc2VVUkwsICJ2aXNpYmxlX2lmcmFtZS5odG1sIik7CisgICAgRnJh
bWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKG1fYmFzZVVSTCwgInZp
c2libGVfaWZyYW1lLmh0bWwiKTsKICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVs
cGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgInZpc2libGVfaWZyYW1lLmh0
bWwiKTsKIAogICAgIEFTU0VSVF9UUlVFKHdlYlZpZXcpOwpAQCAtMTY5LDcgKzE2OSw3IEBAIHZv
aWQgV2ViVmlld1Rlc3Q6OnRlc3RBdXRvUmVzaXplKGNvbnN0IFdlYlNpemUmIG1pbkF1dG9SZXNp
emUsIGNvbnN0IFdlYlNpemUmIG1hCiB7CiAgICAgQXV0b1Jlc2l6ZVdlYlZpZXdDbGllbnQgY2xp
ZW50OwogICAgIHN0ZDo6c3RyaW5nIHVybCA9IG1fYmFzZVVSTCArICJzcGVjaWZ5X3NpemUuaHRt
bD8iICsgcGFnZVdpZHRoICsgIjoiICsgcGFnZUhlaWdodDsKLSAgICBGcmFtZVRlc3RIZWxwZXJz
OjpyZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCh1cmwpLCAic3BlY2lmeV9zaXplLmh0bWwiKTsK
KyAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1vY2tlZFVSTExvYWRBc0hUTUwoR1VSTCh1
cmwpLCAic3BlY2lmeV9zaXplLmh0bWwiKTsKICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVU
ZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQodXJsLCB0cnVlLCAwLCAmY2xpZW50KTsK
ICAgICBjbGllbnQudGVzdERhdGEoKS5zZXRXZWJWaWV3KHdlYlZpZXcpOwogCkBAIC0yNjgsNyAr
MjY4LDcgQEAgVEVTVF9GKFdlYlZpZXdUZXN0LCBBdXRvUmVzaXplTWF4U2l6ZSkKIAogdm9pZCBX
ZWJWaWV3VGVzdDo6dGVzdFRleHRJbnB1dFR5cGUoV2ViVGV4dElucHV0VHlwZSBleHBlY3RlZFR5
cGUsIGNvbnN0IHN0ZDo6c3RyaW5nJiBodG1sRmlsZSkKIHsKLSAgICBGcmFtZVRlc3RIZWxwZXJz
OjpyZWdpc3Rlck1vY2tlZFVSTExvYWQobV9iYXNlVVJMLCBodG1sRmlsZSk7CisgICAgRnJhbWVU
ZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKG1fYmFzZVVSTCwgaHRtbEZp
bGUpOwogICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJW
aWV3QW5kTG9hZChtX2Jhc2VVUkwgKyBodG1sRmlsZSk7CiAgICAgd2ViVmlldy0+c2V0SW5pdGlh
bEZvY3VzKGZhbHNlKTsKICAgICBFWFBFQ1RfRVEoZXhwZWN0ZWRUeXBlLCB3ZWJWaWV3LT50ZXh0
SW5wdXRUeXBlKCkpOwpAQCAtMzA4LDcgKzMwOCw3IEBAIFRFU1RfRihXZWJWaWV3VGVzdCwgRElT
QUJMRURfVGV4dElucHV0VHlwZSkKIAogVEVTVF9GKFdlYlZpZXdUZXN0LCBTZXRFZGl0YWJsZVNl
bGVjdGlvbk9mZnNldHMpCiB7Ci0gICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRV
UkxMb2FkKG1fYmFzZVVSTCwgImlucHV0X2ZpZWxkX3BvcHVsYXRlZC5odG1sIik7CisgICAgRnJh
bWVUZXN0SGVscGVyczo6cmVnaXN0ZXJNb2NrZWRVUkxMb2FkQXNIVE1MKG1fYmFzZVVSTCwgImlu
cHV0X2ZpZWxkX3BvcHVsYXRlZC5odG1sIik7CiAgICAgV2ViVmlldyogd2ViVmlldyA9IEZyYW1l
VGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2FkKG1fYmFzZVVSTCArICJpbnB1dF9maWVs
ZF9wb3B1bGF0ZWQuaHRtbCIpOwogICAgIHdlYlZpZXctPnNldEluaXRpYWxGb2N1cyhmYWxzZSk7
CiAgICAgd2ViVmlldy0+c2V0RWRpdGFibGVTZWxlY3Rpb25PZmZzZXRzKDUsIDEzKTsKQEAgLTMx
Niw3ICszMTYsNyBAQCBURVNUX0YoV2ViVmlld1Rlc3QsIFNldEVkaXRhYmxlU2VsZWN0aW9uT2Zm
c2V0cykKICAgICBFWFBFQ1RfRVEoIjU2Nzg5YWJjIiwgZnJhbWUtPnNlbGVjdGlvbkFzVGV4dCgp
KTsKICAgICB3ZWJWaWV3LT5jbG9zZSgpOwogCi0gICAgRnJhbWVUZXN0SGVscGVyczo6cmVnaXN0
ZXJNb2NrZWRVUkxMb2FkKG1fYmFzZVVSTCwgImNvbnRlbnRfZWRpdGFibGVfcG9wdWxhdGVkLmh0
bWwiKTsKKyAgICBGcmFtZVRlc3RIZWxwZXJzOjpyZWdpc3Rlck1vY2tlZFVSTExvYWRBc0hUTUwo
bV9iYXNlVVJMLCAiY29udGVudF9lZGl0YWJsZV9wb3B1bGF0ZWQuaHRtbCIpOwogICAgIHdlYlZp
ZXcgPSBGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZChtX2Jhc2VVUkwgKyAi
Y29udGVudF9lZGl0YWJsZV9wb3B1bGF0ZWQuaHRtbCIpOwogICAgIHdlYlZpZXctPnNldEluaXRp
YWxGb2N1cyhmYWxzZSk7CiAgICAgd2ViVmlldy0+c2V0RWRpdGFibGVTZWxlY3Rpb25PZmZzZXRz
KDgsIDE5KTsKQEAgLTMyNSw0ICszMjUsNDIgQEAgVEVTVF9GKFdlYlZpZXdUZXN0LCBTZXRFZGl0
YWJsZVNlbGVjdGlvbk9mZnNldHMpCiAgICAgd2ViVmlldy0+Y2xvc2UoKTsKIH0KIAorY2xhc3Mg
VGVzdFdlYlZpZXdDbGllbnQgOiBwdWJsaWMgV2ViVmlld0NsaWVudCB7CitwdWJsaWM6CisgICAg
VGVzdFdlYlZpZXdDbGllbnQoKSA6IG1fZGlkU3RhcnRMb2FkaW5nKGZhbHNlKSwgbV9kaWRTdG9w
TG9hZGluZyhmYWxzZSksIG1fbG9hZFByb2dyZXNzKDApIHsgfQorICAgIHZpcnR1YWwgdm9pZCBk
aWRTdGFydExvYWRpbmcoKSB7IG1fZGlkU3RhcnRMb2FkaW5nID0gdHJ1ZTsgfQorICAgIHZpcnR1
YWwgdm9pZCBkaWRTdG9wTG9hZGluZygpIHsgbV9kaWRTdG9wTG9hZGluZyA9IHRydWU7IH0KKyAg
ICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlTG9hZFByb2dyZXNzKFdlYkZyYW1lKiwgZG91YmxlIGxv
YWRQcm9ncmVzcykgeyBtX2xvYWRQcm9ncmVzcyA9IGxvYWRQcm9ncmVzczsgfQorCisgICAgYm9v
bCBsb2FkaW5nU3RhcnRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlkU3RhcnRMb2FkaW5nOyB9Cisg
ICAgYm9vbCBsb2FkaW5nU3RvcHBlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlkU3RvcExvYWRpbmc7
IH0KKyAgICBkb3VibGUgbG9hZFByb2dyZXNzKCkgY29uc3QgeyByZXR1cm4gbV9sb2FkUHJvZ3Jl
c3M7IH0KKworcHJpdmF0ZToKKyAgICBib29sIG1fZGlkU3RhcnRMb2FkaW5nOworICAgIGJvb2wg
bV9kaWRTdG9wTG9hZGluZzsKKyAgICBkb3VibGUgbV9sb2FkUHJvZ3Jlc3M7Cit9OworCitURVNU
X0YoV2ViVmlld1Rlc3QsIE1IVE1MV2l0aE1pc3NpbmdSZXNvdXJjZUZpbmlzaGVzTG9hZGluZykK
K3sKKyAgICBUZXN0V2ViVmlld0NsaWVudCB3ZWJWaWV3Q2xpZW50OworCisgICAgc3RkOjpzdHJp
bmcgZmlsZU5hbWUgPSAicGFnZV93aXRoX2ltYWdlLm1odCI7CisgICAgc3RkOjpzdHJpbmcgZmls
ZURpciA9IHdlYmtpdF9zdXBwb3J0OjpHZXRXZWJLaXRSb290RGlyKCkudXRmOCgpOworICAgIGZp
bGVEaXIuYXBwZW5kKCIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhLyIpOworICAg
IC8vIE1ha2luZyBmaWxlIGxvYWRpbmcgd29ya3MgaW4gdW5pdC10ZXN0cyB3b3VsZCByZXF1aXJl
IHNvbWUgYWRkaXRpb25hbCB3b3JrLgorICAgIC8vIE1vY2tpbmcgdGhlbSBhcyByZWd1bGFyIFVS
THMgd29ya3MgZmluZSBpbiB0aGUgbWVhbnRpbWUuCisgICAgRnJhbWVUZXN0SGVscGVyczo6cmVn
aXN0ZXJNb2NrZWRVUkxMb2FkKCJmaWxlOi8vIiArIGZpbGVEaXIsIGZpbGVOYW1lLCAibXVsdGlw
YXJ0L3JlbGF0ZWQiKTsKKyAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6
Y3JlYXRlV2ViVmlld0FuZExvYWQoImZpbGU6Ly8iICsgZmlsZURpciArIGZpbGVOYW1lLCB0cnVl
LCAwLCAmd2ViVmlld0NsaWVudCk7CisgICAgd2Via2l0X3N1cHBvcnQ6OlJ1bkFsbFBlbmRpbmdN
ZXNzYWdlcygpOworCisgICAgRVhQRUNUX1RSVUUod2ViVmlld0NsaWVudC5sb2FkaW5nU3RhcnRl
ZCgpKTsKKyAgICBFWFBFQ1RfVFJVRSh3ZWJWaWV3Q2xpZW50LmxvYWRpbmdTdG9wcGVkKCkpOwor
ICAgIEVYUEVDVF9FUSgxLjAsIHdlYlZpZXdDbGllbnQubG9hZFByb2dyZXNzKCkpOworCisgICAg
Ly8gQ2xvc2UgdGhlIFdlYlZpZXcgYWZ0ZXIgY2hlY2tpbmcgdGhlIGxvYWRpbmcgc3RhdGUgYW5k
IHByb2dyZXNzLCBhcyB0aGUgY2xvc2UoKSBjYWxsIHRyaWdnZXJzIGEgc3RvcCBsb2FkaW5nIGNh
bGxiYWNrLgorICAgIHdlYlZpZXctPmNsb3NlKCk7Cit9CisKIH0K
</data>

          </attachment>
      

    </bug>

</bugzilla>