<!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>[52573] 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/52573">52573</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-12-27 00:47:49 -0800 (Sun, 27 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-12-27  Patrick Gansterer  &lt;paroga@paroga.com&gt;

        Reviewed by Eric Seidel.

        Buildfix after <a href="http://trac.webkit.org/projects/webkit/changeset/50760">r50760</a> and some style fixes.

        * rendering/RenderThemeWince.cpp:
        (WebCore::RenderThemeWince::paintSearchFieldCancelButton):
        (WebCore::RenderThemeWince::paintSliderTrack):
        (WebCore::RenderThemeWince::paintSliderThumb):
        (WebCore::RenderThemeWince::paintMediaMuteButton):
        (WebCore::RenderThemeWince::paintMediaPlayButton):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderThemeWincecpp">trunk/WebCore/rendering/RenderThemeWince.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (52572 => 52573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-12-27 08:39:57 UTC (rev 52572)
+++ trunk/WebCore/ChangeLog        2009-12-27 08:47:49 UTC (rev 52573)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2009-12-27  Patrick Gansterer  &lt;paroga@paroga.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Eric Seidel.
+
+        Buildfix after r50760 and some style fixes.
+
+        * rendering/RenderThemeWince.cpp:
+        (WebCore::RenderThemeWince::paintSearchFieldCancelButton):
+        (WebCore::RenderThemeWince::paintSliderTrack):
+        (WebCore::RenderThemeWince::paintSliderThumb):
+        (WebCore::RenderThemeWince::paintMediaMuteButton):
+        (WebCore::RenderThemeWince::paintMediaPlayButton):
+
+2009-12-27  Patrick Gansterer  &lt;paroga@paroga.com&gt;
+
</ins><span class="cx">         Reviewed by Adam Barth.
</span><span class="cx"> 
</span><span class="cx">         WinCE buildfixes (missing headers and unsupported HWND_MESSAGE)
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderThemeWincecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderThemeWince.cpp (52572 => 52573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderThemeWince.cpp        2009-12-27 08:39:57 UTC (rev 52572)
+++ trunk/WebCore/rendering/RenderThemeWince.cpp        2009-12-27 08:47:49 UTC (rev 52573)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include &quot;CSSValueKeywords.h&quot;
</span><span class="cx"> #include &quot;Document.h&quot;
</span><span class="cx"> #include &quot;GraphicsContext.h&quot;
</span><ins>+#include &quot;NotImplemented.h&quot;
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> #include &quot;HTMLMediaElement.h&quot;
</span><span class="cx"> #endif
</span><span class="lines">@@ -377,12 +378,12 @@
</span><span class="cx">     IntRect cancelBounds(IntPoint(x, y), cancelSize);
</span><span class="cx">     paintInfo.context-&gt;save();
</span><span class="cx">     paintInfo.context-&gt;addRoundedRectClip(cancelBounds, cancelRadius, cancelRadius, cancelRadius, cancelRadius);
</span><del>-    paintInfo.context-&gt;fillRect(cancelBounds, buttonColor);
</del><ins>+    paintInfo.context-&gt;fillRect(cancelBounds, buttonColor, DeviceColorSpace);
</ins><span class="cx"> 
</span><span class="cx">     // Draw the 'x'
</span><span class="cx">     IntSize xSize(3, 3);
</span><span class="cx">     IntRect xBounds(cancelBounds.location() + IntSize(3, 3), xSize);
</span><del>-    paintInfo.context-&gt;setStrokeColor(Color::white);
</del><ins>+    paintInfo.context-&gt;setStrokeColor(Color::white, DeviceColorSpace);
</ins><span class="cx">     paintInfo.context-&gt;drawLine(xBounds.location(),  xBounds.location() + xBounds.size());
</span><span class="cx">     paintInfo.context-&gt;drawLine(IntPoint(xBounds.right(), xBounds.y()),  IntPoint(xBounds.x(), xBounds.bottom()));
</span><span class="cx"> 
</span><span class="lines">@@ -489,11 +490,11 @@
</span><span class="cx">     bool rc = RenderTheme::paintSliderTrack(o, i, r);
</span><span class="cx">     IntPoint left = IntPoint(r.x() + 2, (r.y() + r.bottom()) / 2);
</span><span class="cx">     i.context-&gt;save();
</span><del>-    i.context-&gt;setStrokeColor(Color::gray);
-    i.context-&gt;setFillColor(Color::gray);
</del><ins>+    i.context-&gt;setStrokeColor(Color::gray, DeviceColorSpace);
+    i.context-&gt;setFillColor(Color::gray, DeviceColorSpace);
</ins><span class="cx">     i.context-&gt;fillRect(r);
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>-    HTMLMediaElement *mediaElement = mediaElementParent(o-&gt;node());
</del><ins>+    HTMLMediaElement* mediaElement = mediaElementParent(o-&gt;node());
</ins><span class="cx">     if (mediaElement) {
</span><span class="cx">         i.context-&gt;setStrokeColor(Color(0, 0xff, 0));
</span><span class="cx">         IntPoint right = IntPoint(left.x() + mediaElement-&gt;percentLoaded() * (r.right() - r.x() - 4), (r.y() + r.bottom()) / 2);
</span><span class="lines">@@ -501,7 +502,7 @@
</span><span class="cx">         left = right;
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><del>-    i.context-&gt;setStrokeColor(Color::black);
</del><ins>+    i.context-&gt;setStrokeColor(Color::black, DeviceColorSpace);
</ins><span class="cx">     i.context-&gt;drawLine(left, IntPoint(r.right() - 2, left.y()));
</span><span class="cx">     i.context-&gt;restore();
</span><span class="cx">     return rc;
</span><span class="lines">@@ -511,10 +512,10 @@
</span><span class="cx"> {
</span><span class="cx">     bool rc = RenderTheme::paintSliderThumb(o, i, r);
</span><span class="cx">     i.context-&gt;save();
</span><del>-    i.context-&gt;setStrokeColor(Color::black);
-    i.context-&gt;setFillColor(Color::black);
</del><ins>+    i.context-&gt;setStrokeColor(Color::black, DeviceColorSpace);
+    i.context-&gt;setFillColor(Color::black, DeviceColorSpace);
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><del>-    HTMLMediaElement *mediaElement = mediaElementParent(o-&gt;node());
</del><ins>+    HTMLMediaElement* mediaElement = mediaElementParent(o-&gt;node());
</ins><span class="cx">     if (mediaElement) {
</span><span class="cx">         float pt = (mediaElement-&gt;currentTime() - mediaElement-&gt;startTime()) / mediaElement-&gt;duration();
</span><span class="cx">         FloatRect intRect = r;
</span><span class="lines">@@ -574,7 +575,7 @@
</span><span class="cx"> bool RenderThemeWince::paintMediaMuteButton(RenderObject* o, const RenderObject::PaintInfo&amp; paintInfo, const IntRect&amp; r)
</span><span class="cx"> {
</span><span class="cx">     bool rc = paintButton(o, paintInfo, r);
</span><del>-    HTMLMediaElement *mediaElement = mediaElementParent(o-&gt;node());
</del><ins>+    HTMLMediaElement* mediaElement = mediaElementParent(o-&gt;node());
</ins><span class="cx">     bool muted = !mediaElement || mediaElement-&gt;muted();
</span><span class="cx">     FloatRect imRect = r;
</span><span class="cx">     imRect.inflate(-2);
</span><span class="lines">@@ -604,7 +605,7 @@
</span><span class="cx">     paintInfo.context-&gt;save();
</span><span class="cx">     paintInfo.context-&gt;setStrokeColor(Color::black);
</span><span class="cx">     paintInfo.context-&gt;setFillColor(Color::black);
</span><del>-    HTMLMediaElement *mediaElement = mediaElementParent(o-&gt;node());
</del><ins>+    HTMLMediaElement* mediaElement = mediaElementParent(o-&gt;node());
</ins><span class="cx">     bool paused = !mediaElement || mediaElement-&gt;paused();
</span><span class="cx">     if (paused) {
</span><span class="cx">         float width = imRect.width();
</span></span></pre>
</div>
</div>

</body>
</html>