<!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>[37487] trunk/WebCore</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/37487">37487</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2008-10-10 13:12:14 -0700 (Fri, 10 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-10-10  David Hyatt  &lt;hyatt@apple.com&gt;

        Allow the track part to have negative margins so that it can slightly overlap buttons.  This
        is necessary to emulate the Aqua look in CSS.

        Reviewed by Sam Weinig

        * platform/ScrollbarThemeComposite.cpp:
        (WebCore::ScrollbarThemeComposite::paint):
        (WebCore::ScrollbarThemeComposite::hitTest):
        * rendering/RenderScrollbar.cpp:
        (WebCore::RenderScrollbar::setHoveredPart):
        (WebCore::RenderScrollbar::trackRect):
        * rendering/RenderScrollbar.h:
        * rendering/RenderScrollbarPart.cpp:
        (WebCore::RenderScrollbarPart::computeScrollbarWidth):
        (WebCore::RenderScrollbarPart::computeScrollbarHeight):
        * rendering/RenderScrollbarTheme.cpp:
        (WebCore::RenderScrollbarTheme::backButtonRect):
        (WebCore::RenderScrollbarTheme::forwardButtonRect):
        (WebCore::RenderScrollbarTheme::trackRect):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformScrollbarThemeCompositecpp">trunk/WebCore/platform/ScrollbarThemeComposite.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderScrollbarcpp">trunk/WebCore/rendering/RenderScrollbar.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderScrollbarh">trunk/WebCore/rendering/RenderScrollbar.h</a></li>
