Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Side by Side Diff: chrome/renderer/print_web_view_helper_linux.cc

Issue 7647010: Print preview page selection should not require a rerendering of draft pages. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix win browser_test failures. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/print_web_view_helper.h" 5 #include "chrome/renderer/print_web_view_helper.h"
6 6
7 #include "base/file_descriptor_posix.h" 7 #include "base/file_descriptor_posix.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 11 matching lines...) Expand all
22 #include "base/process_util.h" 22 #include "base/process_util.h"
23 #endif // !defined(OS_CHROMEOS) 23 #endif // !defined(OS_CHROMEOS)
24 24
25 using WebKit::WebFrame; 25 using WebKit::WebFrame;
26 using WebKit::WebNode; 26 using WebKit::WebNode;
27 27
28 void PrintWebViewHelper::RenderPreviewPage(int page_number) { 28 void PrintWebViewHelper::RenderPreviewPage(int page_number) {
29 PrintMsg_PrintPage_Params page_params; 29 PrintMsg_PrintPage_Params page_params;
30 page_params.params = print_preview_context_.print_params(); 30 page_params.params = print_preview_context_.print_params();
31 page_params.page_number = page_number; 31 page_params.page_number = page_number;
32 scoped_ptr<printing::Metafile> draft_metafile;
33 printing::Metafile* initial_render_metafile =
34 print_preview_context_.metafile();
35 if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
36 draft_metafile.reset(new printing::PreviewMetafile);
37 initial_render_metafile = draft_metafile.get();
38 }
32 39
33 base::TimeTicks begin_time = base::TimeTicks::Now(); 40 base::TimeTicks begin_time = base::TimeTicks::Now();
34 PrintPageInternal(page_params, 41 PrintPageInternal(page_params,
35 print_preview_context_.GetPrintCanvasSize(), 42 print_preview_context_.GetPrintCanvasSize(),
36 print_preview_context_.frame(), 43 print_preview_context_.frame(), initial_render_metafile);
37 print_preview_context_.metafile());
38
39 print_preview_context_.RenderedPreviewPage( 44 print_preview_context_.RenderedPreviewPage(
40 base::TimeTicks::Now() - begin_time); 45 base::TimeTicks::Now() - begin_time);
41 scoped_ptr<printing::Metafile> page_metafile; 46 if (draft_metafile.get()) {
42 if (print_preview_context_.IsModifiable()) { 47 draft_metafile->FinishDocument();
43 page_metafile.reset( 48 } else if (print_preview_context_.IsModifiable() &&
49 print_preview_context_.generate_draft_pages()){
50 DCHECK(!draft_metafile.get());
51 draft_metafile.reset(
44 print_preview_context_.metafile()->GetMetafileForCurrentPage()); 52 print_preview_context_.metafile()->GetMetafileForCurrentPage());
45 } 53 }
46 PreviewPageRendered(page_number, page_metafile.get()); 54 PreviewPageRendered(page_number, draft_metafile.get());
47 } 55 }
48 56
49 bool PrintWebViewHelper::PrintPages(const PrintMsg_PrintPages_Params& params, 57 bool PrintWebViewHelper::PrintPages(const PrintMsg_PrintPages_Params& params,
50 WebFrame* frame, 58 WebFrame* frame,
51 WebNode* node, 59 WebNode* node,
52 PrepareFrameAndViewForPrint* prepare) { 60 PrepareFrameAndViewForPrint* prepare) {
53 printing::NativeMetafile metafile; 61 printing::NativeMetafile metafile;
54 if (!metafile.Init()) 62 if (!metafile.Init())
55 return false; 63 return false;
56 64
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 SkDevice* device = metafile->StartPageForVectorCanvas( 208 SkDevice* device = metafile->StartPageForVectorCanvas(
201 page_size, content_area, 1.0f); 209 page_size, content_area, 1.0f);
202 if (!device) 210 if (!device)
203 return; 211 return;
204 212
205 // The printPage method take a reference to the canvas we pass down, so it 213 // The printPage method take a reference to the canvas we pass down, so it
206 // can't be a stack object. 214 // can't be a stack object.
207 SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device); 215 SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device);
208 canvas->unref(); // SkRefPtr and new both took a reference. 216 canvas->unref(); // SkRefPtr and new both took a reference.
209 printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(), metafile); 217 printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(), metafile);
218 printing::MetafileSkiaWrapper::SetDraftMode(canvas.get(),
219 is_print_ready_metafile_sent_);
210 frame->printPage(params.page_number, canvas.get()); 220 frame->printPage(params.page_number, canvas.get());
211 221
212 // TODO(myhuang): We should render the header and the footer. 222 // TODO(myhuang): We should render the header and the footer.
213 223
214 // Done printing. Close the device context to retrieve the compiled metafile. 224 // Done printing. Close the device context to retrieve the compiled metafile.
215 if (!metafile->FinishPage()) 225 if (!metafile->FinishPage())
216 NOTREACHED() << "metafile failed"; 226 NOTREACHED() << "metafile failed";
217 } 227 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698