Revert 86625 - This change implements a first pass in the effort to remove the dependency of PlatformDevice within Chrome. The Skia library now provides multiple back-ends for the SkDevice class, so PlatformDevice's inheritance of SkDevice, and the assumption of instances of PlatformDevice limits the use of these new back-ends.

A new set of helper functions is provided for the PlatformDevice entry points.  Upon construction of a PlatformDevice, a pointer to the interface is cached in the parent SkDevice's SkMetaData.  The new helper functions forward calls to the interface cached in the metadata.

BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/7019013

TBR=twiz@chromium.org
Review URL: http://codereview.chromium.org/6987019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86629 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/webkit/tools/test_shell/test_shell_webthemecontrol.cc b/webkit/tools/test_shell/test_shell_webthemecontrol.cc
index 25cd94f..08ca901 100644
--- a/webkit/tools/test_shell/test_shell_webthemecontrol.cc
+++ b/webkit/tools/test_shell/test_shell_webthemecontrol.cc
@@ -246,7 +246,7 @@ void Control::draw() {
   // Indents for the the slider track.
   const int kSliderIndent = 2;
 
-  skia::ScopedPlatformPaint scoped_platform_paint(canvas_);
+  skia::BeginPlatformPaint(canvas_);
   switch (type_) {
     case kUnknown_Type:
       NOTREACHED();
@@ -391,6 +391,7 @@ void Control::draw() {
   }
 
   markState();
+  skia::EndPlatformPaint(canvas_);
 }
 
 // Because rendering a text field is dependent on input
@@ -400,7 +401,7 @@ void Control::drawTextField(bool draw_edges, bool fill_content_area,
                             SkColor color) {
   SkPaint paint;
 
-  skia::ScopedPlatformPaint scoped_platform_paint(canvas_);
+  skia::BeginPlatformPaint(canvas_);
   if (fill_content_area) {
     paint.setColor(color);
     paint.setStyle(SkPaint::kFill_Style);
@@ -413,13 +414,14 @@ void Control::drawTextField(bool draw_edges, bool fill_content_area,
   }
 
   markState();
+  skia::EndPlatformPaint(canvas_);
 }
 
 void
 Control::drawProgressBar(const SkIRect& fill_rect) {
   SkPaint paint;
 
-  skia::ScopedPlatformPaint scoped_platform_paint(canvas_);
+  skia::BeginPlatformPaint(canvas_);
   paint.setColor(bg_color_);
   paint.setStyle(SkPaint::kFill_Style);
   canvas_->drawIRect(irect_, paint);
@@ -432,6 +434,7 @@ Control::drawProgressBar(const SkIRect& fill_rect) {
   canvas_->drawIRect(tofill, paint);
 
   markState();
+  skia::EndPlatformPaint(canvas_);
 }
 
 }  // namespace TestShellWebTheme