diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:01:05 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:01:05 +0000 |
commit | 62179a9fc046ec14891d32fbd5f97e6af6f2f896 (patch) | |
tree | 18b465d530df29b6c51352953c5c09cccbc55f51 /chrome/renderer | |
parent | 9d4c2c5161aff8d77372eacd2b19dffe7704db58 (diff) | |
download | chromium_src-62179a9fc046ec14891d32fbd5f97e6af6f2f896.zip chromium_src-62179a9fc046ec14891d32fbd5f97e6af6f2f896.tar.gz chromium_src-62179a9fc046ec14891d32fbd5f97e6af6f2f896.tar.bz2 |
Fix accidental overload in r80818.
BUG=none
TEST=clang bots are happy.
TBR=jam
Review URL: http://codereview.chromium.org/6810024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/print_web_view_helper.cc | 6 | ||||
-rw-r--r-- | chrome/renderer/print_web_view_helper.h | 18 | ||||
-rw-r--r-- | chrome/renderer/print_web_view_helper_linux.cc | 15 | ||||
-rw-r--r-- | chrome/renderer/print_web_view_helper_mac.mm | 7 | ||||
-rw-r--r-- | chrome/renderer/print_web_view_helper_win.cc | 7 |
5 files changed, 28 insertions, 25 deletions
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index 025b34b..5dbd07d 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -128,7 +128,7 @@ PrintWebViewHelper::PrintWebViewHelper(RenderView* render_view) PrintWebViewHelper::~PrintWebViewHelper() {} // Prints |frame| which called window.print(). -void PrintWebViewHelper::printPage(WebKit::WebFrame* frame) { +void PrintWebViewHelper::PrintPage(WebKit::WebFrame* frame) { DCHECK(frame); if (IsScriptInitiatedPrintTooFrequent(frame)) @@ -404,14 +404,14 @@ void PrintWebViewHelper::PrintPages(const PrintMsg_PrintPages_Params& params, if (params.pages.empty()) { for (int i = 0; i < page_count; ++i) { page_params.page_number = i; - PrintPage(page_params, canvas_size, frame); + PrintPageInternal(page_params, canvas_size, frame); } } else { for (size_t i = 0; i < params.pages.size(); ++i) { if (params.pages[i] >= page_count) break; page_params.page_number = params.pages[i]; - PrintPage(page_params, canvas_size, frame); + PrintPageInternal(page_params, canvas_size, frame); } } } diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h index 981ce12..aea048c 100644 --- a/chrome/renderer/print_web_view_helper.h +++ b/chrome/renderer/print_web_view_helper.h @@ -92,7 +92,7 @@ class PrintWebViewHelper : public RenderViewObserver , // RenderViewObserver implementation. virtual bool OnMessageReceived(const IPC::Message& message); - virtual void printPage(WebKit::WebFrame* frame); + virtual void PrintPage(WebKit::WebFrame* frame); // Message handlers --------------------------------------------------------- @@ -149,15 +149,15 @@ class PrintWebViewHelper : public RenderViewObserver , // Prints the page listed in |params|. #if defined(USE_X11) - void PrintPage(const PrintMsg_PrintPage_Params& params, - const gfx::Size& canvas_size, - WebKit::WebFrame* frame, - printing::NativeMetafile* metafile, - scoped_ptr<skia::VectorCanvas>* canvas); + void PrintPageInternal(const PrintMsg_PrintPage_Params& params, + const gfx::Size& canvas_size, + WebKit::WebFrame* frame, + printing::NativeMetafile* metafile, + scoped_ptr<skia::VectorCanvas>* canvas); #else - void PrintPage(const PrintMsg_PrintPage_Params& params, - const gfx::Size& canvas_size, - WebKit::WebFrame* frame); + void PrintPageInternal(const PrintMsg_PrintPage_Params& params, + const gfx::Size& canvas_size, + WebKit::WebFrame* frame); #endif // Render the frame for printing. diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc index a51c94b..30ddb6b 100644 --- a/chrome/renderer/print_web_view_helper_linux.cc +++ b/chrome/renderer/print_web_view_helper_linux.cc @@ -178,12 +178,12 @@ bool PrintWebViewHelper::RenderPages(const PrintMsg_PrintPages_Params& params, if (params.pages.empty()) { for (int i = 0; i < *page_count; ++i) { page_params.page_number = i; - PrintPage(page_params, canvas_size, frame, metafile, &canvas); + PrintPageInternal(page_params, canvas_size, frame, metafile, &canvas); } } else { for (size_t i = 0; i < params.pages.size(); ++i) { page_params.page_number = params.pages[i]; - PrintPage(page_params, canvas_size, frame, metafile, &canvas); + PrintPageInternal(page_params, canvas_size, frame, metafile, &canvas); } } } @@ -193,11 +193,12 @@ bool PrintWebViewHelper::RenderPages(const PrintMsg_PrintPages_Params& params, return true; } -void PrintWebViewHelper::PrintPage(const PrintMsg_PrintPage_Params& params, - const gfx::Size& canvas_size, - WebFrame* frame, - printing::NativeMetafile* metafile, - scoped_ptr<skia::VectorCanvas>* canvas) { +void PrintWebViewHelper::PrintPageInternal( + const PrintMsg_PrintPage_Params& params, + const gfx::Size& canvas_size, + WebFrame* frame, + printing::NativeMetafile* metafile, + scoped_ptr<skia::VectorCanvas>* canvas) { double content_width_in_points; double content_height_in_points; double margin_top_in_points; diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm index 05c862d..b5c8b29 100644 --- a/chrome/renderer/print_web_view_helper_mac.mm +++ b/chrome/renderer/print_web_view_helper_mac.mm @@ -15,9 +15,10 @@ using WebKit::WebFrame; -void PrintWebViewHelper::PrintPage(const PrintMsg_PrintPage_Params& params, - const gfx::Size& canvas_size, - WebFrame* frame) { +void PrintWebViewHelper::PrintPageInternal( + const PrintMsg_PrintPage_Params& params, + const gfx::Size& canvas_size, + WebFrame* frame) { scoped_ptr<printing::NativeMetafile> metafile( printing::NativeMetafileFactory::Create()); if(!metafile.get()) diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc index e7a6c97..0652cfc 100644 --- a/chrome/renderer/print_web_view_helper_win.cc +++ b/chrome/renderer/print_web_view_helper_win.cc @@ -66,9 +66,10 @@ int CALLBACK EnhMetaFileProc(HDC dc, } // namespace -void PrintWebViewHelper::PrintPage(const PrintMsg_PrintPage_Params& params, - const gfx::Size& canvas_size, - WebFrame* frame) { +void PrintWebViewHelper::PrintPageInternal( + const PrintMsg_PrintPage_Params& params, + const gfx::Size& canvas_size, + WebFrame* frame) { // Generate a memory-based metafile. It will use the current screen's DPI. // Each metafile contains a single page. scoped_ptr<printing::NativeMetafile> metafile( |