Title: [151906] trunk/Source/WebCore
- Revision
- 151906
- Author
- par...@webkit.org
- Date
- 2013-06-24 06:09:08 -0700 (Mon, 24 Jun 2013)
Log Message
Build fix for WinCE after r151783.
* rendering/RenderThemeWinCE.cpp:
(WebCore::cssValueIdToSysColorIndex):
(WebCore::RenderThemeWinCE::systemColor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151905 => 151906)
--- trunk/Source/WebCore/ChangeLog 2013-06-24 12:31:34 UTC (rev 151905)
+++ trunk/Source/WebCore/ChangeLog 2013-06-24 13:09:08 UTC (rev 151906)
@@ -1,3 +1,11 @@
+2013-06-24 Patrick Gansterer <par...@webkit.org>
+
+ Build fix for WinCE after r151783.
+
+ * rendering/RenderThemeWinCE.cpp:
+ (WebCore::cssValueIdToSysColorIndex):
+ (WebCore::RenderThemeWinCE::systemColor):
+
2013-06-24 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r151021.
Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (151905 => 151906)
--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-06-24 12:31:34 UTC (rev 151905)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-06-24 13:09:08 UTC (rev 151906)
@@ -284,7 +284,7 @@
}
// Map a CSSValue* system color to an index understood by GetSysColor
-static CSSValueID cssValueIdToSysColorIndex(CSSValueID cssValueId)
+static int cssValueIdToSysColorIndex(CSSValueID cssValueId)
{
switch (cssValueId) {
case CSSValueActiveborder: return COLOR_ACTIVEBORDER;
@@ -315,14 +315,14 @@
case CSSValueWindow: return COLOR_WINDOW;
case CSSValueWindowframe: return COLOR_WINDOWFRAME;
case CSSValueWindowtext: return COLOR_WINDOWTEXT;
- default: return CSSValueInvalid; // Unsupported CSSValue
+ default: return -1; // Unsupported CSSValue
}
}
Color RenderThemeWinCE::systemColor(CSSValueID cssValueId) const
{
- CSSValueID sysColorIndex = cssValueIdToSysColorIndex(cssValueId);
- if (sysColorIndex == CSSValueInvalid)
+ int sysColorIndex = cssValueIdToSysColorIndex(cssValueId);
+ if (sysColorIndex == -1)
return RenderTheme::systemColor(cssValueId);
COLORREF color = GetSysColor(sysColorIndex);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
