Title: [93433] trunk/Tools
- Revision
- 93433
- Author
- [email protected]
- Date
- 2011-08-19 13:22:00 -0700 (Fri, 19 Aug 2011)
Log Message
[chromium] Remove dependency of WebThemeControlDRTWin on skia::PlatformCanvas
https://bugs.webkit.org/show_bug.cgi?id=66570
Reviewed by Mihai Parparita.
* DumpRenderTree/chromium/WebThemeControlDRTWin.cpp:
(WebThemeControlDRTWin::draw):
(WebThemeControlDRTWin::drawTextField):
(WebThemeControlDRTWin::drawProgressBar):
* DumpRenderTree/chromium/WebThemeControlDRTWin.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (93432 => 93433)
--- trunk/Tools/ChangeLog 2011-08-19 20:03:58 UTC (rev 93432)
+++ trunk/Tools/ChangeLog 2011-08-19 20:22:00 UTC (rev 93433)
@@ -1,3 +1,16 @@
+2011-08-19 Alok Priyadarshi <[email protected]>
+
+ [chromium] Remove dependency of WebThemeControlDRTWin on skia::PlatformCanvas
+ https://bugs.webkit.org/show_bug.cgi?id=66570
+
+ Reviewed by Mihai Parparita.
+
+ * DumpRenderTree/chromium/WebThemeControlDRTWin.cpp:
+ (WebThemeControlDRTWin::draw):
+ (WebThemeControlDRTWin::drawTextField):
+ (WebThemeControlDRTWin::drawProgressBar):
+ * DumpRenderTree/chromium/WebThemeControlDRTWin.h:
+
2011-08-18 Dmitry Lomov <[email protected]>
TestWebKitAPI breaks on Windows due to fast malloc incompatibility.
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp (93432 => 93433)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp 2011-08-19 20:03:58 UTC (rev 93432)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp 2011-08-19 20:22:00 UTC (rev 93433)
@@ -37,8 +37,8 @@
#include "config.h"
#include "WebThemeControlDRTWin.h"
-#include "skia/ext/platform_canvas.h"
#include "skia/ext/skia_utils_win.h"
+#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkRect.h"
@@ -303,8 +303,6 @@
// Indents for the the slider track.
const int sliderIndent = 2;
- skia::BeginPlatformPaint(m_canvas);
-
switch (m_type) {
case UnknownType:
ASSERT_NOT_REACHED();
@@ -486,7 +484,6 @@
}
markState();
- skia::EndPlatformPaint(m_canvas);
}
// Because rendering a text field is dependent on input
@@ -496,7 +493,6 @@
{
SkPaint paint;
- skia::BeginPlatformPaint(m_canvas);
if (fillContentArea) {
paint.setColor(color);
paint.setStyle(SkPaint::kFill_Style);
@@ -509,14 +505,12 @@
}
markState();
- skia::EndPlatformPaint(m_canvas);
}
void WebThemeControlDRTWin::drawProgressBar(const SkIRect& fillRect)
{
SkPaint paint;
- skia::BeginPlatformPaint(m_canvas);
paint.setColor(m_bgColor);
paint.setStyle(SkPaint::kFill_Style);
m_canvas->drawIRect(m_irect, paint);
@@ -529,6 +523,5 @@
m_canvas->drawIRect(tofill, paint);
markState();
- skia::EndPlatformPaint(m_canvas);
}
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.h (93432 => 93433)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.h 2011-08-19 20:03:58 UTC (rev 93432)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.h 2011-08-19 20:22:00 UTC (rev 93433)
@@ -39,12 +39,12 @@
#ifndef WebThemeControlDRTWin_h
#define WebThemeControlDRTWin_h
-#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkRect.h"
#include <wtf/Noncopyable.h>
// Skia forward declarations
-struct SkIRect;
+class SkCanvas;
class WebThemeControlDRTWin {
WTF_MAKE_NONCOPYABLE(WebThemeControlDRTWin);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
