<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42791] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/42791">42791</a></dd>
<dt>Author</dt> <dd>dglazkov@chromium.org</dd>
<dt>Date</dt> <dd>2009-04-23 15:33:25 -0700 (Thu, 23 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebCore:

2009-04-23  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;

        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=25313
        Missing scroll bars in GMail.

        Test: fast/overflow/overflow-y-scroll.html

        * platform/ScrollView.cpp:
        (WebCore::ScrollView::updateScrollbars): Added check for the ScrollbarAlwaysOn
        scroll mode.

LayoutTests:

2009-04-23  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;

        Reviewed by Darin Adler.
        https://bugs.webkit.org/show_bug.cgi?id=25313
        Missing scroll bars in GMail.

        * fast/overflow/overflow-y-scroll-expected.txt: Added.
        * fast/overflow/overflow-y-scroll.html: Added.

WebKit/mac:

2009-04-23  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;

        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=25313
        Missing scroll bars in GMail.

        * WebView/WebDynamicScrollBarsView.m:
        (-[WebDynamicScrollBarsView updateScrollers]): Added check for the ScrollbarAlwaysOn
            scroll mode.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformScrollViewcpp">trunk/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacWebViewWebDynamicScrollBarsViewm">trunk/WebKit/mac/WebView/WebDynamicScrollBarsView.m</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastoverflowoverflowyscrollexpectedtxt">trunk/LayoutTests/fast/overflow/overflow-y-scroll-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastoverflowoverflowyscrollhtml">trunk/LayoutTests/fast/overflow/overflow-y-scroll.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (42790 => 42791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-04-23 22:17:46 UTC (rev 42790)
+++ trunk/LayoutTests/ChangeLog        2009-04-23 22:33:25 UTC (rev 42791)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2009-04-23  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;
+
+        Reviewed by Darin Adler.
+        https://bugs.webkit.org/show_bug.cgi?id=25313
+        Missing scroll bars in GMail.
+
+        * fast/overflow/overflow-y-scroll-expected.txt: Added.
+        * fast/overflow/overflow-y-scroll.html: Added.
+
</ins><span class="cx"> 2009-04-23  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Justin Garcia.
</span></span></pre></div>
<a id="trunkLayoutTestsfastoverflowoverflowyscrollexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/overflow/overflow-y-scroll-expected.txt (0 => 42791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/overflow/overflow-y-scroll-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/overflow/overflow-y-scroll-expected.txt        2009-04-23 22:33:25 UTC (rev 42791)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Tests ScrollView's behavior when only one of the scrollbars is made ScrollbarAlwaysOn dynamically. The correct behavior is not to remove this scrollbar, which is what this test checks for.
+
+TEST PASSED
</ins></span></pre></div>
<a id="trunkLayoutTestsfastoverflowoverflowyscrollhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/overflow/overflow-y-scroll.html (0 => 42791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/overflow/overflow-y-scroll.html                                (rev 0)
+++ trunk/LayoutTests/fast/overflow/overflow-y-scroll.html        2009-04-23 22:33:25 UTC (rev 42791)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;title&gt;Bug 25313 : Missing scrollbars in GMail&lt;/title&gt;
+        &lt;script&gt;
+            if (window.layoutTestController)
+                window.layoutTestController.dumpAsText();
+
+            function inject()
+            {
+                var content = '&lt;html&gt;&lt;head&gt;&lt;style&gt;' + 
+                    'html,body { margin: 0; overflow: hidden; height: 100%; width: 100% } ' +
+                    'html.scroll { overflow-x: auto; overflow-y: scroll; } ' +
+                    '&lt;/style&gt;&lt;body&gt;&lt;div id=&quot;offender&quot; style=&quot;height: 900px;&quot;&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;';
+                var injectee = document.getElementById(&quot;injectee&quot;);
+                var doc = injectee.contentDocument;
+                // inject an iframe
+                doc.open();
+                doc.write(content);
+                doc.close();
+                doc.getElementsByTagName(&quot;html&quot;)[0].className = &quot;scroll&quot;;
+                // tickle ScrollView::updateScrollbars()
+                doc.getElementById(&quot;offender&quot;).scrollIntoView(false);
+                // trigger resize
+                injectee.style.width = &quot;400px&quot;;
+                // measure to see if there is a scrollbar. Pass if there is.
+                document.getElementById(&quot;test&quot;).innerHTML = doc.body.offsetWidth &lt; 400 ? &quot;TEST PASSED&quot; : &quot;TEST FAILED&quot;;
+            }
+        &lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body&gt;
+        &lt;p&gt;
+            Tests &lt;kbd&gt;ScrollView&lt;/kbd&gt;'s behavior when only one of the scrollbars is made &lt;kbd&gt;ScrollbarAlwaysOn&lt;/kbd&gt; dynamically.
+            The correct behavior is not to remove this scrollbar, which is what this test checks for.
+        &lt;/p&gt;
+        &lt;div id=&quot;test&quot;&gt;
+             &lt;iframe style=&quot;height:100%&quot; id=&quot;injectee&quot; onload=&quot;inject()&quot;&gt;
+        &lt;/div&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42790 => 42791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-23 22:17:46 UTC (rev 42790)
+++ trunk/WebCore/ChangeLog        2009-04-23 22:33:25 UTC (rev 42791)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2009-04-23  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25313
+        Missing scroll bars in GMail.
+
+        Test: fast/overflow/overflow-y-scroll.html
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::updateScrollbars): Added check for the ScrollbarAlwaysOn
+        scroll mode.
+
</ins><span class="cx"> 2009-04-23  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Justin Garcia.
</span></span></pre></div>
<a id="trunkWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ScrollView.cpp (42790 => 42791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ScrollView.cpp        2009-04-23 22:17:46 UTC (rev 42790)
+++ trunk/WebCore/platform/ScrollView.cpp        2009-04-23 22:33:25 UTC (rev 42791)
</span><span class="lines">@@ -330,11 +330,12 @@
</span><span class="cx">     ScrollbarMode hScroll = m_horizontalScrollbarMode;
</span><span class="cx">     ScrollbarMode vScroll = m_verticalScrollbarMode;
</span><span class="cx"> 
</span><ins>+    if (hScroll != ScrollbarAuto)
+        newHasHorizontalScrollbar = (hScroll == ScrollbarAlwaysOn);
+    if (vScroll != ScrollbarAuto)
+        newHasVerticalScrollbar = (vScroll == ScrollbarAlwaysOn);
+
</ins><span class="cx">     if (m_scrollbarsSuppressed || (hScroll != ScrollbarAuto &amp;&amp; vScroll != ScrollbarAuto)) {
</span><del>-        if (hScroll != ScrollbarAuto)
-            newHasHorizontalScrollbar = (hScroll == ScrollbarAlwaysOn);
-        if (vScroll != ScrollbarAuto)
-            newHasVerticalScrollbar = (vScroll == ScrollbarAlwaysOn);
</del><span class="cx">         if (hasHorizontalScrollbar != newHasHorizontalScrollbar)
</span><span class="cx">             setHasHorizontalScrollbar(newHasHorizontalScrollbar);
</span><span class="cx">         if (hasVerticalScrollbar != newHasVerticalScrollbar)
</span><span class="lines">@@ -355,19 +356,19 @@
</span><span class="cx">             newHasHorizontalScrollbar = docSize.width() &gt; visibleWidth();
</span><span class="cx">         if (vScroll == ScrollbarAuto)
</span><span class="cx">             newHasVerticalScrollbar = docSize.height() &gt; visibleHeight();
</span><del>-        
</del><ins>+
</ins><span class="cx">         // If we ever turn one scrollbar off, always turn the other one off too.  Never ever
</span><span class="cx">         // try to both gain/lose a scrollbar in the same pass.
</span><del>-        if (!newHasHorizontalScrollbar &amp;&amp; hasHorizontalScrollbar)
</del><ins>+        if (!newHasHorizontalScrollbar &amp;&amp; hasHorizontalScrollbar &amp;&amp; vScroll != ScrollbarAlwaysOn)
</ins><span class="cx">             newHasVerticalScrollbar = false;
</span><del>-        if (!newHasVerticalScrollbar &amp;&amp; hasVerticalScrollbar)
</del><ins>+        if (!newHasVerticalScrollbar &amp;&amp; hasVerticalScrollbar &amp;&amp; hScroll != ScrollbarAlwaysOn)
</ins><span class="cx">             newHasHorizontalScrollbar = false;
</span><span class="cx"> 
</span><span class="cx">         if (hasHorizontalScrollbar != newHasHorizontalScrollbar) {
</span><span class="cx">             setHasHorizontalScrollbar(newHasHorizontalScrollbar);
</span><span class="cx">             sendContentResizedNotification = true;
</span><span class="cx">         }
</span><del>- 
</del><ins>+
</ins><span class="cx">         if (hasVerticalScrollbar != newHasVerticalScrollbar) {
</span><span class="cx">             setHasVerticalScrollbar(newHasVerticalScrollbar);
</span><span class="cx">             sendContentResizedNotification = true;
</span></span></pre></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (42790 => 42791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2009-04-23 22:17:46 UTC (rev 42790)
+++ trunk/WebKit/mac/ChangeLog        2009-04-23 22:33:25 UTC (rev 42791)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2009-04-23  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25313
+        Missing scroll bars in GMail.
+
+        * WebView/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView updateScrollers]): Added check for the ScrollbarAlwaysOn
+            scroll mode.
+
</ins><span class="cx"> 2009-04-23  Kevin Decker  &lt;kdecker@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         * Plugins/WebPluginContainerCheck.h: Fix the Tiger build.
</span></span></pre></div>
<a id="trunkWebKitmacWebViewWebDynamicScrollBarsViewm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebView/WebDynamicScrollBarsView.m (42790 => 42791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebView/WebDynamicScrollBarsView.m        2009-04-23 22:17:46 UTC (rev 42790)
+++ trunk/WebKit/mac/WebView/WebDynamicScrollBarsView.m        2009-04-23 22:33:25 UTC (rev 42791)
</span><span class="lines">@@ -102,13 +102,14 @@
</span><span class="cx">         newHasHorizontalScroller = NO;
</span><span class="cx">         newHasVerticalScroller = NO;
</span><span class="cx">     } 
</span><ins>+
+    if (hScroll != ScrollbarAuto)
+        newHasHorizontalScroller = (hScroll == ScrollbarAlwaysOn);
+    if (vScroll != ScrollbarAuto)
+        newHasVerticalScroller = (vScroll == ScrollbarAlwaysOn);
</ins><span class="cx">     
</span><span class="cx">     if (!documentView || suppressLayout || suppressScrollers || (hScroll != ScrollbarAuto &amp;&amp; vScroll != ScrollbarAuto)) {
</span><span class="cx">         inUpdateScrollers = YES;
</span><del>-        if (hScroll != ScrollbarAuto)
-            newHasHorizontalScroller = (hScroll == ScrollbarAlwaysOn);
-        if (vScroll != ScrollbarAuto)
-            newHasVerticalScroller = (vScroll == ScrollbarAlwaysOn);
</del><span class="cx">         if (hasHorizontalScroller != newHasHorizontalScroller)
</span><span class="cx">             [self setHasHorizontalScroller:newHasHorizontalScroller];
</span><span class="cx">         if (hasVerticalScroller != newHasVerticalScroller)
</span><span class="lines">@@ -142,12 +143,12 @@
</span><span class="cx">         newHasHorizontalScroller = documentSize.width &gt; visibleSize.width;
</span><span class="cx">     if (vScroll == ScrollbarAuto)
</span><span class="cx">         newHasVerticalScroller = documentSize.height &gt; visibleSize.height;
</span><del>-    
-    // If we ever turn one scrollbar off, always turn the other one off too.  Never ever
-    // try to both gain/lose a scrollbar in the same pass.
-    if (!newHasHorizontalScroller &amp;&amp; hasHorizontalScroller)
</del><ins>+
+    // Unless in ScrollbarsAlwaysOn mode, if we ever turn one scrollbar off, always turn the other one off too.
+    // Never ever try to both gain/lose a scrollbar in the same pass.
+    if (!newHasHorizontalScroller &amp;&amp; hasHorizontalScroller &amp;&amp; vScroll != ScrollbarAlwaysOn)
</ins><span class="cx">         newHasVerticalScroller = NO;
</span><del>-    if (!newHasVerticalScroller &amp;&amp; hasVerticalScroller)
</del><ins>+    if (!newHasVerticalScroller &amp;&amp; hasVerticalScroller &amp;&amp; hScroll != ScrollbarAlwaysOn)
</ins><span class="cx">         newHasHorizontalScroller = NO;
</span><span class="cx"> 
</span><span class="cx">     if (hasHorizontalScroller != newHasHorizontalScroller) {
</span></span></pre>
</div>
</div>

</body>
</html>