Adding CreateFromData to NativeMetafileFactory

chrome/renderer/print_web_view_helper_mac.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/print_web_view_helper.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/print_messages.h"
 #include "printing/native_metafile_factory.h"
 #include "printing/native_metafile.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
 using WebKit::WebFrame;
 
 void PrintWebViewHelper::PrintPage(const PrintMsg_PrintPage_Params& params,
                                    const gfx::Size& canvas_size,
                                    WebFrame* frame) {
   scoped_ptr<printing::NativeMetafile> metafile(
       printing::NativeMetafileFactory::Create());
-  if (!metafile->Init())
-    return;
+  CHECK(metafile.get());

[vandebo (ex-Chrome), 2011/03/24 21:21:58]

Doing the same thing as before is fine here - return if it fails.

[dpapad, 2011/03/24 22:02:37]

Done.

 
   float scale_factor = frame->getPrintPageShrink(params.page_number);
   int page_number = params.page_number;
 
   // Render page for printing.
   gfx::Point origin(0.0f, 0.0f);
   RenderPage(params.params.printable_size, origin, scale_factor, page_number,
       frame, metafile.get());
   metafile->FinishDocument();
 
@@ skipping 25 matching lines @@
 
   PrepareFrameAndViewForPrint prep_frame_view(printParams,
                                               frame, node, frame->view());
   int page_count = prep_frame_view.GetExpectedPageCount();
 
   if (!page_count)
     return;
 
   scoped_ptr<printing::NativeMetafile> metafile(
       printing::NativeMetafileFactory::Create());
-  if (!metafile->Init())
-    return;
+  CHECK(metafile.get());

[vandebo (ex-Chrome), 2011/03/24 21:21:58]

And here.

[dpapad, 2011/03/24 22:02:37]

Done.

 
   float scale_factor = frame->getPrintPageShrink(0);
   gfx::Point origin(printParams.margin_left, printParams.margin_top);
   if (params.pages.empty()) {
     for (int i = 0; i < page_count; ++i) {
       RenderPage(printParams.page_size, origin, scale_factor, i, frame,
           metafile.get());
     }
   } else {
     for (size_t i = 0; i < params.pages.size(); ++i) {
@@ skipping 29 matching lines @@
   // printPage can create autoreleased references to |context|. PDF contexts
   // don't write all their data until they are destroyed, so we need to make
   // certain that there are no lingering references.
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
   frame->printPage(page_number, metafile->context());
   [pool release];
 
   // Done printing. Close the device context to retrieve the compiled metafile.
   metafile->FinishPage();
 }