<?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>59540</bug_id>
          
          <creation_ts>2011-04-26 14:47:29 -0700</creation_ts>
          <short_desc>REGRESSION: white overlay scrollbars on apple.com/startpage</short_desc>
          <delta_ts>2011-04-28 00:49:01 -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>Layout and Rendering</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</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>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jon Lee">jonlee</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>392772</commentid>
    <comment_count>0</comment_count>
    <who name="Jon Lee">jonlee</who>
    <bug_when>2011-04-26 14:47:29 -0700</bug_when>
    <thetext>&lt;rdar://problem/9338653&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>393116</commentid>
    <comment_count>1</comment_count>
      <attachid>91185</attachid>
    <who name="Jon Lee">jonlee</who>
    <bug_when>2011-04-26 17:02:17 -0700</bug_when>
    <thetext>Created attachment 91185
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>393125</commentid>
    <comment_count>2</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-04-26 17:03:59 -0700</bug_when>
    <thetext>Attachment 91185 did not pass style-queue:

Failed to run &quot;[&apos;Tools/Scripts/check-webkit-style&apos;, &apos;--diff-files&apos;, u&apos;Source/WebCore/ChangeLog&apos;, u&apos;Source/WebCor...&quot; exit_code: 1

Source/WebCore/ChangeLog:1:  ChangeLog entry has no bug number  [changelog/bugnumber] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>393153</commentid>
    <comment_count>3</comment_count>
      <attachid>91191</attachid>
    <who name="Jon Lee">jonlee</who>
    <bug_when>2011-04-26 17:13:11 -0700</bug_when>
    <thetext>Created attachment 91191
Patch

fix ChangeLog</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>393178</commentid>
    <comment_count>4</comment_count>
      <attachid>91191</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2011-04-26 17:27:49 -0700</bug_when>
    <thetext>Comment on attachment 91191
Patch

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

&gt; Source/WebCore/page/Frame.cpp:510
&gt; +    // &lt;https://bugs.webkit.org/show_bug.cgi?id=59540&gt; To find the aggregate background color
&gt; +    // of the document, we look at the background color of the document and the body, and blend
&gt; +    // them against the base background color of the frame view. Ideally we should include
&gt; +    // background images, but including them in this calculation is time-intensive,
&gt; +    // and would lead to unpredictable results.

I think this is too verbose (imagine if every change had such comments!).

&gt; Source/WebCore/page/Frame.cpp:530
&gt; +        return htmlBackgroundColor;

What if htmlBackgroundColor is transparent? Shouldn&apos;t this return the base background color?

&gt; Source/WebCore/page/Frame.cpp:534
&gt; +    if (!htmlBackgroundColor.isValid())
&gt; +        return bodyBackgroundColor;

bodyBackgroundColor may be transparent here also, so you you&apos;d need to return the baseBackgroundColor.

&gt; Source/WebCore/page/Frame.cpp:543
&gt; +    return view()-&gt;baseBackgroundColor().blend(htmlBackgroundColor.blend(bodyBackgroundColor));

Blend does linear interpolation, which is not the same as what is used for compositing. I think you want to combine them using the &quot;normal&quot; blend mode (aka Porter Duff&apos;s &quot;source over&quot;): R = S + D*(1 - Sa)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>394007</commentid>
    <comment_count>5</comment_count>
      <attachid>91386</attachid>
    <who name="Jon Lee">jonlee</who>
    <bug_when>2011-04-27 16:59:54 -0700</bug_when>
    <thetext>Created attachment 91386
Patch

Including the base background for short-circuit tests, and adding a comment in Color.h re: blend() function.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>394292</commentid>
    <comment_count>6</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-04-28 00:47:22 -0700</bug_when>
    <thetext>The commit-queue encountered the following flaky tests while processing attachment 91386:

http/tests/inspector/console-websocket-error.html bug 57392 (authors: pfeldman@chromium.org and yutak@chromium.org)
The commit-queue is continuing to process your patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>394293</commentid>
    <comment_count>7</comment_count>
      <attachid>91386</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-04-28 00:48:56 -0700</bug_when>
    <thetext>Comment on attachment 91386
Patch

Clearing flags on attachment: 91386

Committed r85171: &lt;http://trac.webkit.org/changeset/85171&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>394294</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-04-28 00:49:01 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>91185</attachid>
            <date>2011-04-26 17:02:17 -0700</date>
            <delta_ts>2011-04-26 17:13:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>0001-REGRESSION-white-overlay-scrollbars-on-apple.com-sta.patch</filename>
            <type>text/plain</type>
            <size>4672</size>
            <attacher name="Jon Lee">jonlee</attacher>
            
              <data encoding="base64">RnJvbSAxNzIyZGYyMjlmMjA2NmIyNWI5Mjg3NzkzZDE5NzlhMDgyMDFiOWUzIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gTGVlIDxqb25sZWVAYXBwbGUuY29tPgpEYXRlOiBUdWUs
IDI2IEFwciAyMDExIDE2OjU4OjAzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gUkVHUkVTU0lPTjog
d2hpdGUgb3ZlcmxheSBzY3JvbGxiYXJzIG9uIGFwcGxlLmNvbS9zdGFydHBhZ2UKIDxyZGFyOi8v
cHJvYmxlbS85MzM4NjUzPgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpOb3cgd2UgbG9v
ayBhdCB0aGUgZG9jdW1lbnQgYmFja2dyb3VuZCBpbiBhZGRpdGlvbiB0byB0aGUgPGJvZHk+IGVs
ZW1lbnQsCmFuZCBibGVuZCB0aG9zZSBjb2xvcnMgaW4gd2l0aCB0aGUgYmFzZSBiYWNrZ3JvdW5k
IG9mIHRoZSBmcmFtZSB2aWV3IHRvCmFycml2ZSBhdCBvdXIgYWdncmVnYXRlIGNvbG9yLiBUaGlz
IHByb3ZpZGVzIGEgYmV0dGVyIHJlc3VsdCB0byBkZXRlcm1pbmUKb3ZlcmxheSBzY3JvbGxiYXIg
c3R5bGUuCgoqIHBhZ2UvRnJhbWUuY3BwOgooV2ViQ29yZTo6RnJhbWU6OmdldERvY3VtZW50QmFj
a2dyb3VuZENvbG9yKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICB8ICAgMTUg
KysrKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgfCAgIDQ3ICsrKysr
KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNDcg
aW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGVlNjRiNTQuLjNj
N2U5MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv
V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMS0wNC0yNiAgSm9uIExlZSAg
PGpvbmxlZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgUkVHUkVTU0lPTjogd2hpdGUgb3ZlcmxheSBzY3JvbGxiYXJzIG9uIGFwcGxl
LmNvbS9zdGFydHBhZ2UKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkzMzg2NTM+CisgICAgICAg
IAorICAgICAgICBOb3cgd2UgbG9vayBhdCB0aGUgZG9jdW1lbnQgYmFja2dyb3VuZCBpbiBhZGRp
dGlvbiB0byB0aGUgPGJvZHk+IGVsZW1lbnQsCisgICAgICAgIGFuZCBibGVuZCB0aG9zZSBjb2xv
cnMgaW4gd2l0aCB0aGUgYmFzZSBiYWNrZ3JvdW5kIG9mIHRoZSBmcmFtZSB2aWV3IHRvCisgICAg
ICAgIGFycml2ZSBhdCBvdXIgYWdncmVnYXRlIGNvbG9yLiBUaGlzIHByb3ZpZGVzIGEgYmV0dGVy
IHJlc3VsdCB0byBkZXRlcm1pbmUKKyAgICAgICAgb3ZlcmxheSBzY3JvbGxiYXIgc3R5bGUuCisg
ICAgICAgIAorICAgICAgICAqIHBhZ2UvRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh
bWU6OmdldERvY3VtZW50QmFja2dyb3VuZENvbG9yKToKKwogMjAxMS0wNC0yNiAgQW50dGkgS29p
dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRlbGUgUGV0
ZXJzb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDVkYWFkMjQuLjJkYzFlMWEgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh
Z2UvRnJhbWUuY3BwCkBAIC01MDMsMjcgKzUwMyw0NCBAQCBTdHJpbmcgRnJhbWU6Om1hdGNoTGFi
ZWxzQWdhaW5zdEVsZW1lbnQoY29uc3QgVmVjdG9yPFN0cmluZz4mIGxhYmVscywgRWxlbWVudCog
ZQogICAgIAogQ29sb3IgRnJhbWU6OmdldERvY3VtZW50QmFja2dyb3VuZENvbG9yKCkgY29uc3QK
IHsKLSAgICAvLyBGSVhNRTogVGhpcyBpcyBhIGJhc2ljIGltcGxlbWVudGF0aW9uIGFkb3B0ZWQg
b3JpZ2luYWxseSBmcm9tIFdlYkZyYW1lLAotICAgIC8vIGJ1dCB1bHRpbWF0ZWx5IGlzIHdyb25n
LiBCb2R5IHBhaW50aW5nIHByb3BhZ2F0ZXMgdXAgdG8gdGhlIGRvY3VtZW50IChzZWUKLSAgICAv
LyBSZW5kZXJCb3g6OnBhaW50Um9vdEJveERlY29yYXRpb25zKCkpLCBzbyBjb2RlIGZyb20gdGhh
dCBtZXRob2Qgc2hvdWxkIGJlCi0gICAgLy8gYWRvcHRlZCBoZXJlIHRvIGdldCB0aGUgc3R5bGUg
dXNlZCB0byBwYWludCB0aGUgcm9vdCBiYWNrZ3JvdW5kLgorICAgIC8vIDxodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk1NDA+IFRvIGZpbmQgdGhlIGFnZ3JlZ2F0ZSBi
YWNrZ3JvdW5kIGNvbG9yCisgICAgLy8gb2YgdGhlIGRvY3VtZW50LCB3ZSBsb29rIGF0IHRoZSBi
YWNrZ3JvdW5kIGNvbG9yIG9mIHRoZSBkb2N1bWVudCBhbmQgdGhlIGJvZHksIGFuZCBibGVuZAor
ICAgIC8vIHRoZW0gYWdhaW5zdCB0aGUgYmFzZSBiYWNrZ3JvdW5kIGNvbG9yIG9mIHRoZSBmcmFt
ZSB2aWV3LiBJZGVhbGx5IHdlIHNob3VsZCBpbmNsdWRlCisgICAgLy8gYmFja2dyb3VuZCBpbWFn
ZXMsIGJ1dCBpbmNsdWRpbmcgdGhlbSBpbiB0aGlzIGNhbGN1bGF0aW9uIGlzIHRpbWUtaW50ZW5z
aXZlLAorICAgIC8vIGFuZCB3b3VsZCBsZWFkIHRvIHVucHJlZGljdGFibGUgcmVzdWx0cy4KIAot
ICAgIC8vIFJldHVybiBpbnZhbGlkIENvbG9yIG9iamVjdHMgaWYgd2UgYXJlIG5vdCBhYmxlIHRv
IG9idGFpbiB0aGUgY29sb3IKLSAgICAvLyBmb3Igd2hhdGV2ZXIgcmVhc29uLgorICAgIC8vIFJl
dHVybiBpbnZhbGlkIENvbG9yIG9iamVjdHMgd2hlbmV2ZXIgdGhlcmUgaXMgaW5zdWZmaWNpZW50
IGluZm9ybWF0aW9uLgogICAgIGlmICghbV9kb2MpCiAgICAgICAgIHJldHVybiBDb2xvcigpOwor
CisgICAgRWxlbWVudCogaHRtbEVsZW1lbnQgPSBtX2RvYy0+ZG9jdW1lbnRFbGVtZW50KCk7Cisg
ICAgRWxlbWVudCogYm9keUVsZW1lbnQgPSBtX2RvYy0+Ym9keSgpOworCisgICAgLy8gc3RhcnQg
YXMgaW52YWxpZCBjb2xvcnMKKyAgICBDb2xvciBodG1sQmFja2dyb3VuZENvbG9yOworICAgIENv
bG9yIGJvZHlCYWNrZ3JvdW5kQ29sb3I7CisgICAgaWYgKGh0bWxFbGVtZW50ICYmIGh0bWxFbGVt
ZW50LT5yZW5kZXJlcigpKQorICAgICAgICBodG1sQmFja2dyb3VuZENvbG9yID0gaHRtbEVsZW1l
bnQtPnJlbmRlcmVyKCktPnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0
eUJhY2tncm91bmRDb2xvcik7CisgICAgaWYgKGJvZHlFbGVtZW50ICYmIGJvZHlFbGVtZW50LT5y
ZW5kZXJlcigpKQorICAgICAgICBib2R5QmFja2dyb3VuZENvbG9yID0gYm9keUVsZW1lbnQtPnJl
bmRlcmVyKCktPnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJhY2tn
cm91bmRDb2xvcik7CiAgICAgCi0gICAgRWxlbWVudCogcm9vdEVsZW1lbnRUb1VzZSA9IG1fZG9j
LT5ib2R5KCk7Ci0gICAgaWYgKCFyb290RWxlbWVudFRvVXNlKQotICAgICAgICByb290RWxlbWVu
dFRvVXNlID0gbV9kb2MtPmRvY3VtZW50RWxlbWVudCgpOwotICAgIGlmICghcm9vdEVsZW1lbnRU
b1VzZSkKLSAgICAgICAgcmV0dXJuIENvbG9yKCk7CisgICAgaWYgKCFib2R5QmFja2dyb3VuZENv
bG9yLmlzVmFsaWQoKSkgeworICAgICAgICBpZiAoIWh0bWxCYWNrZ3JvdW5kQ29sb3IuaXNWYWxp
ZCgpKQorICAgICAgICAgICAgcmV0dXJuIENvbG9yKCk7CisgICAgICAgIHJldHVybiBodG1sQmFj
a2dyb3VuZENvbG9yOworICAgIH0KICAgICAKLSAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0g
cm9vdEVsZW1lbnRUb1VzZS0+cmVuZGVyZXIoKTsKLSAgICBpZiAoIXJlbmRlcmVyKQotICAgICAg
ICByZXR1cm4gQ29sb3IoKTsKKyAgICBpZiAoIWh0bWxCYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgp
KQorICAgICAgICByZXR1cm4gYm9keUJhY2tncm91bmRDb2xvcjsKICAgICAKLSAgICByZXR1cm4g
cmVuZGVyZXItPnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJhY2tn
cm91bmRDb2xvcik7CisgICAgLy8gV2UgdGFrZSB0aGUgYWdncmVnYXRlIG9mIHRoZSBiYXNlIGJh
Y2tncm91bmQgY29sb3IKKyAgICAvLyB0aGUgPGh0bWw+IGJhY2tncm91bmQgY29sb3IsIGFuZCB0
aGUgPGJvZHk+CisgICAgLy8gYmFja2dyb3VuZCBjb2xvciB0byBmaW5kIHRoZSBkb2N1bWVudCBj
b2xvci4gVGhlCisgICAgLy8gYWRkaXRpb24gb2YgdGhlIGJhc2UgYmFja2dyb3VuZCBjb2xvciBp
cyBub3QKKyAgICAvLyB0ZWNobmljYWxseSBwYXJ0IG9mIHRoZSBkb2N1bWVudCBiYWNrZ3JvdW5k
LCBidXQgaXQKKyAgICAvLyBvdGhlcndpc2UgcG9zZXMgcHJvYmxlbXMgd2hlbiB0aGUgYWdncmVn
YXRlIGlzIG5vdAorICAgIC8vIGZ1bGx5IG9wYXF1ZS4KKyAgICByZXR1cm4gdmlldygpLT5iYXNl
QmFja2dyb3VuZENvbG9yKCkuYmxlbmQoaHRtbEJhY2tncm91bmRDb2xvci5ibGVuZChib2R5QmFj
a2dyb3VuZENvbG9yKSk7CiB9CiAKIHZvaWQgRnJhbWU6OnNldFByaW50aW5nKGJvb2wgcHJpbnRp
bmcsIGNvbnN0IEZsb2F0U2l6ZSYgcGFnZVNpemUsIGZsb2F0IG1heGltdW1TaHJpbmtSYXRpbywg
QWRqdXN0Vmlld1NpemVPck5vdCBzaG91bGRBZGp1c3RWaWV3U2l6ZSkKLS0gCjEuNy40LjQKCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>91191</attachid>
            <date>2011-04-26 17:13:11 -0700</date>
            <delta_ts>2011-04-27 16:59:54 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>0001-REGRESSION-white-overlay-scrollbars-on-apple.com-sta.patch</filename>
            <type>text/plain</type>
            <size>4775</size>
            <attacher name="Jon Lee">jonlee</attacher>
            
              <data encoding="base64">RnJvbSA3NDBiYTUxYTMyYTlhOTUxMjVlMWNmMWVjOWY4NDJlMGEwNWE4ZTg0IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gTGVlIDxqb25sZWVAYXBwbGUuY29tPgpEYXRlOiBUdWUs
IDI2IEFwciAyMDExIDE2OjU4OjAzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gUkVHUkVTU0lPTjog
d2hpdGUgb3ZlcmxheSBzY3JvbGxiYXJzIG9uIGFwcGxlLmNvbS9zdGFydHBhZ2UKIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTU0MAogPHJkYXI6Ly9wcm9ibGVtLzkz
Mzg2NTM+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCk5vdyB3ZSBsb29rIGF0IHRoZSBk
b2N1bWVudCBiYWNrZ3JvdW5kIGluIGFkZGl0aW9uIHRvIHRoZSA8Ym9keT4gZWxlbWVudCwKYW5k
IGJsZW5kIHRob3NlIGNvbG9ycyBpbiB3aXRoIHRoZSBiYXNlIGJhY2tncm91bmQgb2YgdGhlIGZy
YW1lIHZpZXcgdG8KYXJyaXZlIGF0IG91ciBhZ2dyZWdhdGUgY29sb3IuIFRoaXMgcHJvdmlkZXMg
YSBiZXR0ZXIgcmVzdWx0IHRvIGRldGVybWluZQpvdmVybGF5IHNjcm9sbGJhciBzdHlsZS4KCiog
cGFnZS9GcmFtZS5jcHA6CihXZWJDb3JlOjpGcmFtZTo6Z2V0RG9jdW1lbnRCYWNrZ3JvdW5kQ29s
b3IpOgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgIHwgICAxNiArKysrKysrKysr
KysrKwogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgfCAgIDQ3ICsrKysrKysrKysrKysr
KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNDggaW5zZXJ0aW9u
cygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl
TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGVlNjRiNTQuLjgzMzMxYTggMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMS0wNC0yNiAgSm9uIExlZSAgPGpvbmxlZUBh
cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgUkVHUkVTU0lPTjogd2hpdGUgb3ZlcmxheSBzY3JvbGxiYXJzIG9uIGFwcGxlLmNvbS9zdGFy
dHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5
NTQwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MzM4NjUzPgorICAgICAgICAKKyAgICAgICAg
Tm93IHdlIGxvb2sgYXQgdGhlIGRvY3VtZW50IGJhY2tncm91bmQgaW4gYWRkaXRpb24gdG8gdGhl
IDxib2R5PiBlbGVtZW50LAorICAgICAgICBhbmQgYmxlbmQgdGhvc2UgY29sb3JzIGluIHdpdGgg
dGhlIGJhc2UgYmFja2dyb3VuZCBvZiB0aGUgZnJhbWUgdmlldyB0bworICAgICAgICBhcnJpdmUg
YXQgb3VyIGFnZ3JlZ2F0ZSBjb2xvci4gVGhpcyBwcm92aWRlcyBhIGJldHRlciByZXN1bHQgdG8g
ZGV0ZXJtaW5lCisgICAgICAgIG92ZXJsYXkgc2Nyb2xsYmFyIHN0eWxlLgorICAgICAgICAKKyAg
ICAgICAgKiBwYWdlL0ZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpnZXREb2N1
bWVudEJhY2tncm91bmRDb2xvcik6CisKIDIwMTEtMDQtMjYgIEFudHRpIEtvaXZpc3RvICA8YW50
dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkZWxlIFBldGVyc29uLgpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w
YWdlL0ZyYW1lLmNwcAppbmRleCA1ZGFhZDI0Li4yZGMxZTFhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNw
cApAQCAtNTAzLDI3ICs1MDMsNDQgQEAgU3RyaW5nIEZyYW1lOjptYXRjaExhYmVsc0FnYWluc3RF
bGVtZW50KGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBsYWJlbHMsIEVsZW1lbnQqIGUKICAgICAKIENv
bG9yIEZyYW1lOjpnZXREb2N1bWVudEJhY2tncm91bmRDb2xvcigpIGNvbnN0CiB7Ci0gICAgLy8g
RklYTUU6IFRoaXMgaXMgYSBiYXNpYyBpbXBsZW1lbnRhdGlvbiBhZG9wdGVkIG9yaWdpbmFsbHkg
ZnJvbSBXZWJGcmFtZSwKLSAgICAvLyBidXQgdWx0aW1hdGVseSBpcyB3cm9uZy4gQm9keSBwYWlu
dGluZyBwcm9wYWdhdGVzIHVwIHRvIHRoZSBkb2N1bWVudCAoc2VlCi0gICAgLy8gUmVuZGVyQm94
OjpwYWludFJvb3RCb3hEZWNvcmF0aW9ucygpKSwgc28gY29kZSBmcm9tIHRoYXQgbWV0aG9kIHNo
b3VsZCBiZQotICAgIC8vIGFkb3B0ZWQgaGVyZSB0byBnZXQgdGhlIHN0eWxlIHVzZWQgdG8gcGFp
bnQgdGhlIHJvb3QgYmFja2dyb3VuZC4KKyAgICAvLyA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTU5NTQwPiBUbyBmaW5kIHRoZSBhZ2dyZWdhdGUgYmFja2dyb3VuZCBj
b2xvcgorICAgIC8vIG9mIHRoZSBkb2N1bWVudCwgd2UgbG9vayBhdCB0aGUgYmFja2dyb3VuZCBj
b2xvciBvZiB0aGUgZG9jdW1lbnQgYW5kIHRoZSBib2R5LCBhbmQgYmxlbmQKKyAgICAvLyB0aGVt
IGFnYWluc3QgdGhlIGJhc2UgYmFja2dyb3VuZCBjb2xvciBvZiB0aGUgZnJhbWUgdmlldy4gSWRl
YWxseSB3ZSBzaG91bGQgaW5jbHVkZQorICAgIC8vIGJhY2tncm91bmQgaW1hZ2VzLCBidXQgaW5j
bHVkaW5nIHRoZW0gaW4gdGhpcyBjYWxjdWxhdGlvbiBpcyB0aW1lLWludGVuc2l2ZSwKKyAgICAv
LyBhbmQgd291bGQgbGVhZCB0byB1bnByZWRpY3RhYmxlIHJlc3VsdHMuCiAKLSAgICAvLyBSZXR1
cm4gaW52YWxpZCBDb2xvciBvYmplY3RzIGlmIHdlIGFyZSBub3QgYWJsZSB0byBvYnRhaW4gdGhl
IGNvbG9yCi0gICAgLy8gZm9yIHdoYXRldmVyIHJlYXNvbi4KKyAgICAvLyBSZXR1cm4gaW52YWxp
ZCBDb2xvciBvYmplY3RzIHdoZW5ldmVyIHRoZXJlIGlzIGluc3VmZmljaWVudCBpbmZvcm1hdGlv
bi4KICAgICBpZiAoIW1fZG9jKQogICAgICAgICByZXR1cm4gQ29sb3IoKTsKKworICAgIEVsZW1l
bnQqIGh0bWxFbGVtZW50ID0gbV9kb2MtPmRvY3VtZW50RWxlbWVudCgpOworICAgIEVsZW1lbnQq
IGJvZHlFbGVtZW50ID0gbV9kb2MtPmJvZHkoKTsKKworICAgIC8vIHN0YXJ0IGFzIGludmFsaWQg
Y29sb3JzCisgICAgQ29sb3IgaHRtbEJhY2tncm91bmRDb2xvcjsKKyAgICBDb2xvciBib2R5QmFj
a2dyb3VuZENvbG9yOworICAgIGlmIChodG1sRWxlbWVudCAmJiBodG1sRWxlbWVudC0+cmVuZGVy
ZXIoKSkKKyAgICAgICAgaHRtbEJhY2tncm91bmRDb2xvciA9IGh0bWxFbGVtZW50LT5yZW5kZXJl
cigpLT5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5k
Q29sb3IpOworICAgIGlmIChib2R5RWxlbWVudCAmJiBib2R5RWxlbWVudC0+cmVuZGVyZXIoKSkK
KyAgICAgICAgYm9keUJhY2tncm91bmRDb2xvciA9IGJvZHlFbGVtZW50LT5yZW5kZXJlcigpLT5z
dHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3Ip
OwogICAgIAotICAgIEVsZW1lbnQqIHJvb3RFbGVtZW50VG9Vc2UgPSBtX2RvYy0+Ym9keSgpOwot
ICAgIGlmICghcm9vdEVsZW1lbnRUb1VzZSkKLSAgICAgICAgcm9vdEVsZW1lbnRUb1VzZSA9IG1f
ZG9jLT5kb2N1bWVudEVsZW1lbnQoKTsKLSAgICBpZiAoIXJvb3RFbGVtZW50VG9Vc2UpCi0gICAg
ICAgIHJldHVybiBDb2xvcigpOworICAgIGlmICghYm9keUJhY2tncm91bmRDb2xvci5pc1ZhbGlk
KCkpIHsKKyAgICAgICAgaWYgKCFodG1sQmFja2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKKyAgICAg
ICAgICAgIHJldHVybiBDb2xvcigpOworICAgICAgICByZXR1cm4gaHRtbEJhY2tncm91bmRDb2xv
cjsKKyAgICB9CiAgICAgCi0gICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IHJvb3RFbGVtZW50
VG9Vc2UtPnJlbmRlcmVyKCk7Ci0gICAgaWYgKCFyZW5kZXJlcikKLSAgICAgICAgcmV0dXJuIENv
bG9yKCk7CisgICAgaWYgKCFodG1sQmFja2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAg
cmV0dXJuIGJvZHlCYWNrZ3JvdW5kQ29sb3I7CiAgICAgCi0gICAgcmV0dXJuIHJlbmRlcmVyLT5z
dHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3Ip
OworICAgIC8vIFdlIHRha2UgdGhlIGFnZ3JlZ2F0ZSBvZiB0aGUgYmFzZSBiYWNrZ3JvdW5kIGNv
bG9yCisgICAgLy8gdGhlIDxodG1sPiBiYWNrZ3JvdW5kIGNvbG9yLCBhbmQgdGhlIDxib2R5Pgor
ICAgIC8vIGJhY2tncm91bmQgY29sb3IgdG8gZmluZCB0aGUgZG9jdW1lbnQgY29sb3IuIFRoZQor
ICAgIC8vIGFkZGl0aW9uIG9mIHRoZSBiYXNlIGJhY2tncm91bmQgY29sb3IgaXMgbm90CisgICAg
Ly8gdGVjaG5pY2FsbHkgcGFydCBvZiB0aGUgZG9jdW1lbnQgYmFja2dyb3VuZCwgYnV0IGl0Cisg
ICAgLy8gb3RoZXJ3aXNlIHBvc2VzIHByb2JsZW1zIHdoZW4gdGhlIGFnZ3JlZ2F0ZSBpcyBub3QK
KyAgICAvLyBmdWxseSBvcGFxdWUuCisgICAgcmV0dXJuIHZpZXcoKS0+YmFzZUJhY2tncm91bmRD
b2xvcigpLmJsZW5kKGh0bWxCYWNrZ3JvdW5kQ29sb3IuYmxlbmQoYm9keUJhY2tncm91bmRDb2xv
cikpOwogfQogCiB2b2lkIEZyYW1lOjpzZXRQcmludGluZyhib29sIHByaW50aW5nLCBjb25zdCBG
bG9hdFNpemUmIHBhZ2VTaXplLCBmbG9hdCBtYXhpbXVtU2hyaW5rUmF0aW8sIEFkanVzdFZpZXdT
aXplT3JOb3Qgc2hvdWxkQWRqdXN0Vmlld1NpemUpCi0tIAoxLjcuNC40Cgo=
</data>
<flag name="review"
          id="83994"
          type_id="1"
          status="-"
          setter="simon.fraser"
    />
    <flag name="commit-queue"
          id="83995"
          type_id="3"
          status="-"
          setter="simon.fraser"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>91386</attachid>
            <date>2011-04-27 16:59:54 -0700</date>
            <delta_ts>2011-04-28 00:48:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>0001-REGRESSION-white-overlay-scrollbars-on-apple.com-sta.patch</filename>
            <type>text/plain</type>
            <size>5556</size>
            <attacher name="Jon Lee">jonlee</attacher>
            
              <data encoding="base64">RnJvbSBmYjkzNzZmMWJjNjY2YjZjMmQwNTA1Njc3NmNkY2FjNDY2MWIxZmY4IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gTGVlIDxqb25sZWVAYXBwbGUuY29tPgpEYXRlOiBUdWUs
IDI2IEFwciAyMDExIDE2OjU4OjAzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gUkVHUkVTU0lPTjog
d2hpdGUgb3ZlcmxheSBzY3JvbGxiYXJzIG9uIGFwcGxlLmNvbS9zdGFydHBhZ2UKIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTU0MAogPHJkYXI6Ly9wcm9ibGVtLzkz
Mzg2NTM+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCk5vdyB3ZSBsb29rIGF0IHRoZSBk
b2N1bWVudCBiYWNrZ3JvdW5kIGluIGFkZGl0aW9uIHRvIHRoZSA8Ym9keT4gZWxlbWVudCwKYW5k
IGJsZW5kIHRob3NlIGNvbG9ycyBpbiB3aXRoIHRoZSBiYXNlIGJhY2tncm91bmQgb2YgdGhlIGZy
YW1lIHZpZXcgdG8KYXJyaXZlIGF0IG91ciBhZ2dyZWdhdGUgY29sb3IuIFRoaXMgcHJvdmlkZXMg
YSBiZXR0ZXIgcmVzdWx0IHRvIGRldGVybWluZQpvdmVybGF5IHNjcm9sbGJhciBzdHlsZS4KCiog
cGFnZS9GcmFtZS5jcHA6CihXZWJDb3JlOjpGcmFtZTo6Z2V0RG9jdW1lbnRCYWNrZ3JvdW5kQ29s
b3IpOiBsb29rIHVwIHRoZSBjb2xvcnMgb24gdGhlIGh0bWwgYW5kIGJvZHkgZWxlbWVudCwgYW5k
IHByb3Blcmx5IGNvbXBvc2l0ZSB0aGVtLgoqIHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmg6IGEg
c2hvcnQgY29tbWVudCB0byBub3RlIHRoYXQgYmxlbmQoKSB1c2VzIHRoZSBQb3J0ZXItRHVmZiBz
b3VyY2Utb3ZlciBlcXVhdGlvbgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAg
ICAgICAgICAgfCAgIDE3ICsrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNw
cCAgICAgICAgICAgIHwgICA0NSArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIFNvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmggfCAgICAxICsKIDMgZmlsZXMgY2hh
bmdlZCwgNDggaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGI3
MDQ0ODAuLjZmN2U4ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wNC0yNyAg
Sm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTjogd2hpdGUgb3ZlcmxheSBzY3JvbGxiYXJz
IG9uIGFwcGxlLmNvbS9zdGFydHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTU5NTQwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MzM4NjUzPgor
CisgICAgICAgIE5vdyB3ZSBsb29rIGF0IHRoZSBkb2N1bWVudCBiYWNrZ3JvdW5kIGluIGFkZGl0
aW9uIHRvIHRoZSA8Ym9keT4gZWxlbWVudCwKKyAgICAgICAgYW5kIGJsZW5kIHRob3NlIGNvbG9y
cyBpbiB3aXRoIHRoZSBiYXNlIGJhY2tncm91bmQgb2YgdGhlIGZyYW1lIHZpZXcgdG8KKyAgICAg
ICAgYXJyaXZlIGF0IG91ciBhZ2dyZWdhdGUgY29sb3IuIFRoaXMgcHJvdmlkZXMgYSBiZXR0ZXIg
cmVzdWx0IHRvIGRldGVybWluZQorICAgICAgICBvdmVybGF5IHNjcm9sbGJhciBzdHlsZS4KKwor
ICAgICAgICAqIHBhZ2UvRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OmdldERv
Y3VtZW50QmFja2dyb3VuZENvbG9yKTogbG9vayB1cCB0aGUgY29sb3JzIG9uIHRoZSBodG1sIGFu
ZCBib2R5IGVsZW1lbnQsIGFuZCBwcm9wZXJseSBjb21wb3NpdGUgdGhlbS4KKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oOiBhIHNob3J0IGNvbW1lbnQgdG8gbm90ZSB0aGF0IGJs
ZW5kKCkgdXNlcyB0aGUgUG9ydGVyLUR1ZmYgc291cmNlLW92ZXIgZXF1YXRpb24KKwogMjAxMS0w
NC0yNyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2
aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh
Z2UvRnJhbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKaW5kZXggODg3ZDFj
Mi4uY2M4MzFiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAgLTUwMywyNyArNTAzLDQyIEBAIFN0
cmluZyBGcmFtZTo6bWF0Y2hMYWJlbHNBZ2FpbnN0RWxlbWVudChjb25zdCBWZWN0b3I8U3RyaW5n
PiYgbGFiZWxzLCBFbGVtZW50KiBlCiAgICAgCiBDb2xvciBGcmFtZTo6Z2V0RG9jdW1lbnRCYWNr
Z3JvdW5kQ29sb3IoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBUaGlzIGlzIGEgYmFzaWMgaW1w
bGVtZW50YXRpb24gYWRvcHRlZCBvcmlnaW5hbGx5IGZyb20gV2ViRnJhbWUsCi0gICAgLy8gYnV0
IHVsdGltYXRlbHkgaXMgd3JvbmcuIEJvZHkgcGFpbnRpbmcgcHJvcGFnYXRlcyB1cCB0byB0aGUg
ZG9jdW1lbnQgKHNlZQotICAgIC8vIFJlbmRlckJveDo6cGFpbnRSb290Qm94RGVjb3JhdGlvbnMo
KSksIHNvIGNvZGUgZnJvbSB0aGF0IG1ldGhvZCBzaG91bGQgYmUKLSAgICAvLyBhZG9wdGVkIGhl
cmUgdG8gZ2V0IHRoZSBzdHlsZSB1c2VkIHRvIHBhaW50IHRoZSByb290IGJhY2tncm91bmQuCisg
ICAgLy8gPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTU0MD4gV2Ug
YmxlbmQgdGhlIGJhY2tncm91bmQgY29sb3Igb2YKKyAgICAvLyB0aGUgZG9jdW1lbnQgYW5kIHRo
ZSBib2R5IGFnYWluc3QgdGhlIGJhc2UgYmFja2dyb3VuZCBjb2xvciBvZiB0aGUgZnJhbWUgdmll
dy4KKyAgICAvLyBCYWNrZ3JvdW5kIGltYWdlcyBhcmUgdW5mb3J0dW5hdGVseSBpbXByYWN0aWNh
bCB0byBpbmNsdWRlLgogCi0gICAgLy8gUmV0dXJuIGludmFsaWQgQ29sb3Igb2JqZWN0cyBpZiB3
ZSBhcmUgbm90IGFibGUgdG8gb2J0YWluIHRoZSBjb2xvcgotICAgIC8vIGZvciB3aGF0ZXZlciBy
ZWFzb24uCisgICAgLy8gUmV0dXJuIGludmFsaWQgQ29sb3Igb2JqZWN0cyB3aGVuZXZlciB0aGVy
ZSBpcyBpbnN1ZmZpY2llbnQgaW5mb3JtYXRpb24uCiAgICAgaWYgKCFtX2RvYykKICAgICAgICAg
cmV0dXJuIENvbG9yKCk7CisKKyAgICBFbGVtZW50KiBodG1sRWxlbWVudCA9IG1fZG9jLT5kb2N1
bWVudEVsZW1lbnQoKTsKKyAgICBFbGVtZW50KiBib2R5RWxlbWVudCA9IG1fZG9jLT5ib2R5KCk7
CisKKyAgICAvLyBzdGFydCBhcyBpbnZhbGlkIGNvbG9ycworICAgIENvbG9yIGh0bWxCYWNrZ3Jv
dW5kQ29sb3I7CisgICAgQ29sb3IgYm9keUJhY2tncm91bmRDb2xvcjsKKyAgICBpZiAoaHRtbEVs
ZW1lbnQgJiYgaHRtbEVsZW1lbnQtPnJlbmRlcmVyKCkpCisgICAgICAgIGh0bWxCYWNrZ3JvdW5k
Q29sb3IgPSBodG1sRWxlbWVudC0+cmVuZGVyZXIoKS0+c3R5bGUoKS0+dmlzaXRlZERlcGVuZGVu
dENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsKKyAgICBpZiAoYm9keUVsZW1lbnQg
JiYgYm9keUVsZW1lbnQtPnJlbmRlcmVyKCkpCisgICAgICAgIGJvZHlCYWNrZ3JvdW5kQ29sb3Ig
PSBib2R5RWxlbWVudC0+cmVuZGVyZXIoKS0+c3R5bGUoKS0+dmlzaXRlZERlcGVuZGVudENvbG9y
KENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsKICAgICAKLSAgICBFbGVtZW50KiByb290RWxl
bWVudFRvVXNlID0gbV9kb2MtPmJvZHkoKTsKLSAgICBpZiAoIXJvb3RFbGVtZW50VG9Vc2UpCi0g
ICAgICAgIHJvb3RFbGVtZW50VG9Vc2UgPSBtX2RvYy0+ZG9jdW1lbnRFbGVtZW50KCk7Ci0gICAg
aWYgKCFyb290RWxlbWVudFRvVXNlKQotICAgICAgICByZXR1cm4gQ29sb3IoKTsKKyAgICBpZiAo
IWJvZHlCYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgpKSB7CisgICAgICAgIGlmICghaHRtbEJhY2tn
cm91bmRDb2xvci5pc1ZhbGlkKCkpCisgICAgICAgICAgICByZXR1cm4gQ29sb3IoKTsKKyAgICAg
ICAgcmV0dXJuIHZpZXcoKS0+YmFzZUJhY2tncm91bmRDb2xvcigpLmJsZW5kKGh0bWxCYWNrZ3Jv
dW5kQ29sb3IpOworICAgIH0KICAgICAKLSAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gcm9v
dEVsZW1lbnRUb1VzZS0+cmVuZGVyZXIoKTsKLSAgICBpZiAoIXJlbmRlcmVyKQotICAgICAgICBy
ZXR1cm4gQ29sb3IoKTsKKyAgICBpZiAoIWh0bWxCYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgpKQor
ICAgICAgICByZXR1cm4gdmlldygpLT5iYXNlQmFja2dyb3VuZENvbG9yKCkuYmxlbmQoYm9keUJh
Y2tncm91bmRDb2xvcik7CiAgICAgCi0gICAgcmV0dXJuIHJlbmRlcmVyLT5zdHlsZSgpLT52aXNp
dGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOworICAgIC8vIFdl
IHRha2UgdGhlIGFnZ3JlZ2F0ZSBvZiB0aGUgYmFzZSBiYWNrZ3JvdW5kIGNvbG9yCisgICAgLy8g
dGhlIDxodG1sPiBiYWNrZ3JvdW5kIGNvbG9yLCBhbmQgdGhlIDxib2R5PgorICAgIC8vIGJhY2tn
cm91bmQgY29sb3IgdG8gZmluZCB0aGUgZG9jdW1lbnQgY29sb3IuIFRoZQorICAgIC8vIGFkZGl0
aW9uIG9mIHRoZSBiYXNlIGJhY2tncm91bmQgY29sb3IgaXMgbm90CisgICAgLy8gdGVjaG5pY2Fs
bHkgcGFydCBvZiB0aGUgZG9jdW1lbnQgYmFja2dyb3VuZCwgYnV0IGl0CisgICAgLy8gb3RoZXJ3
aXNlIHBvc2VzIHByb2JsZW1zIHdoZW4gdGhlIGFnZ3JlZ2F0ZSBpcyBub3QKKyAgICAvLyBmdWxs
eSBvcGFxdWUuCisgICAgcmV0dXJuIHZpZXcoKS0+YmFzZUJhY2tncm91bmRDb2xvcigpLmJsZW5k
KGh0bWxCYWNrZ3JvdW5kQ29sb3IpLmJsZW5kKGJvZHlCYWNrZ3JvdW5kQ29sb3IpOwogfQogCiB2
b2lkIEZyYW1lOjpzZXRQcmludGluZyhib29sIHByaW50aW5nLCBjb25zdCBGbG9hdFNpemUmIHBh
Z2VTaXplLCBmbG9hdCBtYXhpbXVtU2hyaW5rUmF0aW8sIEFkanVzdFZpZXdTaXplT3JOb3Qgc2hv
dWxkQWRqdXN0Vmlld1NpemUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n
cmFwaGljcy9Db2xvci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3Iu
aAppbmRleCA1MjQ5NDViLi40ZDM2NWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9Db2xvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL0NvbG9yLmgKQEAgLTEyMSw2ICsxMjEsNyBAQCBwdWJsaWM6CiAgICAgQ29sb3IgbGlnaHQo
KSBjb25zdDsKICAgICBDb2xvciBkYXJrKCkgY29uc3Q7CiAKKyAgICAvLyBUaGlzIGlzIGFuIGlt
cGxlbWVudGF0aW9uIG9mIFBvcnRlci1EdWZmJ3MgInNvdXJjZS1vdmVyIiBlcXVhdGlvbgogICAg
IENvbG9yIGJsZW5kKGNvbnN0IENvbG9yJikgY29uc3Q7CiAgICAgQ29sb3IgYmxlbmRXaXRoV2hp
dGUoKSBjb25zdDsKIAotLSAKMS43LjQuNAoK
</data>

          </attachment>
      

    </bug>

</bugzilla>