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

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

Issue 6709009: Stop overloading Init() in NativeMetafile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 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
« no previous file with comments | « chrome/common/common_param_traits.cc ('k') | chrome/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/mock_printer.h" 5 #include "chrome/renderer/mock_printer.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/shared_memory.h" 8 #include "base/shared_memory.h"
9 #include "chrome/common/render_messages.h" 9 #include "chrome/common/render_messages.h"
10 #include "chrome/common/render_messages_params.h" 10 #include "chrome/common/render_messages_params.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 EXPECT_GT(params.data_size, 0U); 133 EXPECT_GT(params.data_size, 0U);
134 #if defined(OS_WIN) 134 #if defined(OS_WIN)
135 base::SharedMemory metafile_data(params.metafile_data_handle, true, 135 base::SharedMemory metafile_data(params.metafile_data_handle, true,
136 GetCurrentProcess()); 136 GetCurrentProcess());
137 #elif defined(OS_MACOSX) 137 #elif defined(OS_MACOSX)
138 base::SharedMemory metafile_data(params.metafile_data_handle, true); 138 base::SharedMemory metafile_data(params.metafile_data_handle, true);
139 #endif 139 #endif
140 metafile_data.Map(params.data_size); 140 metafile_data.Map(params.data_size);
141 scoped_ptr<printing::NativeMetafile> metafile( 141 scoped_ptr<printing::NativeMetafile> metafile(
142 printing::NativeMetafileFactory::CreateMetafile()); 142 printing::NativeMetafileFactory::CreateMetafile());
143 metafile->Init(metafile_data.memory(), params.data_size); 143 metafile->InitFromData(metafile_data.memory(), params.data_size);
144 printing::Image image(*metafile); 144 printing::Image image(*metafile);
145 MockPrinterPage* page_data = new MockPrinterPage(metafile_data.memory(), 145 MockPrinterPage* page_data = new MockPrinterPage(metafile_data.memory(),
146 params.data_size, 146 params.data_size,
147 image); 147 image);
148 if (!page_data) { 148 if (!page_data) {
149 printer_status_ = PRINTER_ERROR; 149 printer_status_ = PRINTER_ERROR;
150 return; 150 return;
151 } 151 }
152 152
153 scoped_refptr<MockPrinterPage> page(page_data); 153 scoped_refptr<MockPrinterPage> page(page_data);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 if (printer_status_ != PRINTER_READY || page >= pages_.size()) 210 if (printer_status_ != PRINTER_READY || page >= pages_.size())
211 return false; 211 return false;
212 212
213 pages_[page]->image().SaveToPng(filepath); 213 pages_[page]->image().SaveToPng(filepath);
214 return true; 214 return true;
215 } 215 }
216 216
217 int MockPrinter::CreateDocumentCookie() { 217 int MockPrinter::CreateDocumentCookie() {
218 return ++current_document_cookie_; 218 return ++current_document_cookie_;
219 } 219 }
OLDNEW
« no previous file with comments | « chrome/common/common_param_traits.cc ('k') | chrome/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698