Revert of Make cc/paint have concrete types

content/child/browser_font_resource_trusted.cc

 // Copyright (c) 2012 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.
 
 #include "content/child/browser_font_resource_trusted.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
@@ skipping 323 matching lines @@
     size_t row_bytes;
     void* pixels = canvas->accessTopLayerPixels(&info, &row_bytes);
     if (!pixels)
       return result;
 
     SkBitmap bm;
     if (!bm.installPixels(info, pixels, row_bytes))
       return result;
 
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
-    cc::PaintCanvas temp_canvas(bm, props);
+    SkCanvas temp_canvas(bm, props);
 
     DrawTextToCanvas(&temp_canvas, *text, position, color, clip);
   } else {
-    cc::PaintCanvas temp_canvas(canvas);
-    DrawTextToCanvas(&temp_canvas, *text, position, color, clip);
+    DrawTextToCanvas(canvas, *text, position, color, clip);
   }
 
   if (needs_unmapping)
     image->Unmap();
   return PP_TRUE;
 }
 
 int32_t BrowserFontResource_Trusted::MeasureText(
     const PP_BrowserFont_Trusted_TextRun* text) {
   WebTextRun run;
@@ skipping 48 matching lines @@
     } else {
       // Character is past this run, account for the pixels and continue
       // looking.
       cur_pixel_offset += font_->calculateWidth(run);
     }
   }
   return -1;  // Requested a char beyond the end.
 }
 
 void BrowserFontResource_Trusted::DrawTextToCanvas(
-    cc::PaintCanvas* destination,
+    SkCanvas* destination,
     const PP_BrowserFont_Trusted_TextRun& text,
     const PP_Point* position,
     uint32_t color,
     const PP_Rect* clip) {
   // Convert position and clip.
   WebFloatPoint web_position(static_cast<float>(position->x),
                              static_cast<float>(position->y));
   WebRect web_clip;
   if (!clip) {
-    // Use entire canvas. PaintCanvas doesn't have a size on it, so we just use
+    // Use entire canvas. SkCanvas doesn't have a size on it, so we just use
     // the current clip bounds.
     SkRect skclip = destination->getLocalClipBounds();
     web_clip = WebRect(skclip.fLeft, skclip.fTop, skclip.fRight - skclip.fLeft,
                        skclip.fBottom - skclip.fTop);
   } else {
     web_clip = WebRect(clip->point.x, clip->point.y,
                        clip->size.width, clip->size.height);
   }
 
   TextRunCollection runs(text);
   for (int i = 0; i < runs.num_runs(); i++) {
     int32_t run_begin = 0;
     int32_t run_len = 0;
     WebTextRun run = runs.GetRunAt(i, &run_begin, &run_len);
     font_->drawText(destination, run, web_position, color, web_clip);
 
     // Advance to the next run. Note that we avoid doing this for the last run
     // since it's unnecessary, measuring text is slow, and most of the time
     // there will be only one run anyway.
     if (i != runs.num_runs() - 1)
       web_position.x += font_->calculateWidth(run);
   }
 }
 
 }  // namespace content