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

Side by Side Diff: chrome/renderer/print_web_view_helper_win.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: Fixed comment Created 9 years, 3 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/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 } 120 }
121 121
122 Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params)); 122 Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params));
123 } 123 }
124 124
125 bool PrintWebViewHelper::RenderPreviewPage(int page_number) { 125 bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
126 PrintMsg_Print_Params print_params = print_preview_context_.print_params(); 126 PrintMsg_Print_Params print_params = print_preview_context_.print_params();
127 // Calculate the dpi adjustment. 127 // Calculate the dpi adjustment.
128 float scale_factor = static_cast<float>(print_params.desired_dpi / 128 float scale_factor = static_cast<float>(print_params.desired_dpi /
129 print_params.dpi); 129 print_params.dpi);
130 scoped_ptr<Metafile> draft_metafile;
131 printing::Metafile* initial_render_metafile =
132 print_preview_context_.metafile();
133
134 if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
135 draft_metafile.reset(new printing::PreviewMetafile);
136 initial_render_metafile = draft_metafile.get();
137 }
130 138
131 base::TimeTicks begin_time = base::TimeTicks::Now(); 139 base::TimeTicks begin_time = base::TimeTicks::Now();
132 printing::Metafile* render_page_result = 140 printing::Metafile* render_page_result =
133 RenderPage(print_params, &scale_factor, page_number, true, 141 RenderPage(print_params, &scale_factor, page_number, true,
134 print_preview_context_.frame(), 142 print_preview_context_.frame(), initial_render_metafile);
135 print_preview_context_.metafile());
136 // In the preview flow, RenderPage will never return a new metafile. 143 // In the preview flow, RenderPage will never return a new metafile.
137 DCHECK_EQ(render_page_result, print_preview_context_.metafile()); 144 DCHECK_EQ(render_page_result, initial_render_metafile);
138
139 print_preview_context_.RenderedPreviewPage( 145 print_preview_context_.RenderedPreviewPage(
140 base::TimeTicks::Now() - begin_time); 146 base::TimeTicks::Now() - begin_time);
141 147
142 scoped_ptr<printing::Metafile> page_metafile; 148 if (draft_metafile.get()) {
143 if (print_preview_context_.IsModifiable()) { 149 draft_metafile->FinishDocument();
144 page_metafile.reset( 150 } else if (print_preview_context_.IsModifiable() &&
151 print_preview_context_.generate_draft_pages()){
152 DCHECK(!draft_metafile.get());
153 draft_metafile.reset(
145 print_preview_context_.metafile()->GetMetafileForCurrentPage()); 154 print_preview_context_.metafile()->GetMetafileForCurrentPage());
146 } 155 }
147 return PreviewPageRendered(page_number, page_metafile.get()); 156 return PreviewPageRendered(page_number, draft_metafile.get());
148 } 157 }
149 158
150 Metafile* PrintWebViewHelper::RenderPage( 159 Metafile* PrintWebViewHelper::RenderPage(
151 const PrintMsg_Print_Params& params, float* scale_factor, int page_number, 160 const PrintMsg_Print_Params& params, float* scale_factor, int page_number,
152 bool is_preview, WebFrame* frame, Metafile* metafile) { 161 bool is_preview, WebFrame* frame, Metafile* metafile) {
153 printing::PageSizeMargins page_layout_in_points; 162 printing::PageSizeMargins page_layout_in_points;
154 GetPageSizeAndMarginsInPoints(frame, page_number, params, 163 GetPageSizeAndMarginsInPoints(frame, page_number, params,
155 &page_layout_in_points); 164 &page_layout_in_points);
156 165
157 int width; 166 int width;
(...skipping 19 matching lines...) Expand all
177 static_cast<int>(page_layout_in_points.margin_top), 186 static_cast<int>(page_layout_in_points.margin_top),
178 static_cast<int>(page_layout_in_points.content_width), 187 static_cast<int>(page_layout_in_points.content_width),
179 static_cast<int>(page_layout_in_points.content_height)); 188 static_cast<int>(page_layout_in_points.content_height));
180 SkDevice* device = metafile->StartPageForVectorCanvas( 189 SkDevice* device = metafile->StartPageForVectorCanvas(
181 page_size, content_area, frame->getPrintPageShrink(page_number)); 190 page_size, content_area, frame->getPrintPageShrink(page_number));
182 DCHECK(device); 191 DCHECK(device);
183 // The printPage method may take a reference to the canvas we pass down, so it 192 // The printPage method may take a reference to the canvas we pass down, so it
184 // can't be a stack object. 193 // can't be a stack object.
185 SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device); 194 SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device);
186 canvas->unref(); // SkRefPtr and new both took a reference. 195 canvas->unref(); // SkRefPtr and new both took a reference.
187 if (is_preview) 196 if (is_preview) {
188 printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(), metafile); 197 printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(), metafile);
198 printing::MetafileSkiaWrapper::SetDraftMode(canvas.get(),
199 is_print_ready_metafile_sent_);
200 }
189 201
190 float webkit_scale_factor = frame->printPage(page_number, canvas.get()); 202 float webkit_scale_factor = frame->printPage(page_number, canvas.get());
191 203
192 if (params.display_header_footer) { 204 if (params.display_header_footer) {
193 // |page_number| is 0-based, so 1 is added. 205 // |page_number| is 0-based, so 1 is added.
194 PrintHeaderAndFooter(canvas.get(), page_number + 1, 206 PrintHeaderAndFooter(canvas.get(), page_number + 1,
195 print_preview_context_.total_page_count(), 207 print_preview_context_.total_page_count(),
196 webkit_scale_factor, page_layout_in_points, 208 webkit_scale_factor, page_layout_in_points,
197 *header_footer_info_); 209 *header_footer_info_);
198 } 210 }
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 shared_buf.Unmap(); 300 shared_buf.Unmap();
289 return false; 301 return false;
290 } 302 }
291 shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), shared_mem_handle); 303 shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), shared_mem_handle);
292 shared_buf.Unmap(); 304 shared_buf.Unmap();
293 305
294 Send(new PrintHostMsg_DuplicateSection(routing_id(), *shared_mem_handle, 306 Send(new PrintHostMsg_DuplicateSection(routing_id(), *shared_mem_handle,
295 shared_mem_handle)); 307 shared_mem_handle));
296 return true; 308 return true;
297 } 309 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698