[chromium] Remove dependency of WebThemeControlDRTWin on skia::PlatformCanvas
authoralokp@chromium.org <alokp@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Aug 2011 20:22:00 +0000 (20:22 +0000)
committeralokp@chromium.org <alokp@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Aug 2011 20:22:00 +0000 (20:22 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp
Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.h

index 0cbf7488a99254babfebe83c8a5ba774bdb46b0e..216660a43346779a01c37bab0dc0d6459a87e3a8 100644 (file)
@@ -1,3 +1,16 @@
+2011-08-19  Alok Priyadarshi  <alokp@chromium.org>
+
+        [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  <dslomov@google.com>
 
         TestWebKitAPI breaks on Windows due to fast malloc incompatibility.
index 9f6f849be1bb64867a08a61f7ff2364d47a9bc15..13b7982844458cbb14d9a883ae2ee6f462de38a5 100755 (executable)
@@ -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 @@ void WebThemeControlDRTWin::draw()
     // 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 @@ void WebThemeControlDRTWin::draw()
     }
 
     markState();
-    skia::EndPlatformPaint(m_canvas);
 }
 
 // Because rendering a text field is dependent on input
@@ -496,7 +493,6 @@ void WebThemeControlDRTWin::drawTextField(bool drawEdges, bool fillContentArea,
 {
     SkPaint paint;
 
-    skia::BeginPlatformPaint(m_canvas);
     if (fillContentArea) {
         paint.setColor(color);
         paint.setStyle(SkPaint::kFill_Style);
@@ -509,14 +505,12 @@ void WebThemeControlDRTWin::drawTextField(bool drawEdges, bool fillContentArea,
     }
 
     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 @@ void WebThemeControlDRTWin::drawProgressBar(const SkIRect& fillRect)
     m_canvas->drawIRect(tofill, paint);
 
     markState();
-    skia::EndPlatformPaint(m_canvas);
 }
 
index a7e5e360481ac30a2e6bd6c8a2e14e467d9edd84..ef731ab396086f3a9edb267504e704a6c10178f2 100644 (file)
 #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);