From 9b051a375ba6d6b61cea98f35834cd032aaa5347 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 20 Aug 2013 20:06:40 +0000 Subject: Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready. git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81 --- experimental/PdfViewer/pdf_viewer_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'experimental/PdfViewer/pdf_viewer_main.cpp') diff --git a/experimental/PdfViewer/pdf_viewer_main.cpp b/experimental/PdfViewer/pdf_viewer_main.cpp index 79338425ff..8949e7e20e 100644 --- a/experimental/PdfViewer/pdf_viewer_main.cpp +++ b/experimental/PdfViewer/pdf_viewer_main.cpp @@ -179,7 +179,7 @@ static bool render_page(const SkString& outputDir, // Exercise all pdf codepaths as in normal rendering, but no actual bits are changed. if (!FLAGS_config.isEmpty() && strcmp(FLAGS_config[0], "nul") == 0) { SkBitmap bitmap; - SkAutoTUnref device(SkNEW_ARGS(SkBitmapDevice, (bitmap))); + SkAutoTUnref device(SkNEW_ARGS(SkDevice, (bitmap))); SkNulCanvas canvas(device); renderer.renderPage(page < 0 ? 0 : page, &canvas, rect); } else { @@ -197,9 +197,9 @@ static bool render_page(const SkString& outputDir, #else setup_bitmap(&bitmap, (int)SkScalarToDouble(width), (int)SkScalarToDouble(height)); #endif - SkAutoTUnref device; + SkAutoTUnref device; if (strcmp(FLAGS_config[0], "8888") == 0) { - device.reset(SkNEW_ARGS(SkBitmapDevice, (bitmap))); + device.reset(SkNEW_ARGS(SkDevice, (bitmap))); } #if SK_SUPPORT_GPU else if (strcmp(FLAGS_config[0], "gpu") == 0) { -- cgit v1.2.3