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

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

Issue 704813002: PdfMetafileSkia gives out a SkCanvas, not a SkBaseDevice. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comples Created 6 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/printing/print_web_view_helper.h" 5 #include "chrome/renderer/printing/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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 &content_area); 111 &content_area);
112 if (content_rect) 112 if (content_rect)
113 *content_rect = content_area; 113 *content_rect = content_area;
114 114
115 scale_factor *= webkit_shrink_factor; 115 scale_factor *= webkit_shrink_factor;
116 116
117 gfx::Rect canvas_area = 117 gfx::Rect canvas_area =
118 params.display_header_footer ? gfx::Rect(*page_size) : content_area; 118 params.display_header_footer ? gfx::Rect(*page_size) : content_area;
119 119
120 { 120 {
121 SkBaseDevice* device = metafile->StartPageForVectorCanvas( 121 skia::VectorCanvas* canvas = metafile->GetVectorCanvasForNewPage(
122 *page_size, canvas_area, scale_factor); 122 *page_size, canvas_area, scale_factor);
123 if (!device) 123 if (!canvas)
124 return; 124 return;
125 125
126 skia::RefPtr<skia::VectorCanvas> canvas =
127 skia::AdoptRef(new skia::VectorCanvas(device));
128 blink::WebCanvas* canvas_ptr = canvas.get();
129 MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile); 126 MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
130 skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_); 127 skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
131 skia::SetIsPreviewMetafile(*canvas, is_preview); 128 skia::SetIsPreviewMetafile(*canvas, is_preview);
132 129
133 if (params.display_header_footer) { 130 if (params.display_header_footer) {
Vitaly Buka (NO REVIEWS) 2014/11/05 22:21:38 static_cast
hal.canary 2014/11/05 23:10:58 Done.
134 PrintHeaderAndFooter(canvas_ptr, 131 PrintHeaderAndFooter((blink::WebCanvas*)canvas,
135 page_number + 1, 132 page_number + 1,
136 print_preview_context_.total_page_count(), 133 print_preview_context_.total_page_count(),
137 *frame, 134 *frame,
138 scale_factor, 135 scale_factor,
139 page_layout_in_points, 136 page_layout_in_points,
140 params); 137 params);
141 } 138 }
142 RenderPageContent(frame, page_number, canvas_area, content_area, 139 RenderPageContent(frame, page_number, canvas_area, content_area,
143 scale_factor, canvas_ptr); 140 scale_factor, (blink::WebCanvas*)canvas);
Vitaly Buka (NO REVIEWS) 2014/11/05 22:21:38 static_cast
hal.canary 2014/11/05 23:10:58 Done.
144 } 141 }
145 142
146 // Done printing. Close the device context to retrieve the compiled metafile. 143 // Done printing. Close the device context to retrieve the compiled metafile.
147 metafile->FinishPage(); 144 metafile->FinishPage();
148 } 145 }
149 146
150 } // namespace printing 147 } // namespace printing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698