Changeset 52573 in webkit

Timestamp:

Dec 27, 2009 12:47:49 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-27 Patrick Gansterer <​paroga@paroga.com>

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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeWince.cpp (modified) (7 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-27  Patrick Gansterer  <paroga@paroga.com>
+
+        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  <paroga@paroga.com>
 

trunk/WebCore/rendering/RenderThemeWince.cpp

@@ -29 +29 @@
 #include "Document.h"
 #include "GraphicsContext.h"
+#include "NotImplemented.h"
 #if ENABLE(VIDEO)
 #include "HTMLMediaElement.h"
@@ -378 +379 @@
     paintInfo.context->save();
     paintInfo.context->addRoundedRectClip(cancelBounds, cancelRadius, cancelRadius, cancelRadius, cancelRadius);
-    paintInfo.context->fillRect(cancelBounds, buttonColor);
+    paintInfo.context->fillRect(cancelBounds, buttonColor, DeviceColorSpace);
 
     // Draw the 'x'
     IntSize xSize(3, 3);
     IntRect xBounds(cancelBounds.location() + IntSize(3, 3), xSize);
-    paintInfo.context->setStrokeColor(Color::white);
+    paintInfo.context->setStrokeColor(Color::white, DeviceColorSpace);
     paintInfo.context->drawLine(xBounds.location(),  xBounds.location() + xBounds.size());
     paintInfo.context->drawLine(IntPoint(xBounds.right(), xBounds.y()),  IntPoint(xBounds.x(), xBounds.bottom()));
@@ -490 +491 @@
     IntPoint left = IntPoint(r.x() + 2, (r.y() + r.bottom()) / 2);
     i.context->save();
-    i.context->setStrokeColor(Color::gray);
-    i.context->setFillColor(Color::gray);
+    i.context->setStrokeColor(Color::gray, DeviceColorSpace);
+    i.context->setFillColor(Color::gray, DeviceColorSpace);
     i.context->fillRect(r);
 #if ENABLE(VIDEO)
-    HTMLMediaElement *mediaElement = mediaElementParent(o->node());
+    HTMLMediaElement* mediaElement = mediaElementParent(o->node());
     if (mediaElement) {
         i.context->setStrokeColor(Color(0, 0xff, 0));
@@ -502 +503 @@
     }
 #endif
-    i.context->setStrokeColor(Color::black);
+    i.context->setStrokeColor(Color::black, DeviceColorSpace);
     i.context->drawLine(left, IntPoint(r.right() - 2, left.y()));
     i.context->restore();
@@ -512 +513 @@
     bool rc = RenderTheme::paintSliderThumb(o, i, r);
     i.context->save();
-    i.context->setStrokeColor(Color::black);
-    i.context->setFillColor(Color::black);
+    i.context->setStrokeColor(Color::black, DeviceColorSpace);
+    i.context->setFillColor(Color::black, DeviceColorSpace);
 #if ENABLE(VIDEO)
-    HTMLMediaElement *mediaElement = mediaElementParent(o->node());
+    HTMLMediaElement* mediaElement = mediaElementParent(o->node());
     if (mediaElement) {
         float pt = (mediaElement->currentTime() - mediaElement->startTime()) / mediaElement->duration();
@@ -575 +576 @@
 {
     bool rc = paintButton(o, paintInfo, r);
-    HTMLMediaElement *mediaElement = mediaElementParent(o->node());
+    HTMLMediaElement* mediaElement = mediaElementParent(o->node());
     bool muted = !mediaElement || mediaElement->muted();
     FloatRect imRect = r;
@@ -605 +606 @@
     paintInfo.context->setStrokeColor(Color::black);
     paintInfo.context->setFillColor(Color::black);
-    HTMLMediaElement *mediaElement = mediaElementParent(o->node());
+    HTMLMediaElement* mediaElement = mediaElementParent(o->node());
     bool paused = !mediaElement || mediaElement->paused();
     if (paused) {