diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 21:54:06 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 21:54:06 +0000 |
| commit | 7d748990b39550c77aa914ba6846885dd7352e10 (patch) | |
| tree | 3777582ee9816b3488f218b594db1918e5ebe752 /chrome/renderer/print_web_view_helper.h | |
| parent | 03e204f307255e8f39aeb002f94b8eb04137e7f9 (diff) | |
| download | chromium_src-7d748990b39550c77aa914ba6846885dd7352e10.zip chromium_src-7d748990b39550c77aa914ba6846885dd7352e10.tar.gz chromium_src-7d748990b39550c77aa914ba6846885dd7352e10.tar.bz2 | |
Connect the right metafiles for print preview on Linux and Windows.
+ Remove the NativeMetafileFactory since we can't just use preview flag.
+ Update each Metafile constructor site to use PreviewMetafile or NativeMetafileImpl.
+ Fix misc. problems blocking pdf generation on Windows.
+ Rename the metafile interface.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/6826027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/print_web_view_helper.h')
| -rw-r--r-- | chrome/renderer/print_web_view_helper.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h index aea048c..686e7d9 100644 --- a/chrome/renderer/print_web_view_helper.h +++ b/chrome/renderer/print_web_view_helper.h @@ -11,7 +11,7 @@ #include "base/time.h" #include "content/renderer/render_view_observer.h" #include "content/renderer/render_view_observer_tracker.h" -#include "printing/native_metafile.h" +#include "printing/metafile.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h" #include "ui/gfx/size.h" @@ -152,7 +152,7 @@ class PrintWebViewHelper : public RenderViewObserver , void PrintPageInternal(const PrintMsg_PrintPage_Params& params, const gfx::Size& canvas_size, WebKit::WebFrame* frame, - printing::NativeMetafile* metafile, + printing::Metafile* metafile, scoped_ptr<skia::VectorCanvas>* canvas); #else void PrintPageInternal(const PrintMsg_PrintPage_Params& params, @@ -177,25 +177,25 @@ class PrintWebViewHelper : public RenderViewObserver , #if defined(OS_WIN) void RenderPage(const PrintMsg_Print_Params& params, float* scale_factor, int page_number, WebKit::WebFrame* frame, - scoped_ptr<printing::NativeMetafile>* metafile); + scoped_ptr<printing::Metafile>* metafile); #elif defined(OS_MACOSX) void RenderPage(const gfx::Size& page_size, const gfx::Point& content_origin, const float& scale_factor, int page_number, - WebKit::WebFrame* frame, printing::NativeMetafile* metafile); + WebKit::WebFrame* frame, printing::Metafile* metafile); #elif defined(OS_POSIX) bool RenderPages(const PrintMsg_PrintPages_Params& params, WebKit::WebFrame* frame, WebKit::WebNode* node, bool send_expected_page_count, int* page_count, - printing::NativeMetafile* metafile); + printing::Metafile* metafile); #endif // defined(OS_WIN) // Helper methods ----------------------------------------------------------- bool CopyAndPrint(WebKit::WebFrame* web_frame); - bool CopyMetafileDataToSharedMem(printing::NativeMetafile* metafile, + bool CopyMetafileDataToSharedMem(printing::Metafile* metafile, base::SharedMemoryHandle* shared_mem_handle); static void GetPageSizeAndMarginsInPoints( |