Removal of dependencies on PlatformDevice classes.

webkit/tools/test_shell/test_shell_webthemecontrol.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file implements a simple generic version of the WebKitThemeEngine,
 // which is used to draw all the native controls on a web page. We use this
 // file when running in layout test mode in order to remove any
 // platform-specific rendering differences due to themes, colors, etc.
 //
 
@@ skipping 228 matching lines @@
   const int kThumbLongIndent = 0;
   const int kThumbShortIndent = 2;
 
   // Indents for the crosshatch on a scroll grip.
   const int kGripLongIndent = 3;
   const int kGripShortIndent = 5;
 
   // Indents for the the slider track.
   const int kSliderIndent = 2;
 
-  skia::BeginPlatformPaint(canvas_);
+  skia::ScopedPlatformPaint scoped_platform_paint(canvas_);
   switch (type_) {
     case kUnknown_Type:
       NOTREACHED();
       break;
     case kTextField_Type:
       // We render this by hand outside of this function.
       NOTREACHED();
       break;
     case kPushButton_Type:
       // push buttons render as a rounded rectangle
@@ skipping 124 matching lines @@
       triangle(left_  + quarter_width, top_,
                right_ - quarter_width, top_,
                left_  + half_width,    bottom_, fg_color_);
       break;
     default:
       NOTREACHED();
       break;
   }
 
   markState();
-  skia::EndPlatformPaint(canvas_);
 }
 
 // Because rendering a text field is dependent on input
 // parameters the other controls don't have, we render it directly
 // rather than trying to overcomplicate draw() further.
 void Control::drawTextField(bool draw_edges, bool fill_content_area,
                             SkColor color) {
   SkPaint paint;
 
-  skia::BeginPlatformPaint(canvas_);
+  skia::ScopedPlatformPaint scoped_platform_paint(canvas_);
   if (fill_content_area) {
     paint.setColor(color);
     paint.setStyle(SkPaint::kFill_Style);
     canvas_->drawIRect(irect_, paint);
   }
   if (draw_edges) {
     paint.setColor(edge_color_);
     paint.setStyle(SkPaint::kStroke_Style);
     canvas_->drawIRect(irect_, paint);
   }
 
   markState();
-  skia::EndPlatformPaint(canvas_);
 }
 
 void
 Control::drawProgressBar(const SkIRect& fill_rect) {
   SkPaint paint;
 
-  skia::BeginPlatformPaint(canvas_);
+  skia::ScopedPlatformPaint scoped_platform_paint(canvas_);
   paint.setColor(bg_color_);
   paint.setStyle(SkPaint::kFill_Style);
   canvas_->drawIRect(irect_, paint);
 
   // Emulate clipping
   SkIRect tofill;
   tofill.intersect(irect_, fill_rect);
   paint.setColor(fg_color_);
   paint.setStyle(SkPaint::kFill_Style);
   canvas_->drawIRect(tofill, paint);
 
   markState();
-  skia::EndPlatformPaint(canvas_);
 }
 
 }  // namespace TestShellWebTheme