<!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>[37501] 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/37501">37501</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2008-10-10 22:54:35 -0700 (Fri, 10 Oct 2008)</dd>
</dl>

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

        Make sure specialized ::scrollbar rules are still triggering custom scrollbar creation.

        Reviewed by Tim Hatcher

        * rendering/RenderLayer.cpp:
        (WebCore::RenderLayer::createScrollbar):
        * rendering/RenderScrollbar.cpp:
        (WebCore::RenderScrollbar::createCustomScrollbar):
        (WebCore::RenderScrollbar::RenderScrollbar):
        (WebCore::RenderScrollbar::setParent):
        (WebCore::RenderScrollbar::updateScrollbarParts):
        (WebCore::RenderScrollbar::updateScrollbarPart):
        * rendering/RenderScrollbar.h:
        * rendering/style/RenderStyle.h:
        (WebCore::RenderStyle::):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderLayercpp">trunk/WebCore/rendering/RenderLayer.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="#trunkWebCorerenderingstyleRenderStyleh">trunk/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37500 => 37501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-11 05:49:39 UTC (rev 37500)
+++ trunk/WebCore/ChangeLog        2008-10-11 05:54:35 UTC (rev 37501)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2008-10-10  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Make sure specialized ::scrollbar rules are still triggering custom scrollbar creation.
+
+        Reviewed by Tim Hatcher
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::createScrollbar):
+        * rendering/RenderScrollbar.cpp:
+        (WebCore::RenderScrollbar::createCustomScrollbar):
+        (WebCore::RenderScrollbar::RenderScrollbar):
+        (WebCore::RenderScrollbar::setParent):
+        (WebCore::RenderScrollbar::updateScrollbarParts):
+        (WebCore::RenderScrollbar::updateScrollbarPart):
+        * rendering/RenderScrollbar.h:
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::):
+
+2008-10-10  David Hyatt  &lt;hyatt@apple.com&gt;
+
</ins><span class="cx">         Make sure scrollbar background images cause proper part invalidation to occur.
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Hatcher
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderLayer.cpp (37500 => 37501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderLayer.cpp        2008-10-11 05:49:39 UTC (rev 37500)
+++ trunk/WebCore/rendering/RenderLayer.cpp        2008-10-11 05:54:35 UTC (rev 37501)
</span><span class="lines">@@ -1120,9 +1120,9 @@
</span><span class="cx"> PassRefPtr&lt;Scrollbar&gt; RenderLayer::createScrollbar(ScrollbarOrientation orientation)
</span><span class="cx"> {
</span><span class="cx">     RefPtr&lt;Scrollbar&gt; widget;
</span><del>-    RenderStyle* style = m_object-&gt;node()-&gt;shadowAncestorNode()-&gt;renderer()-&gt;getPseudoStyle(RenderStyle::SCROLLBAR);
-    if (style)
-        widget = RenderScrollbar::createCustomScrollbar(this, orientation, style, m_object-&gt;node()-&gt;shadowAncestorNode()-&gt;renderer());
</del><ins>+    bool hasCustomScrollbarStyle = m_object-&gt;node()-&gt;shadowAncestorNode()-&gt;renderer()-&gt;style()-&gt;hasPseudoStyle(RenderStyle::SCROLLBAR);
+    if (hasCustomScrollbarStyle)
+        widget = RenderScrollbar::createCustomScrollbar(this, orientation, m_object-&gt;node()-&gt;shadowAncestorNode()-&gt;renderer());
</ins><span class="cx">     else
</span><span class="cx">         widget = Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
</span><span class="cx">     m_object-&gt;document()-&gt;view()-&gt;addChild(widget.get());        
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderScrollbar.cpp (37500 => 37501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderScrollbar.cpp        2008-10-11 05:49:39 UTC (rev 37500)
+++ trunk/WebCore/rendering/RenderScrollbar.cpp        2008-10-11 05:54:35 UTC (rev 37501)
</span><span class="lines">@@ -30,16 +30,16 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-PassRefPtr&lt;Scrollbar&gt; RenderScrollbar::createCustomScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, RenderStyle* style, RenderObject* renderer)
</del><ins>+PassRefPtr&lt;Scrollbar&gt; RenderScrollbar::createCustomScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, RenderObject* renderer)
</ins><span class="cx"> {
</span><del>-    return adoptRef(new RenderScrollbar(client, orientation, style, renderer));
</del><ins>+    return adoptRef(new RenderScrollbar(client, orientation, renderer));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderScrollbar::RenderScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, RenderStyle* style, RenderObject* renderer)
</del><ins>+RenderScrollbar::RenderScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, RenderObject* renderer)
</ins><span class="cx">     : Scrollbar(client, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme())
</span><span class="cx">     , m_owner(renderer)
</span><span class="cx"> {
</span><del>-    updateScrollbarParts(style);
</del><ins>+    updateScrollbarParts();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RenderScrollbar::~RenderScrollbar()
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">     Scrollbar::setParent(parent);
</span><span class="cx">     if (!parent) {
</span><span class="cx">         // Destroy all of the scrollbar's RenderObjects.
</span><del>-        updateScrollbarParts(0, true);
</del><ins>+        updateScrollbarParts(true);
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -127,17 +127,17 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderScrollbar::updateScrollbarParts(RenderStyle* scrollbarStyle, bool destroy)
</del><ins>+void RenderScrollbar::updateScrollbarParts(bool destroy)
</ins><span class="cx"> {
</span><del>-    updateScrollbarPart(ScrollbarBGPart, scrollbarStyle, destroy);
-    updateScrollbarPart(BackButtonStartPart, 0, destroy);
-    updateScrollbarPart(ForwardButtonStartPart, 0, destroy);
-    updateScrollbarPart(BackTrackPart, 0, destroy);
-    updateScrollbarPart(ThumbPart, 0, destroy);
-    updateScrollbarPart(ForwardTrackPart, 0, destroy);
-    updateScrollbarPart(BackButtonEndPart, 0, destroy);
-    updateScrollbarPart(ForwardButtonEndPart, 0, destroy);
-    updateScrollbarPart(TrackBGPart, 0, destroy);
</del><ins>+    updateScrollbarPart(ScrollbarBGPart, destroy);
+    updateScrollbarPart(BackButtonStartPart, destroy);
+    updateScrollbarPart(ForwardButtonStartPart, destroy);
+    updateScrollbarPart(BackTrackPart, destroy);
+    updateScrollbarPart(ThumbPart, destroy);
+    updateScrollbarPart(ForwardTrackPart, destroy);
+    updateScrollbarPart(BackButtonEndPart, destroy);
+    updateScrollbarPart(ForwardButtonEndPart, destroy);
+    updateScrollbarPart(TrackBGPart, destroy);
</ins><span class="cx">     
</span><span class="cx">     if (destroy)
</span><span class="cx">         return;
</span><span class="lines">@@ -178,13 +178,12 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderScrollbar::updateScrollbarPart(ScrollbarPart partType, RenderStyle* partStyle, bool destroy)
</del><ins>+void RenderScrollbar::updateScrollbarPart(ScrollbarPart partType, bool destroy)
</ins><span class="cx"> {
</span><span class="cx">     if (partType == NoPart)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (!partStyle &amp;&amp; !destroy)
-        partStyle = getScrollbarPseudoStyle(partType,  pseudoForScrollbarPart(partType));
</del><ins>+    RenderStyle* partStyle = !destroy ? getScrollbarPseudoStyle(partType,  pseudoForScrollbarPart(partType)) : 0;
</ins><span class="cx">     
</span><span class="cx">     bool needRenderer = !destroy &amp;&amp; partStyle &amp;&amp; partStyle-&gt;display() != NONE &amp;&amp; partStyle-&gt;visibility() == VISIBLE;
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderScrollbar.h (37500 => 37501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderScrollbar.h        2008-10-11 05:49:39 UTC (rev 37500)
+++ trunk/WebCore/rendering/RenderScrollbar.h        2008-10-11 05:54:35 UTC (rev 37501)
</span><span class="lines">@@ -38,11 +38,11 @@
</span><span class="cx"> 
</span><span class="cx"> class RenderScrollbar : public Scrollbar {
</span><span class="cx"> protected:
</span><del>-    RenderScrollbar(ScrollbarClient*, ScrollbarOrientation, RenderStyle*, RenderObject*);
</del><ins>+    RenderScrollbar(ScrollbarClient*, ScrollbarOrientation, RenderObject*);
</ins><span class="cx"> 
</span><span class="cx"> public:
</span><span class="cx">     friend class Scrollbar;
</span><del>-    static PassRefPtr&lt;Scrollbar&gt; createCustomScrollbar(ScrollbarClient*, ScrollbarOrientation, RenderStyle*, RenderObject*);
</del><ins>+    static PassRefPtr&lt;Scrollbar&gt; createCustomScrollbar(ScrollbarClient*, ScrollbarOrientation, RenderObject*);
</ins><span class="cx">     virtual ~RenderScrollbar();
</span><span class="cx"> 
</span><span class="cx">     virtual void setParent(ScrollView*);
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">     virtual void setHoveredPart(ScrollbarPart);
</span><span class="cx">     virtual void setPressedPart(ScrollbarPart);
</span><span class="cx"> 
</span><del>-    void updateScrollbarParts(RenderStyle* = 0, bool destroy = false);
</del><ins>+    void updateScrollbarParts(bool destroy = false);
</ins><span class="cx"> 
</span><span class="cx">     static ScrollbarPart partForStyleResolve();
</span><span class="cx">     static RenderScrollbar* scrollbarForStyleResolve();
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     RenderStyle* getScrollbarPseudoStyle(ScrollbarPart, RenderStyle::PseudoId);
</span><del>-    void updateScrollbarPart(ScrollbarPart, RenderStyle* = 0, bool destroy = false);
</del><ins>+    void updateScrollbarPart(ScrollbarPart, bool destroy = false);
</ins><span class="cx"> 
</span><span class="cx">     RenderObject* m_owner;
</span><span class="cx">     HashMap&lt;unsigned, RenderScrollbarPart*&gt; m_parts;
</span></span></pre></div>
<a id="trunkWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/style/RenderStyle.h (37500 => 37501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/style/RenderStyle.h        2008-10-11 05:49:39 UTC (rev 37500)
+++ trunk/WebCore/rendering/style/RenderStyle.h        2008-10-11 05:54:35 UTC (rev 37501)
</span><span class="lines">@@ -106,11 +106,11 @@
</span><span class="cx"> 
</span><span class="cx"> public:
</span><span class="cx">     // static pseudo styles. Dynamic ones are produced on the fly.
</span><del>-    enum PseudoId { NOPSEUDO, FIRST_LINE, FIRST_LETTER, BEFORE, AFTER, SELECTION, FIRST_LINE_INHERITED, FILE_UPLOAD_BUTTON, INPUT_PLACEHOLDER,
</del><ins>+    enum PseudoId { NOPSEUDO, FIRST_LINE, FIRST_LETTER, BEFORE, AFTER, SELECTION, FIRST_LINE_INHERITED, SCROLLBAR, FILE_UPLOAD_BUTTON, INPUT_PLACEHOLDER,
</ins><span class="cx">                     SLIDER_THUMB, SEARCH_CANCEL_BUTTON, SEARCH_DECORATION, SEARCH_RESULTS_DECORATION, SEARCH_RESULTS_BUTTON, MEDIA_CONTROLS_PANEL,
</span><span class="cx">                     MEDIA_CONTROLS_PLAY_BUTTON, MEDIA_CONTROLS_MUTE_BUTTON, MEDIA_CONTROLS_TIMELINE, MEDIA_CONTROLS_TIME_DISPLAY,
</span><span class="cx">                     MEDIA_CONTROLS_SEEK_BACK_BUTTON, MEDIA_CONTROLS_SEEK_FORWARD_BUTTON , MEDIA_CONTROLS_FULLSCREEN_BUTTON,
</span><del>-                    SCROLLBAR, SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER };
</del><ins>+                    SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER };
</ins><span class="cx">     static const int FIRST_INTERNAL_PSEUDOID = FILE_UPLOAD_BUTTON;
</span><span class="cx"> 
</span><span class="cx">     void ref() { m_ref++; }
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx">         bool _affectedByHover : 1;
</span><span class="cx">         bool _affectedByActive : 1;
</span><span class="cx">         bool _affectedByDrag : 1;
</span><del>-        unsigned _pseudoBits : 6;
</del><ins>+        unsigned _pseudoBits : 7;
</ins><span class="cx">         unsigned _unicodeBidi : 2; // EUnicodeBidi
</span><span class="cx">     } noninherited_flags;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>