Commit ea8d495e authored by vandebo@chromium.org's avatar vandebo@chromium.org

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
parent b5a0c87b
...@@ -398,7 +398,7 @@ bool PrintWebViewHelper::FinalizePreviewDocument() { ...@@ -398,7 +398,7 @@ bool PrintWebViewHelper::FinalizePreviewDocument() {
print_preview_context_.FinalizePreviewDocument(); print_preview_context_.FinalizePreviewDocument();
// Get the size of the resulting metafile. // 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(); uint32 buf_size = metafile->GetDataSize();
DCHECK_GT(buf_size, 0u); DCHECK_GT(buf_size, 0u);
...@@ -1110,7 +1110,8 @@ int PrintWebViewHelper::PrintPreviewContext::total_page_count() const { ...@@ -1110,7 +1110,8 @@ int PrintWebViewHelper::PrintPreviewContext::total_page_count() const {
return total_page_count_; return total_page_count_;
} }
printing::Metafile* PrintWebViewHelper::PrintPreviewContext::metafile() const { printing::PreviewMetafile*
PrintWebViewHelper::PrintPreviewContext::metafile() const {
return metafile_.get(); return metafile_.get();
} }
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "content/renderer/render_view_observer.h" #include "content/renderer/render_view_observer.h"
#include "content/renderer/render_view_observer_tracker.h" #include "content/renderer/render_view_observer_tracker.h"
#include "printing/metafile.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/WebFrameClient.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
...@@ -347,7 +348,7 @@ class PrintWebViewHelper : public RenderViewObserver, ...@@ -347,7 +348,7 @@ class PrintWebViewHelper : public RenderViewObserver,
WebKit::WebFrame* frame() const; WebKit::WebFrame* frame() const;
WebKit::WebNode* node() const; WebKit::WebNode* node() const;
int total_page_count() const; int total_page_count() const;
printing::Metafile* metafile() const; printing::PreviewMetafile* metafile() const;
const PrintMsg_Print_Params& print_params() const; const PrintMsg_Print_Params& print_params() const;
const gfx::Size& GetPrintCanvasSize() const; const gfx::Size& GetPrintCanvasSize() const;
...@@ -367,7 +368,7 @@ class PrintWebViewHelper : public RenderViewObserver, ...@@ -367,7 +368,7 @@ class PrintWebViewHelper : public RenderViewObserver,
scoped_ptr<WebKit::WebNode> node_; scoped_ptr<WebKit::WebNode> node_;
scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view_; scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
scoped_ptr<printing::Metafile> metafile_; scoped_ptr<printing::PreviewMetafile> metafile_;
scoped_ptr<PrintMsg_Print_Params> print_params_; scoped_ptr<PrintMsg_Print_Params> print_params_;
// Total page count in the renderer. // Total page count in the renderer.
......
...@@ -40,8 +40,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) { ...@@ -40,8 +40,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
base::TimeTicks::Now() - begin_time); base::TimeTicks::Now() - begin_time);
scoped_ptr<printing::Metafile> page_metafile; scoped_ptr<printing::Metafile> page_metafile;
if (print_preview_context_.IsModifiable()) { if (print_preview_context_.IsModifiable()) {
page_metafile.reset(reinterpret_cast<printing::PreviewMetafile*>( page_metafile.reset(
print_preview_context_.metafile())->GetMetafileForCurrentPage()); print_preview_context_.metafile()->GetMetafileForCurrentPage());
} }
PreviewPageRendered(page_number, page_metafile.get()); PreviewPageRendered(page_number, page_metafile.get());
} }
......
...@@ -89,8 +89,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) { ...@@ -89,8 +89,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
if (print_preview_context_.IsModifiable()) { if (print_preview_context_.IsModifiable()) {
#if defined(USE_SKIA) #if defined(USE_SKIA)
DCHECK(!draft_metafile.get()); DCHECK(!draft_metafile.get());
draft_metafile.reset(reinterpret_cast<printing::PreviewMetafile*>( draft_metafile.reset(
print_preview_context_.metafile())->GetMetafileForCurrentPage()); print_preview_context_.metafile()->GetMetafileForCurrentPage());
#else #else
draft_metafile->FinishDocument(); draft_metafile->FinishDocument();
......
...@@ -142,8 +142,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) { ...@@ -142,8 +142,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
metafile.release(); metafile.release();
scoped_ptr<printing::Metafile> page_metafile; scoped_ptr<printing::Metafile> page_metafile;
if (print_preview_context_.IsModifiable()) { if (print_preview_context_.IsModifiable()) {
page_metafile.reset(reinterpret_cast<printing::PreviewMetafile*>( page_metafile.reset(
print_preview_context_.metafile())->GetMetafileForCurrentPage()); print_preview_context_.metafile()->GetMetafileForCurrentPage());
} }
PreviewPageRendered(page_number, page_metafile.get()); PreviewPageRendered(page_number, page_metafile.get());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment