<!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>[174874] trunk/Source/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/174874">174874</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-19 20:24:57 -0700 (Sun, 19 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use SPECIALIZE_TYPE_TRAITS_*() macro for RenderScrollbar
https://bugs.webkit.org/show_bug.cgi?id=137854
Reviewed by Darin Adler.
Use SPECIALIZE_TYPE_TRAITS_*() macro for RenderScrollbar instead of a
custom toRenderScrollbar() function, for consistency.
No new tests, no behavior change.
* rendering/RenderScrollbar.h:
(isType):
(WebCore::toRenderScrollbar): Deleted.
* rendering/RenderScrollbarTheme.cpp:
(WebCore::RenderScrollbarTheme::minimumThumbLength):
(WebCore::RenderScrollbarTheme::backButtonRect):
(WebCore::RenderScrollbarTheme::forwardButtonRect):
(WebCore::RenderScrollbarTheme::trackRect):
(WebCore::RenderScrollbarTheme::constrainTrackRectToTrackPieces):
(WebCore::RenderScrollbarTheme::willPaintScrollbar):
(WebCore::RenderScrollbarTheme::didPaintScrollbar):
(WebCore::RenderScrollbarTheme::paintScrollbarBackground):
(WebCore::RenderScrollbarTheme::paintTrackBackground):
(WebCore::RenderScrollbarTheme::paintTrackPiece):
(WebCore::RenderScrollbarTheme::paintButton):
(WebCore::RenderScrollbarTheme::paintThumb):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarh">trunk/Source/WebCore/rendering/RenderScrollbar.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarThemecpp">trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174873 => 174874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-19 18:14:43 UTC (rev 174873)
+++ trunk/Source/WebCore/ChangeLog 2014-10-20 03:24:57 UTC (rev 174874)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-10-19 Chris Dumez <cdumez@apple.com>
+
+ Use SPECIALIZE_TYPE_TRAITS_*() macro for RenderScrollbar
+ https://bugs.webkit.org/show_bug.cgi?id=137854
+
+ Reviewed by Darin Adler.
+
+ Use SPECIALIZE_TYPE_TRAITS_*() macro for RenderScrollbar instead of a
+ custom toRenderScrollbar() function, for consistency.
+
+ No new tests, no behavior change.
+
+ * rendering/RenderScrollbar.h:
+ (isType):
+ (WebCore::toRenderScrollbar): Deleted.
+ * rendering/RenderScrollbarTheme.cpp:
+ (WebCore::RenderScrollbarTheme::minimumThumbLength):
+ (WebCore::RenderScrollbarTheme::backButtonRect):
+ (WebCore::RenderScrollbarTheme::forwardButtonRect):
+ (WebCore::RenderScrollbarTheme::trackRect):
+ (WebCore::RenderScrollbarTheme::constrainTrackRectToTrackPieces):
+ (WebCore::RenderScrollbarTheme::willPaintScrollbar):
+ (WebCore::RenderScrollbarTheme::didPaintScrollbar):
+ (WebCore::RenderScrollbarTheme::paintScrollbarBackground):
+ (WebCore::RenderScrollbarTheme::paintTrackBackground):
+ (WebCore::RenderScrollbarTheme::paintTrackPiece):
+ (WebCore::RenderScrollbarTheme::paintButton):
+ (WebCore::RenderScrollbarTheme::paintThumb):
+
</ins><span class="cx"> 2014-10-19 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Move GtkDragAndDropHelper from Platform to WebKit2
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.h (174873 => 174874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.h 2014-10-19 18:14:43 UTC (rev 174873)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.h 2014-10-20 03:24:57 UTC (rev 174874)
</span><span class="lines">@@ -88,15 +88,10 @@
</span><span class="cx"> HashMap<unsigned, RenderPtr<RenderScrollbarPart>> m_parts;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline RenderScrollbar* toRenderScrollbar(ScrollbarThemeClient* scrollbar)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!scrollbar || scrollbar->isCustomScrollbar());
- return static_cast<RenderScrollbar*>(scrollbar);
-}
-
-// This will catch anyone doing an unnecessary cast.
-void toRenderScrollbar(const RenderScrollbar*);
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::RenderScrollbar)
+ static bool isType(const WebCore::ScrollbarThemeClient& scrollbar) { return scrollbar.isCustomScrollbar(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // RenderScrollbar_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp (174873 => 174874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp 2014-10-19 18:14:43 UTC (rev 174873)
+++ trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp 2014-10-20 03:24:57 UTC (rev 174874)
</span><span class="lines">@@ -67,17 +67,17 @@
</span><span class="cx">
</span><span class="cx"> int RenderScrollbarTheme::minimumThumbLength(ScrollbarThemeClient* scrollbar)
</span><span class="cx"> {
</span><del>- return toRenderScrollbar(scrollbar)->minimumThumbLength();
</del><ins>+ return downcast<RenderScrollbar>(*scrollbar).minimumThumbLength();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect RenderScrollbarTheme::backButtonRect(ScrollbarThemeClient* scrollbar, ScrollbarPart partType, bool)
</span><span class="cx"> {
</span><del>- return toRenderScrollbar(scrollbar)->buttonRect(partType);
</del><ins>+ return downcast<RenderScrollbar>(*scrollbar).buttonRect(partType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect RenderScrollbarTheme::forwardButtonRect(ScrollbarThemeClient* scrollbar, ScrollbarPart partType, bool)
</span><span class="cx"> {
</span><del>- return toRenderScrollbar(scrollbar)->buttonRect(partType);
</del><ins>+ return downcast<RenderScrollbar>(*scrollbar).buttonRect(partType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect RenderScrollbarTheme::trackRect(ScrollbarThemeClient* scrollbar, bool)
</span><span class="lines">@@ -89,13 +89,13 @@
</span><span class="cx"> int endLength;
</span><span class="cx"> buttonSizesAlongTrackAxis(scrollbar, startLength, endLength);
</span><span class="cx">
</span><del>- return toRenderScrollbar(scrollbar)->trackRect(startLength, endLength);
</del><ins>+ return downcast<RenderScrollbar>(*scrollbar).trackRect(startLength, endLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect RenderScrollbarTheme::constrainTrackRectToTrackPieces(ScrollbarThemeClient* scrollbar, const IntRect& rect)
</span><span class="cx"> {
</span><del>- IntRect backRect = toRenderScrollbar(scrollbar)->trackPieceRectWithMargins(BackTrackPart, rect);
- IntRect forwardRect = toRenderScrollbar(scrollbar)->trackPieceRectWithMargins(ForwardTrackPart, rect);
</del><ins>+ IntRect backRect = downcast<RenderScrollbar>(*scrollbar).trackPieceRectWithMargins(BackTrackPart, rect);
+ IntRect forwardRect = downcast<RenderScrollbar>(*scrollbar).trackPieceRectWithMargins(ForwardTrackPart, rect);
</ins><span class="cx"> IntRect result = rect;
</span><span class="cx"> if (scrollbar->orientation() == HorizontalScrollbar) {
</span><span class="cx"> result.setX(backRect.x());
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::willPaintScrollbar(GraphicsContext* context, ScrollbarThemeClient* scrollbar)
</span><span class="cx"> {
</span><del>- float opacity = toRenderScrollbar(scrollbar)->opacity();
</del><ins>+ float opacity = downcast<RenderScrollbar>(*scrollbar).opacity();
</ins><span class="cx"> if (opacity != 1) {
</span><span class="cx"> context->save();
</span><span class="cx"> context->clip(scrollbar->frameRect());
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::didPaintScrollbar(GraphicsContext* context, ScrollbarThemeClient* scrollbar)
</span><span class="cx"> {
</span><del>- float opacity = toRenderScrollbar(scrollbar)->opacity();
</del><ins>+ float opacity = downcast<RenderScrollbar>(*scrollbar).opacity();
</ins><span class="cx"> if (opacity != 1) {
</span><span class="cx"> context->endTransparencyLayer();
</span><span class="cx"> context->restore();
</span><span class="lines">@@ -134,27 +134,27 @@
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::paintScrollbarBackground(GraphicsContext* context, ScrollbarThemeClient* scrollbar)
</span><span class="cx"> {
</span><del>- toRenderScrollbar(scrollbar)->paintPart(context, ScrollbarBGPart, scrollbar->frameRect());
</del><ins>+ downcast<RenderScrollbar>(*scrollbar).paintPart(context, ScrollbarBGPart, scrollbar->frameRect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::paintTrackBackground(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
</span><span class="cx"> {
</span><del>- toRenderScrollbar(scrollbar)->paintPart(context, TrackBGPart, rect);
</del><ins>+ downcast<RenderScrollbar>(*scrollbar).paintPart(context, TrackBGPart, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::paintTrackPiece(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part)
</span><span class="cx"> {
</span><del>- toRenderScrollbar(scrollbar)->paintPart(context, part, rect);
</del><ins>+ downcast<RenderScrollbar>(*scrollbar).paintPart(context, part, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::paintButton(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part)
</span><span class="cx"> {
</span><del>- toRenderScrollbar(scrollbar)->paintPart(context, part, rect);
</del><ins>+ downcast<RenderScrollbar>(*scrollbar).paintPart(context, part, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::paintThumb(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
</span><span class="cx"> {
</span><del>- toRenderScrollbar(scrollbar)->paintPart(context, ThumbPart, rect);
</del><ins>+ downcast<RenderScrollbar>(*scrollbar).paintPart(context, ThumbPart, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::paintTickmarks(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
</span></span></pre>
</div>
</div>
</body>
</html>