[NOT FOR COMMIT] Fully replace SkCanvas uses.

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 297 matching lines @@
     const PP_Rect* clip,
     PP_Bool image_data_is_opaque) {
   PP_Bool result = PP_FALSE;
   // Get and map the image data we're painting to.
   EnterResourceNoLock<PPB_ImageData_API> enter(image_data, true);
   if (enter.failed())
     return result;
 
   PPB_ImageData_API* image = static_cast<PPB_ImageData_API*>(
       enter.object());
-  SkCanvas* canvas = image->GetPlatformCanvas();
+  CdlCanvas* canvas = image->GetPlatformCanvas();
   bool needs_unmapping = false;
   if (!canvas) {
     needs_unmapping = true;
     image->Map();
     canvas = image->GetPlatformCanvas();
     if (!canvas)
       return result;  // Failure mapping.
   }
 
   if (!PP_ToBool(image_data_is_opaque)) {
     // Ideally, LCD text should be configured at canvas creation time using
     // SkSurfaceProps. But because the API exposes image_data_is_opaque per
     // draw text call (allowing clients to essentially change their mind),
     // we have to handle it here.
     SkImageInfo info;
     size_t row_bytes;
-    void* pixels = canvas->accessTopLayerPixels(&info, &row_bytes);
+    void* pixels = GetSkCanvas(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);
-    SkCanvas temp_canvas(bm, props);
+    CdlCanvas temp_canvas(bm, props);
 
     DrawTextToCanvas(&temp_canvas, *text, position, color, clip);
   } else {
     DrawTextToCanvas(canvas, *text, position, color, clip);
   }
 
   if (needs_unmapping)
     image->Unmap();
   return PP_TRUE;
 }
@@ skipping 52 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(
-    SkCanvas* destination,
+    CdlCanvas* 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. SkCanvas doesn't have a size on it, so we just use
@@ skipping 16 matching lines @@
 
     // 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