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

Side by Side Diff: chrome/renderer/print_web_view_helper_mac.mm

Issue 7549001: PrintPreview: Remove |page_number| from StartPageForVectorCanvas function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' 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 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/scoped_nsautorelease_pool.h" 10 #include "base/mac/scoped_nsautorelease_pool.h"
(...skipping 14 matching lines...) Expand all
25 void PrintWebViewHelper::PrintPageInternal( 25 void PrintWebViewHelper::PrintPageInternal(
26 const PrintMsg_PrintPage_Params& params, 26 const PrintMsg_PrintPage_Params& params,
27 const gfx::Size& canvas_size, 27 const gfx::Size& canvas_size,
28 WebFrame* frame) { 28 WebFrame* frame) {
29 printing::NativeMetafile metafile; 29 printing::NativeMetafile metafile;
30 if (!metafile.Init()) 30 if (!metafile.Init())
31 return; 31 return;
32 32
33 float scale_factor = frame->getPrintPageShrink(params.page_number); 33 float scale_factor = frame->getPrintPageShrink(params.page_number);
34 int page_number = params.page_number; 34 int page_number = params.page_number;
35 int page_slot = params.page_slot;
36 35
37 // Render page for printing. 36 // Render page for printing.
38 gfx::Rect content_area(params.params.printable_size); 37 gfx::Rect content_area(params.params.printable_size);
39 RenderPage(params.params.printable_size, content_area, scale_factor, 38 RenderPage(params.params.printable_size, content_area, scale_factor,
40 page_number, page_slot, frame, &metafile); 39 page_number, frame, &metafile);
41 metafile.FinishDocument(); 40 metafile.FinishDocument();
42 41
43 PrintHostMsg_DidPrintPage_Params page_params; 42 PrintHostMsg_DidPrintPage_Params page_params;
44 page_params.data_size = metafile.GetDataSize(); 43 page_params.data_size = metafile.GetDataSize();
45 page_params.page_number = page_number; 44 page_params.page_number = page_number;
46 page_params.document_cookie = params.params.document_cookie; 45 page_params.document_cookie = params.params.document_cookie;
47 page_params.actual_shrink = scale_factor; 46 page_params.actual_shrink = scale_factor;
48 page_params.page_size = params.params.page_size; 47 page_params.page_size = params.params.page_size;
49 page_params.content_area = gfx::Rect(params.params.margin_left, 48 page_params.content_area = gfx::Rect(params.params.margin_left,
50 params.params.margin_top, 49 params.params.margin_top,
(...skipping 23 matching lines...) Expand all
74 initial_render_metafile = new printing::PreviewMetafile(); 73 initial_render_metafile = new printing::PreviewMetafile();
75 if (!initial_render_metafile->Init()) { 74 if (!initial_render_metafile->Init()) {
76 DidFinishPrinting(FAIL_PREVIEW); 75 DidFinishPrinting(FAIL_PREVIEW);
77 return; 76 return;
78 } 77 }
79 } 78 }
80 #endif 79 #endif
81 80
82 base::TimeTicks begin_time = base::TimeTicks::Now(); 81 base::TimeTicks begin_time = base::TimeTicks::Now();
83 RenderPage(printParams.page_size, content_area, scale_factor, page_number, 82 RenderPage(printParams.page_size, content_area, scale_factor, page_number,
84 print_preview_context_.GetPageSlotForPage(page_number),
85 print_preview_context_.frame(), initial_render_metafile); 83 print_preview_context_.frame(), initial_render_metafile);
86 print_preview_context_.RenderedPreviewPage( 84 print_preview_context_.RenderedPreviewPage(
87 base::TimeTicks::Now() - begin_time); 85 base::TimeTicks::Now() - begin_time);
88 86
89 printing::Metafile* draft_metafile = NULL; 87 printing::Metafile* draft_metafile = NULL;
90 if (print_preview_context_.IsModifiable()) { 88 if (print_preview_context_.IsModifiable()) {
91 #if defined(USE_SKIA) 89 #if defined(USE_SKIA)
92 draft_metafile = reinterpret_cast<printing::PreviewMetafile*>( 90 draft_metafile = reinterpret_cast<printing::PreviewMetafile*>(
93 print_preview_context_.metafile())->GetMetafileForCurrentPage(); 91 print_preview_context_.metafile())->GetMetafileForCurrentPage();
94 #else 92 #else
(...skipping 12 matching lines...) Expand all
107 true /*center_horizontally*/, 105 true /*center_horizontally*/,
108 true /*center_vertically*/); 106 true /*center_vertically*/);
109 #endif 107 #endif
110 } 108 }
111 109
112 PreviewPageRendered(page_number, draft_metafile); 110 PreviewPageRendered(page_number, draft_metafile);
113 } 111 }
114 112
115 void PrintWebViewHelper::RenderPage( 113 void PrintWebViewHelper::RenderPage(
116 const gfx::Size& page_size, const gfx::Rect& content_area, 114 const gfx::Size& page_size, const gfx::Rect& content_area,
117 const float& scale_factor, int page_number, int page_slot, WebFrame* frame, 115 const float& scale_factor, int page_number, WebFrame* frame,
118 printing::Metafile* metafile) { 116 printing::Metafile* metafile) {
119 117
120 { 118 {
121 #if defined(USE_SKIA) 119 #if defined(USE_SKIA)
122 SkDevice* device = metafile->StartPageForVectorCanvas( 120 SkDevice* device = metafile->StartPageForVectorCanvas(
123 page_slot, page_size, content_area, scale_factor); 121 page_size, content_area, scale_factor);
124 if (!device) 122 if (!device)
125 return; 123 return;
126 124
127 SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device); 125 SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device);
128 canvas->unref(); // SkRefPtr and new both took a reference. 126 canvas->unref(); // SkRefPtr and new both took a reference.
129 WebKit::WebCanvas* canvasPtr = canvas.get(); 127 WebKit::WebCanvas* canvasPtr = canvas.get();
130 printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvasPtr, metafile); 128 printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvasPtr, metafile);
131 #else 129 #else
132 bool success = metafile->StartPage(page_size, content_area, scale_factor); 130 bool success = metafile->StartPage(page_size, content_area, scale_factor);
133 DCHECK(success); 131 DCHECK(success);
134 // printPage can create autoreleased references to |context|. PDF contexts 132 // printPage can create autoreleased references to |context|. PDF contexts
135 // don't write all their data until they are destroyed, so we need to make 133 // don't write all their data until they are destroyed, so we need to make
136 // certain that there are no lingering references. 134 // certain that there are no lingering references.
137 base::mac::ScopedNSAutoreleasePool pool; 135 base::mac::ScopedNSAutoreleasePool pool;
138 CGContextRef cgContext = metafile->context(); 136 CGContextRef cgContext = metafile->context();
139 CGContextRef canvasPtr = cgContext; 137 CGContextRef canvasPtr = cgContext;
140 #endif 138 #endif
141 frame->printPage(page_number, canvasPtr); 139 frame->printPage(page_number, canvasPtr);
142 } 140 }
143 141
144 // Done printing. Close the device context to retrieve the compiled metafile. 142 // Done printing. Close the device context to retrieve the compiled metafile.
145 metafile->FinishPage(); 143 metafile->FinishPage();
146 } 144 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698