Revert 78812 - Unfork VectorPlatformCanvas.

skia/ext/vector_platform_device_linux.cc

 // Copyright (c) 2009 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 "skia/ext/vector_platform_device.h"
 
 #include <cairo.h>
 #include <cairo-ft.h>
 
 #include <ft2build.h>
@@ skipping 60 matching lines @@
 SkDevice* VectorPlatformDeviceFactory::newDevice(SkCanvas* ignored,
                                                  SkBitmap::Config config,
                                                  int width, int height,
                                                  bool isOpaque,
                                                  bool isForLayer) {
   SkASSERT(config == SkBitmap::kARGB_8888_Config);
   return CreateDevice(NULL, width, height, isOpaque);
 }
 
 // static
-PlatformDevice* VectorPlatformDeviceFactory::CreateDevice(cairo_t* context,
-                                                          int width, int height,
-                                                          bool isOpaque) {
+SkDevice* VectorPlatformDeviceFactory::CreateDevice(cairo_t* context,
+                                                    int width, int height,
+                                                    bool isOpaque) {
   // TODO(myhuang): Here we might also have similar issues as those on Windows
   // (vector_canvas_win.cc, http://crbug.com/18382 & http://crbug.com/18383).
   // Please note that is_opaque is true when we use this class for printing.
   // Fallback to bitmap when context is NULL.
   if (!isOpaque || NULL == context) {
     return BitmapPlatformDevice::Create(width, height, isOpaque);
   }
 
   PlatformDevice* device =
     VectorPlatformDevice::create(context, width, height);
@@ skipping 603 matching lines @@
     DCHECK(it->second.font_stream);
 
     cairo_font_face_destroy(it->second.cairo_face);
     // |it->second.ft_face| is handled by Cairo.
     it->second.font_stream->unref();
   }
   g_font_cache->clear();
 }
 
 }  // namespace skia