Remove metafile casts.

Change PrintWebViewHelper::PrintPreviewContext to have a PreviewMetafile, removing the need to cast it.

BUG=NONE
TEST=NONE


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

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

5 files changed, 12 insertions, 10 deletions

diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index a2c9889..b065f31 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -398,7 +398,7 @@ bool PrintWebViewHelper::FinalizePreviewDocument() {
   print_preview_context_.FinalizePreviewDocument();
 
   // Get the size of the resulting metafile.
-  printing::Metafile* metafile = print_preview_context_.metafile();
+  printing::PreviewMetafile* metafile = print_preview_context_.metafile();
   uint32 buf_size = metafile->GetDataSize();
   DCHECK_GT(buf_size, 0u);
 
@@ -1110,7 +1110,8 @@ int PrintWebViewHelper::PrintPreviewContext::total_page_count() const {
   return total_page_count_;
 }
 
-printing::Metafile* PrintWebViewHelper::PrintPreviewContext::metafile() const {
+printing::PreviewMetafile*
+PrintWebViewHelper::PrintPreviewContext::metafile() const {
   return metafile_.get();
 }
 
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index e2bd4f6..dfc881c 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -15,6 +15,7 @@
 #include "content/renderer/render_view_observer.h"
 #include "content/renderer/render_view_observer_tracker.h"
 #include "printing/metafile.h"
+#include "printing/metafile_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
@@ -347,7 +348,7 @@ class PrintWebViewHelper : public RenderViewObserver,
     WebKit::WebFrame* frame() const;
     WebKit::WebNode* node() const;
     int total_page_count() const;
-    printing::Metafile* metafile() const;
+    printing::PreviewMetafile* metafile() const;
     const PrintMsg_Print_Params& print_params() const;
     const gfx::Size& GetPrintCanvasSize() const;
 
@@ -367,7 +368,7 @@ class PrintWebViewHelper : public RenderViewObserver,
     scoped_ptr<WebKit::WebNode> node_;
 
     scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
-    scoped_ptr<printing::Metafile> metafile_;
+    scoped_ptr<printing::PreviewMetafile> metafile_;
     scoped_ptr<PrintMsg_Print_Params> print_params_;
 
     // Total page count in the renderer.
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc
index 771d37b..0915681 100644
--- a/chrome/renderer/print_web_view_helper_linux.cc
+++ b/chrome/renderer/print_web_view_helper_linux.cc
@@ -40,8 +40,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
       base::TimeTicks::Now() - begin_time);
   scoped_ptr<printing::Metafile> page_metafile;
   if (print_preview_context_.IsModifiable()) {
-    page_metafile.reset(reinterpret_cast<printing::PreviewMetafile*>(
-        print_preview_context_.metafile())->GetMetafileForCurrentPage());
+    page_metafile.reset(
+        print_preview_context_.metafile()->GetMetafileForCurrentPage());
   }
   PreviewPageRendered(page_number, page_metafile.get());
 }
diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
index 8455947..95ccb7e 100644
--- a/chrome/renderer/print_web_view_helper_mac.mm
+++ b/chrome/renderer/print_web_view_helper_mac.mm
@@ -89,8 +89,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
   if (print_preview_context_.IsModifiable()) {
 #if defined(USE_SKIA)
     DCHECK(!draft_metafile.get());
-    draft_metafile.reset(reinterpret_cast<printing::PreviewMetafile*>(
-        print_preview_context_.metafile())->GetMetafileForCurrentPage());
+    draft_metafile.reset(
+        print_preview_context_.metafile()->GetMetafileForCurrentPage());
 #else
     draft_metafile->FinishDocument();
 
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index edaaf8f..8badae0 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -142,8 +142,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
   metafile.release();
   scoped_ptr<printing::Metafile> page_metafile;
   if (print_preview_context_.IsModifiable()) {
-    page_metafile.reset(reinterpret_cast<printing::PreviewMetafile*>(
-        print_preview_context_.metafile())->GetMetafileForCurrentPage());
+    page_metafile.reset(
+        print_preview_context_.metafile()->GetMetafileForCurrentPage());
   }
   PreviewPageRendered(page_number, page_metafile.get());
 }