summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/tools/test_shell/test_shell_webthemecontrol.cc14
-rw-r--r--webkit/tools/test_shell/test_shell_webthemecontrol.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/webkit/tools/test_shell/test_shell_webthemecontrol.cc b/webkit/tools/test_shell/test_shell_webthemecontrol.cc
index 08a5a56..08ca901 100644
--- a/webkit/tools/test_shell/test_shell_webthemecontrol.cc
+++ b/webkit/tools/test_shell/test_shell_webthemecontrol.cc
@@ -54,7 +54,7 @@ SkIRect Validate(const SkIRect& rect, Control::Type ctype) {
return retval;
}
-Control::Control(skia::PlatformCanvas* canvas, const SkIRect& irect,
+Control::Control(SkCanvas* canvas, const SkIRect& irect,
Type ctype, State cstate)
: canvas_(canvas),
irect_(Validate(irect, ctype)),
@@ -246,7 +246,7 @@ void Control::draw() {
// Indents for the the slider track.
const int kSliderIndent = 2;
- canvas_->beginPlatformPaint();
+ skia::BeginPlatformPaint(canvas_);
switch (type_) {
case kUnknown_Type:
NOTREACHED();
@@ -391,7 +391,7 @@ void Control::draw() {
}
markState();
- canvas_->endPlatformPaint();
+ skia::EndPlatformPaint(canvas_);
}
// Because rendering a text field is dependent on input
@@ -401,7 +401,7 @@ void Control::drawTextField(bool draw_edges, bool fill_content_area,
SkColor color) {
SkPaint paint;
- canvas_->beginPlatformPaint();
+ skia::BeginPlatformPaint(canvas_);
if (fill_content_area) {
paint.setColor(color);
paint.setStyle(SkPaint::kFill_Style);
@@ -414,14 +414,14 @@ void Control::drawTextField(bool draw_edges, bool fill_content_area,
}
markState();
- canvas_->endPlatformPaint();
+ skia::EndPlatformPaint(canvas_);
}
void
Control::drawProgressBar(const SkIRect& fill_rect) {
SkPaint paint;
- canvas_->beginPlatformPaint();
+ skia::BeginPlatformPaint(canvas_);
paint.setColor(bg_color_);
paint.setStyle(SkPaint::kFill_Style);
canvas_->drawIRect(irect_, paint);
@@ -434,7 +434,7 @@ Control::drawProgressBar(const SkIRect& fill_rect) {
canvas_->drawIRect(tofill, paint);
markState();
- canvas_->endPlatformPaint();
+ skia::EndPlatformPaint(canvas_);
}
} // namespace TestShellWebTheme
diff --git a/webkit/tools/test_shell/test_shell_webthemecontrol.h b/webkit/tools/test_shell/test_shell_webthemecontrol.h
index 3b949b4..40d3141 100644
--- a/webkit/tools/test_shell/test_shell_webthemecontrol.h
+++ b/webkit/tools/test_shell/test_shell_webthemecontrol.h
@@ -95,7 +95,7 @@ class Control {
// canvas is the canvas to draw onto, and rect gives the size of the
// control. ctype and cstate specify the type and state of the control.
- Control(skia::PlatformCanvas* canvas, const SkIRect& rect,
+ Control(SkCanvas* canvas, const SkIRect& rect,
Type ctype, State cstate);
~Control();
@@ -153,7 +153,7 @@ class Control {
// color is which.
void markState();
- skia::PlatformCanvas* canvas_;
+ SkCanvas* canvas_;
const SkIRect irect_;
const Type type_;
const State state_;