<!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>[129799] trunk/Source</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/129799">129799</a></dd>
<dt>Author</dt> <dd>pilgrim@chromium.org</dd>
<dt>Date</dt> <dd>2012-09-27 14:25:48 -0700 (Thu, 27 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Chromium][Mac] Move Mac-specific theme functions out of PlatformSupport
https://bugs.webkit.org/show_bug.cgi?id=97817

Reviewed by Adam Barth.

Part of a refactoring series. See tracking bug 82948. We're calling WebThemeEngine directly now instead of proxying through PlatformSupport.

Source/WebCore:

* platform/chromium/PlatformSupport.h:
(PlatformSupport):
* platform/chromium/ScrollbarThemeChromiumMac.mm:
(WebCore::scrollbarStateToThemeState):
(WebCore):
(WebCore::ScrollbarThemeChromiumMac::paint):

Source/WebKit/chromium:

* src/AssertMatchingEnums.cpp:
* src/PlatformSupport.cpp:
(WebCore):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformchromiumPlatformSupporth">trunk/Source/WebCore/platform/chromium/PlatformSupport.h</a></li>
<li><a href="#trunkSourceWebCoreplatformchromiumScrollbarThemeChromiumMacmm">trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm</a></li>
<li><a href="#trunkSourceWebKitchromiumChangeLog">trunk/Source/WebKit/chromium/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcAssertMatchingEnumscpp">trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcPlatformSupportcpp">trunk/Source/WebKit/chromium/src/PlatformSupport.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (129798 => 129799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2012-09-27 21:03:47 UTC (rev 129798)
+++ trunk/Source/WebCore/ChangeLog        2012-09-27 21:25:48 UTC (rev 129799)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2012-09-27  Mark Pilgrim  &lt;pilgrim@chromium.org&gt;
+
+        [Chromium][Mac] Move Mac-specific theme functions out of PlatformSupport
+        https://bugs.webkit.org/show_bug.cgi?id=97817
+
+        Reviewed by Adam Barth.
+
+        Part of a refactoring series. See tracking bug 82948. We're calling WebThemeEngine directly now instead of proxying through PlatformSupport.
+
+        * platform/chromium/PlatformSupport.h:
+        (PlatformSupport):
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::scrollbarStateToThemeState):
+        (WebCore):
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
</ins><span class="cx"> 2012-09-27  Erik Arvidsson  &lt;arv@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix issue with ClassList which was hitting an assert in debug mode
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformchromiumPlatformSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (129798 => 129799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h        2012-09-27 21:03:47 UTC (rev 129798)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h        2012-09-27 21:25:48 UTC (rev 129799)
</span><span class="lines">@@ -127,39 +127,6 @@
</span><span class="cx">         GraphicsContext*, int part, int state, int classicState, const IntRect&amp;);
</span><span class="cx">     static void paintProgressBar(
</span><span class="cx">         GraphicsContext*, const IntRect&amp; barRect, const IntRect&amp; valueRect, bool determinate, double animatedSeconds);
</span><del>-#elif OS(DARWIN)
-    enum ThemePaintState {
-        StateDisabled,
-        StateInactive,
-        StateActive,
-        StatePressed,
-    };
-
-    enum ThemePaintSize {
-        SizeRegular,
-        SizeSmall,
-    };
-
-    enum ThemePaintScrollbarOrientation {
-        ScrollbarOrientationHorizontal,
-        ScrollbarOrientationVertical,
-    };
-
-    enum ThemePaintScrollbarParent {
-        ScrollbarParentScrollView,
-        ScrollbarParentRenderLayer,
-    };
-
-    struct ThemePaintScrollbarInfo {
-        ThemePaintScrollbarOrientation orientation;
-        ThemePaintScrollbarParent parent;
-        int maxValue;
-        int currentValue;
-        int visibleSize;
-        int totalSize;
-    };
-
-    static void paintScrollbarThumb(GraphicsContext*, ThemePaintState, ThemePaintSize, const IntRect&amp;, const ThemePaintScrollbarInfo&amp;);
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformchromiumScrollbarThemeChromiumMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm (129798 => 129799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm        2012-09-27 21:03:47 UTC (rev 129798)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm        2012-09-27 21:25:48 UTC (rev 129799)
</span><span class="lines">@@ -33,11 +33,13 @@
</span><span class="cx"> #include &quot;LocalCurrentGraphicsContext.h&quot;
</span><span class="cx"> #include &quot;NSScrollerImpDetails.h&quot;
</span><span class="cx"> #include &quot;PlatformContextSkia.h&quot;
</span><del>-#include &quot;PlatformSupport.h&quot;
</del><span class="cx"> #include &quot;ScrollAnimatorMac.h&quot;
</span><span class="cx"> #include &quot;ScrollView.h&quot;
</span><span class="cx"> #include &quot;skia/ext/skia_utils_mac.h&quot;
</span><span class="cx"> #include &lt;Carbon/Carbon.h&gt;
</span><ins>+#include &lt;public/Platform.h&gt;
+#include &lt;public/WebRect.h&gt;
+#include &lt;public/mac/WebThemeEngine.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -58,16 +60,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static PlatformSupport::ThemePaintState scrollbarStateToThemeState(ScrollbarThemeClient* scrollbar)
</del><ins>+static WebKit::WebThemeEngine::State scrollbarStateToThemeState(ScrollbarThemeClient* scrollbar)
</ins><span class="cx"> {
</span><span class="cx">     if (!scrollbar-&gt;enabled())
</span><del>-        return PlatformSupport::StateDisabled;
</del><ins>+        return WebKit::WebThemeEngine::StateDisabled;
</ins><span class="cx">     if (!scrollbar-&gt;isScrollableAreaActive())
</span><del>-        return PlatformSupport::StateInactive;
</del><ins>+        return WebKit::WebThemeEngine::StateInactive;
</ins><span class="cx">     if (scrollbar-&gt;pressedPart() == ThumbPart)
</span><del>-        return PlatformSupport::StatePressed;
</del><ins>+        return WebKit::WebThemeEngine::StatePressed;
</ins><span class="cx"> 
</span><del>-    return PlatformSupport::StateActive;
</del><ins>+    return WebKit::WebThemeEngine::StateActive;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void scrollbarPainterPaintTrack(ScrollbarPainter scrollbarPainter, bool enabled, double value, CGFloat proportion, CGRect frameRect)
</span><span class="lines">@@ -88,7 +90,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Override ScrollbarThemeMac::paint() to add support for the following:
</span><del>-//     - drawing using PlatformSupport functions
</del><ins>+//     - drawing using WebThemeEngine functions
</ins><span class="cx"> //     - drawing tickmarks
</span><span class="cx"> //     - Skia specific changes
</span><span class="cx"> bool ScrollbarThemeChromiumMac::paint(ScrollbarThemeClient* scrollbar, GraphicsContext* context, const IntRect&amp; damageRect)
</span><span class="lines">@@ -235,19 +237,20 @@
</span><span class="cx">     paintGivenTickmarks(drawingContext, scrollbar, tickmarkTrackRect, tickmarks);
</span><span class="cx"> 
</span><span class="cx">     if (hasThumb(scrollbar)) {
</span><del>-        PlatformSupport::ThemePaintScrollbarInfo scrollbarInfo;
-        scrollbarInfo.orientation = scrollbar-&gt;orientation() == HorizontalScrollbar ? PlatformSupport::ScrollbarOrientationHorizontal : PlatformSupport::ScrollbarOrientationVertical;
-        scrollbarInfo.parent = scrollbar-&gt;isScrollViewScrollbar() ? PlatformSupport::ScrollbarParentScrollView : PlatformSupport::ScrollbarParentRenderLayer;
</del><ins>+        WebKit::WebThemeEngine::ScrollbarInfo scrollbarInfo;
+        scrollbarInfo.orientation = scrollbar-&gt;orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::ScrollbarOrientationHorizontal : WebKit::WebThemeEngine::ScrollbarOrientationVertical;
+        scrollbarInfo.parent = scrollbar-&gt;isScrollViewScrollbar() ? WebKit::WebThemeEngine::ScrollbarParentScrollView : WebKit::WebThemeEngine::ScrollbarParentRenderLayer;
</ins><span class="cx">         scrollbarInfo.maxValue = scrollbar-&gt;maximum();
</span><span class="cx">         scrollbarInfo.currentValue = scrollbar-&gt;currentPos();
</span><span class="cx">         scrollbarInfo.visibleSize = scrollbar-&gt;visibleSize();
</span><span class="cx">         scrollbarInfo.totalSize = scrollbar-&gt;totalSize();
</span><span class="cx"> 
</span><del>-        PlatformSupport::paintScrollbarThumb(
-            drawingContext,
</del><ins>+        WebKit::WebCanvas* webCanvas = drawingContext-&gt;platformContext()-&gt;canvas();
+        WebKit::Platform::current()-&gt;themeEngine()-&gt;paintScrollbarThumb(
+            webCanvas,
</ins><span class="cx">             scrollbarStateToThemeState(scrollbar),
</span><del>-            scrollbar-&gt;controlSize() == RegularScrollbar ? PlatformSupport::SizeRegular : PlatformSupport::SizeSmall,
-            scrollbar-&gt;frameRect(),
</del><ins>+            scrollbar-&gt;controlSize() == RegularScrollbar ? WebKit::WebThemeEngine::SizeRegular : WebKit::WebThemeEngine::SizeSmall,
+            WebKit::WebRect(scrollbar-&gt;frameRect()),
</ins><span class="cx">             scrollbarInfo);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/ChangeLog (129798 => 129799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/ChangeLog        2012-09-27 21:03:47 UTC (rev 129798)
+++ trunk/Source/WebKit/chromium/ChangeLog        2012-09-27 21:25:48 UTC (rev 129799)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2012-09-27  Mark Pilgrim  &lt;pilgrim@chromium.org&gt;
</span><span class="cx"> 
</span><ins>+        [Chromium][Mac] Move Mac-specific theme functions out of PlatformSupport
+        https://bugs.webkit.org/show_bug.cgi?id=97817
+
+        Reviewed by Adam Barth.
+
+        Part of a refactoring series. See tracking bug 82948. We're calling WebThemeEngine directly now instead of proxying through PlatformSupport.
+
+        * src/AssertMatchingEnums.cpp:
+        * src/PlatformSupport.cpp:
+        (WebCore):
+
+2012-09-27  Mark Pilgrim  &lt;pilgrim@chromium.org&gt;
+
</ins><span class="cx">         [Chromium] Move UNIX-specific theme functions out of PlatformSupport
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=96516
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcAssertMatchingEnumscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (129798 => 129799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp        2012-09-27 21:03:47 UTC (rev 129798)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp        2012-09-27 21:25:48 UTC (rev 129799)
</span><span class="lines">@@ -124,11 +124,6 @@
</span><span class="cx"> #include &lt;wtf/Assertions.h&gt;
</span><span class="cx"> #include &lt;wtf/text/StringImpl.h&gt;
</span><span class="cx"> 
</span><del>-#if OS(DARWIN)
-#include &quot;PlatformSupport.h&quot;
-#include &lt;public/mac/WebThemeEngine.h&gt;
-#endif
-
</del><span class="cx"> #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \
</span><span class="cx">     COMPILE_ASSERT(int(WebKit::webkit_name) == int(WebCore::webcore_name), mismatching_enums)
</span><span class="cx"> 
</span><span class="lines">@@ -548,22 +543,6 @@
</span><span class="cx"> COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaErrorAbort, ABORT_ERR);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if OS(DARWIN)
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateDisabled, PlatformSupport::StateDisabled);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateInactive, PlatformSupport::StateInactive);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateActive, PlatformSupport::StateActive);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StatePressed, PlatformSupport::StatePressed);
-
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeRegular, PlatformSupport::SizeRegular);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeSmall, PlatformSupport::SizeSmall);
-
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationHorizontal, PlatformSupport::ScrollbarOrientationHorizontal);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationVertical, PlatformSupport::ScrollbarOrientationVertical);
-
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentScrollView, PlatformSupport::ScrollbarParentScrollView);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentRenderLayer, PlatformSupport::ScrollbarParentRenderLayer);
-#endif
-
</del><span class="cx"> COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStateVisible, PageVisibilityStateVisible);
</span><span class="cx"> COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStateHidden, PageVisibilityStateHidden);
</span><span class="cx"> COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStatePrerender, PageVisibilityStatePrerender);
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcPlatformSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (129798 => 129799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp        2012-09-27 21:03:47 UTC (rev 129798)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp        2012-09-27 21:25:48 UTC (rev 129799)
</span><span class="lines">@@ -324,29 +324,6 @@
</span><span class="cx">         gc-&gt;platformContext()-&gt;canvas(), barRect, valueRect, determinate, animatedSeconds);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#elif OS(DARWIN)
-
-void PlatformSupport::paintScrollbarThumb(
-    GraphicsContext* gc, ThemePaintState state, ThemePaintSize size, const IntRect&amp; rect, const ThemePaintScrollbarInfo&amp; scrollbarInfo)
-{
-    WebThemeEngine::ScrollbarInfo webThemeScrollbarInfo;
-
-    webThemeScrollbarInfo.orientation = static_cast&lt;WebThemeEngine::ScrollbarOrientation&gt;(scrollbarInfo.orientation);
-    webThemeScrollbarInfo.parent = static_cast&lt;WebThemeEngine::ScrollbarParent&gt;(scrollbarInfo.parent);
-    webThemeScrollbarInfo.maxValue = scrollbarInfo.maxValue;
-    webThemeScrollbarInfo.currentValue = scrollbarInfo.currentValue;
-    webThemeScrollbarInfo.visibleSize = scrollbarInfo.visibleSize;
-    webThemeScrollbarInfo.totalSize = scrollbarInfo.totalSize;
-
-    WebKit::WebCanvas* webCanvas = gc-&gt;platformContext()-&gt;canvas();
-    WebKit::Platform::current()-&gt;themeEngine()-&gt;paintScrollbarThumb(
-        webCanvas,
-        static_cast&lt;WebThemeEngine::State&gt;(state),
-        static_cast&lt;WebThemeEngine::Size&gt;(size),
-        rect,
-        webThemeScrollbarInfo);
-}
-
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> // These are temporary methods that the WebKit layer can use to call to the
</span></span></pre>
</div>
</div>

</body>
</html>