Update Chrome's Skia Device to use the new device factory interface (http://code.google.com/p/skia/source/detail?r=1180).

Remove valgrind suppression.

BUG=80836
TEST=NONE

Review URL: http://codereview.chromium.org/6883255

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

1 files changed, 4 insertions, 4 deletions

diff --git a/skia/ext/platform_canvas_win.cc b/skia/ext/platform_canvas_win.cc
index 2283b19..a6381ed 100644
--- a/skia/ext/platform_canvas_win.cc
+++ b/skia/ext/platform_canvas_win.cc
@@ -76,8 +76,8 @@ void CrashIfInvalidSection(HANDLE shared_section) {
 // Restore the optimization options.
 #pragma optimize("", on)
 
-PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque)
-    : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
+PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque) {
+  setDeviceFactory(SkNEW(BitmapPlatformDeviceFactory))->unref();
   bool initialized = initialize(width, height, is_opaque, NULL);
   if (!initialized)
     CrashForBitmapAllocationFailure(width, height);
@@ -86,8 +86,8 @@ PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque)
 PlatformCanvas::PlatformCanvas(int width,
                                int height,
                                bool is_opaque,
-                               HANDLE shared_section)
-    : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
+                               HANDLE shared_section) {
+  setDeviceFactory(SkNEW(BitmapPlatformDeviceFactory))->unref();
   bool initialized = initialize(width, height, is_opaque, shared_section);
   if (!initialized) {
     CrashIfInvalidSection(shared_section);