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

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

2 files changed, 7 insertions, 9 deletions

diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index 56b0c71..25ae1db 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -548,10 +548,9 @@ LRESULT NativeTableWin::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
                               (intersection.right - intersection.left);
               to_draw.bottom = to_draw.top +
                               (intersection.bottom - intersection.top);
-              canvas.getTopPlatformDevice().drawToHDC(draw_info->nmcd.hdc,
-                                                      intersection.left,
-                                                      intersection.top,
-                                                      &to_draw);
+              skia::DrawToNativeContext(&canvas, draw_info->nmcd.hdc,
+                                       intersection.left, intersection.top,
+                                       &to_draw);
               r = CDRF_SKIPDEFAULT;
             }
           }
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 4a3b1cb6..3a6aea6 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -1158,7 +1158,7 @@ void TableView::PaintAltText() {
   canvas.DrawStringWithHalo(alt_text_, font, SK_ColorDKGRAY, SK_ColorWHITE, 1,
                             1, bounds.width() - 2, bounds.height() - 2,
                             gfx::CanvasSkia::DefaultCanvasTextAlignment());
-  canvas.getTopPlatformDevice().drawToHDC(dc, bounds.x(), bounds.y(), NULL);
+  skia::DrawToNativeContext(&canvas, dc, bounds.x(), bounds.y(), NULL);
   ReleaseDC(GetNativeControlHWND(), dc);
 }
 
@@ -1273,10 +1273,9 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
                               (intersection.right - intersection.left);
               to_draw.bottom = to_draw.top +
                               (intersection.bottom - intersection.top);
-              canvas.getTopPlatformDevice().drawToHDC(draw_info->nmcd.hdc,
-                                                      intersection.left,
-                                                      intersection.top,
-                                                      &to_draw);
+              skia::DrawToNativeContext(&canvas, draw_info->nmcd.hdc,
+                                       intersection.left, intersection.top,
+                                       &to_draw);
               r = CDRF_SKIPDEFAULT;
             }
           }