<li><a href="#trunkWebCorerenderingRenderScrollbarPartcpp">trunk/WebCore/rendering/RenderScrollbarPart.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderScrollbarThemecpp">trunk/WebCore/rendering/RenderScrollbarTheme.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37486 => 37487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-10 19:32:52 UTC (rev 37486)
+++ trunk/WebCore/ChangeLog        2008-10-10 20:12:14 UTC (rev 37487)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2008-10-10  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Allow the track part to have negative margins so that it can slightly overlap buttons.  This
+        is necessary to emulate the Aqua look in CSS.
+
+        Reviewed by Sam Weinig
+
+        * platform/ScrollbarThemeComposite.cpp:
+        (WebCore::ScrollbarThemeComposite::paint):
+        (WebCore::ScrollbarThemeComposite::hitTest):
+        * rendering/RenderScrollbar.cpp:
+        (WebCore::RenderScrollbar::setHoveredPart):
+        (WebCore::RenderScrollbar::trackRect):
+        * rendering/RenderScrollbar.h:
+        * rendering/RenderScrollbarPart.cpp:
+        (WebCore::RenderScrollbarPart::computeScrollbarWidth):
+        (WebCore::RenderScrollbarPart::computeScrollbarHeight):
+        * rendering/RenderScrollbarTheme.cpp:
+        (WebCore::RenderScrollbarTheme::backButtonRect):
+        (WebCore::RenderScrollbarTheme::forwardButtonRect):
+        (WebCore::RenderScrollbarTheme::trackRect):
+
+2008-10-10  David Hyatt  &lt;hyatt@apple.com&gt;
+
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=21527
</span><span class="cx"> 
</span><span class="cx">         Make CSS scrollbars support :not, :hover and :active.
</span></span></pre></div>
<a id="trunkWebCoreplatformScrollbarThemeCompositecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ScrollbarThemeComposite.cpp (37486 => 37487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ScrollbarThemeComposite.cpp        2008-10-10 19:32:52 UTC (rev 37486)
+++ trunk/WebCore/platform/ScrollbarThemeComposite.cpp        2008-10-10 20:12:14 UTC (rev 37487)
</span><span class="lines">@@ -127,6 +127,16 @@
</span><span class="cx">     // Paint the scrollbar background (only used by custom CSS scrollbars).
</span><span class="cx">     paintScrollbarBackground(graphicsContext, scrollbar);
</span><span class="cx"> 
</span><ins>+    // Paint the back and forward buttons.
+    if (scrollMask &amp; BackButtonStartPart)
+        paintButton(graphicsContext, scrollbar, backButtonStartPaintRect, BackButtonStartPart);
+    if (scrollMask &amp; BackButtonEndPart)
+        paintButton(graphicsContext, scrollbar, backButtonEndPaintRect, BackButtonEndPart);
+    if (scrollMask &amp; ForwardButtonStartPart)
+        paintButton(graphicsContext, scrollbar, forwardButtonStartPaintRect, ForwardButtonStartPart);
+    if (scrollMask &amp; ForwardButtonEndPart)
+        paintButton(graphicsContext, scrollbar, forwardButtonEndPaintRect, ForwardButtonEndPart);
+    
</ins><span class="cx">     // Paint the track background.
</span><span class="cx">     if ((scrollMask &amp; ForwardTrackPart) || (scrollMask &amp; BackTrackPart) || (scrollMask &amp;&amp; ThumbPart))
</span><span class="cx">         paintTrackBackground(graphicsContext, scrollbar, trackPaintRect);
</span><span class="lines">@@ -140,16 +150,6 @@
</span><span class="cx">             paintTrackPiece(graphicsContext, scrollbar, endTrackRect, ForwardTrackPart);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Paint the back and forward buttons.
-    if (scrollMask &amp; BackButtonStartPart)
-        paintButton(graphicsContext, scrollbar, backButtonStartPaintRect, BackButtonStartPart);
-    if (scrollMask &amp; BackButtonEndPart)
-        paintButton(graphicsContext, scrollbar, backButtonEndPaintRect, BackButtonEndPart);
-    if (scrollMask &amp; ForwardButtonStartPart)
-        paintButton(graphicsContext, scrollbar, forwardButtonStartPaintRect, ForwardButtonStartPart);
-    if (scrollMask &amp; ForwardButtonEndPart)
-        paintButton(graphicsContext, scrollbar, forwardButtonEndPaintRect, ForwardButtonEndPart);
-    
</del><span class="cx">     // Paint the thumb.
</span><span class="cx">     if (scrollMask &amp; ThumbPart)
</span><span class="cx">         paintThumb(graphicsContext, scrollbar, thumbRect);
</span><span class="lines">@@ -165,7 +165,19 @@
</span><span class="cx"> 
</span><span class="cx">     IntPoint mousePosition = scrollbar-&gt;convertFromContainingWindow(evt.pos());
</span><span class="cx">     mousePosition.move(scrollbar-&gt;x(), scrollbar-&gt;y());
</span><del>-    if (backButtonRect(scrollbar, BackButtonStartPart).contains(mousePosition))
</del><ins>+    IntRect track = trackRect(scrollbar);
+    if (track.contains(mousePosition)) {
+        IntRect beforeThumbRect;
+        IntRect thumbRect;
+        IntRect afterThumbRect;
+        splitTrack(scrollbar, track, beforeThumbRect, thumbRect, afterThumbRect);
+        if (beforeThumbRect.contains(mousePosition))
+            result = BackTrackPart;
+        else if (thumbRect.contains(mousePosition))
+            result = ThumbPart;
+        else
+            result = ForwardTrackPart;
+    } else if (backButtonRect(scrollbar, BackButtonStartPart).contains(mousePosition))
</ins><span class="cx">         result = BackButtonStartPart;
</span><span class="cx">     else if (backButtonRect(scrollbar, BackButtonEndPart).contains(mousePosition))
</span><span class="cx">         result = BackButtonEndPart;
</span><span class="lines">@@ -173,21 +185,6 @@
</span><span class="cx">         result = ForwardButtonStartPart;
</span><span class="cx">     else if (forwardButtonRect(scrollbar, ForwardButtonEndPart).contains(mousePosition))
</span><span class="cx">         result = ForwardButtonEndPart;
</span><del>-    else {
-        IntRect track = trackRect(scrollbar);
-        if (track.contains(mousePosition)) {
-            IntRect beforeThumbRect;
-            IntRect thumbRect;
-            IntRect afterThumbRect;
-            splitTrack(scrollbar, track, beforeThumbRect, thumbRect, afterThumbRect);
-            if (beforeThumbRect.contains(mousePosition))
-                result = BackTrackPart;
-            else if (thumbRect.contains(mousePosition))
-                result = ThumbPart;
-            else
-                result = ForwardTrackPart;
-        }
-    }
</del><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderScrollbar.cpp (37486 => 37487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderScrollbar.cpp        2008-10-10 19:32:52 UTC (rev 37486)
+++ trunk/WebCore/rendering/RenderScrollbar.cpp        2008-10-10 20:12:14 UTC (rev 37487)
</span><span class="lines">@@ -86,8 +86,6 @@
</span><span class="cx">     updateScrollbarPart(ScrollbarBGPart);
</span><span class="cx">     updateScrollbarPart(TrackBGPart);
</span><span class="cx">     invalidate();
</span><del>-
-    m_hoveredPart = part;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderScrollbar::setPressedPart(ScrollbarPart part)
</span><span class="lines">@@ -261,6 +259,31 @@
</span><span class="cx">                    isHorizontal ? height() : partRenderer-&gt;height());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IntRect RenderScrollbar::trackRect(int startLength, int endLength)
+{
+    
+    RenderScrollbarPart* part = m_parts.get(TrackBGPart);
+    if (part)
+        part-&gt;layout();
+
+    if (orientation() == HorizontalScrollbar) {
+        int marginLeft = part ? part-&gt;marginLeft() : 0;
+        int marginRight = part ? part-&gt;marginRight() : 0;
+        startLength += marginLeft;
+        endLength += marginRight;
+        int totalLength = startLength + endLength;
+        return IntRect(x() + startLength, y(), width() - totalLength, height());
+    }
+    
+    int marginTop = part ? part-&gt;marginTop() : 0;
+    int marginBottom = part ? part-&gt;marginBottom() : 0;
+    startLength += marginTop;
+    endLength += marginBottom;
+    int totalLength = startLength + endLength;
+
+    return IntRect(x(), y() + startLength, width(), height() - totalLength);
+}
+
</ins><span class="cx"> int RenderScrollbar::minimumThumbLength()
</span><span class="cx"> {
</span><span class="cx">     RenderScrollbarPart* partRenderer = m_parts.get(ThumbPart);
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderScrollbar.h (37486 => 37487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderScrollbar.h        2008-10-10 19:32:52 UTC (rev 37486)
+++ trunk/WebCore/rendering/RenderScrollbar.h        2008-10-10 20:12:14 UTC (rev 37487)
</span><span class="lines">@@ -65,7 +65,8 @@
</span><span class="cx">     void paintPart(GraphicsContext*, ScrollbarPart, const IntRect&amp;);
</span><span class="cx"> 
</span><span class="cx">     IntRect buttonRect(ScrollbarPart);
</span><del>-    
</del><ins>+    IntRect trackRect(int startLength, int endLength);
+
</ins><span class="cx">     int minimumThumbLength();
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderScrollbarPartcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderScrollbarPart.cpp (37486 => 37487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderScrollbarPart.cpp        2008-10-10 19:32:52 UTC (rev 37486)
+++ trunk/WebCore/rendering/RenderScrollbarPart.cpp        2008-10-10 20:12:14 UTC (rev 37487)
</span><span class="lines">@@ -93,6 +93,13 @@
</span><span class="cx">     int minWidth = calcScrollbarThicknessUsing(style()-&gt;minWidth(), visibleSize);
</span><span class="cx">     int maxWidth = style()-&gt;maxWidth().isUndefined() ? width : calcScrollbarThicknessUsing(style()-&gt;maxWidth(), visibleSize);
</span><span class="cx">     m_width = max(minWidth, min(maxWidth, width));
</span><ins>+    
+    // Allow the track pieces to have negative margins so that they can overlap buttons. This is required to emulate the
+    // Aqua look in CSS.
+    if (m_part == TrackBGPart) {
+        m_marginLeft = min(0, style()-&gt;marginLeft().calcMinValue(visibleSize));
+        m_marginRight = min(0, style()-&gt;marginRight().calcMinValue(visibleSize));
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderScrollbarPart::computeScrollbarHeight()
</span><span class="lines">@@ -103,6 +110,12 @@
</span><span class="cx">     int maxHeight = style()-&gt;maxHeight().isUndefined() ? height : calcScrollbarThicknessUsing(style()-&gt;maxHeight(), visibleSize);
</span><span class="cx">     m_height = max(minHeight, min(maxHeight, height));
</span><span class="cx"> 
</span><ins>+    // Allow the track pieces to have negative margins so that they can overlap buttons. This is required to emulate the
+    // Aqua look in CSS.
+    if (m_part == TrackBGPart) {
+        m_marginTop = min(0, style()-&gt;marginTop().calcMinValue(visibleSize));
+        m_marginBottom = min(0, style()-&gt;marginBottom().calcMinValue(visibleSize));
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderScrollbarPart::calcPrefWidths()
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderScrollbarThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderScrollbarTheme.cpp (37486 => 37487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderScrollbarTheme.cpp        2008-10-10 19:32:52 UTC (rev 37486)
+++ trunk/WebCore/rendering/RenderScrollbarTheme.cpp        2008-10-10 20:12:14 UTC (rev 37487)
</span><span class="lines">@@ -68,27 +68,26 @@
</span><span class="cx">     return static_cast&lt;RenderScrollbar*&gt;(scrollbar)-&gt;minimumThumbLength();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-IntRect RenderScrollbarTheme::backButtonRect(Scrollbar* scrollbar, ScrollbarPart partType, bool painting)
</del><ins>+IntRect RenderScrollbarTheme::backButtonRect(Scrollbar* scrollbar, ScrollbarPart partType, bool)
</ins><span class="cx"> {
</span><span class="cx">     return static_cast&lt;RenderScrollbar*&gt;(scrollbar)-&gt;buttonRect(partType);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-IntRect RenderScrollbarTheme::forwardButtonRect(Scrollbar* scrollbar, ScrollbarPart partType, bool painting)
</del><ins>+IntRect RenderScrollbarTheme::forwardButtonRect(Scrollbar* scrollbar, ScrollbarPart partType, bool)
</ins><span class="cx"> {
</span><span class="cx">     return static_cast&lt;RenderScrollbar*&gt;(scrollbar)-&gt;buttonRect(partType);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-IntRect RenderScrollbarTheme::trackRect(Scrollbar* scrollbar, bool painting)
</del><ins>+IntRect RenderScrollbarTheme::trackRect(Scrollbar* scrollbar, bool)
</ins><span class="cx"> {
</span><span class="cx">     if (!hasButtons(scrollbar))
</span><span class="cx">         return scrollbar-&gt;frameRect();
</span><ins>+    
</ins><span class="cx">     int startLength;
</span><span class="cx">     int endLength;
</span><span class="cx">     buttonSizesAlongTrackAxis(scrollbar, startLength, endLength);
</span><del>-    int totalLength = startLength + endLength;
-    if (scrollbar-&gt;orientation() == HorizontalScrollbar)
-        return IntRect(scrollbar-&gt;x() + startLength, scrollbar-&gt;y(), scrollbar-&gt;width() - totalLength, scrollbar-&gt;height());
-    return IntRect(scrollbar-&gt;x(), scrollbar-&gt;y() + startLength, scrollbar-&gt;width(), scrollbar-&gt;height() - totalLength);
</del><ins>+    
+    return static_cast&lt;RenderScrollbar*&gt;(scrollbar)-&gt;trackRect(startLength, endLength);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderScrollbarTheme::paintScrollCorner(ScrollView*, GraphicsContext* context, const IntRect&amp; cornerRect)
</span></span></pre>
</div>
</div>

</body>
</html>