PrintPreview: Printing preview of a PDF on Mac with Skia only previews the last page of the PDF

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // 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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 829 matching lines @@
   RectToPPRect(printable_area, &print_settings.printable_area);
   print_settings.dpi = printer_dpi;
   print_settings.orientation = PP_PRINTORIENTATION_NORMAL;
   print_settings.grayscale = PP_FALSE;
   print_settings.format = format;
   num_pages = plugin_print_interface_->Begin(pp_instance(),
                                              &print_settings);
   if (!num_pages)
     return 0;
   current_print_settings_ = print_settings;
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(USE_SKIA)
   canvas_ = NULL;
   ranges_.clear();
-#endif  // OS_LINUX || OS_WIN
+#endif  // USE_SKIA
   return num_pages;
 }
 
 bool PluginInstance::PrintPage(int page_number, WebKit::WebCanvas* canvas) {
   DCHECK(plugin_print_interface_);
   PP_PrintPageNumberRange_Dev page_range;
   page_range.first_page_number = page_range.last_page_number = page_number;
-#if defined(OS_LINUX) || defined(OS_WIN)
-  // The canvas only has a metafile on it for print preview.
+#if defined(USE_SKIA)
+#if defined(OS_MACOSX) || defined(OS_WIN)
+  if (printing::MetafileSkiaWrapper::GetMetafileFromCanvas(canvas) &&

[vandebo (ex-Chrome), 2011/09/26 17:33:05]

Maybe adding an explicit bool variable would make this cleaner:
bool save_for_later =
printing::MetafileSkiaWrapper::GetMetafileFromCanvas(canvas);
#if defined(OS_MACOSX)
save_for_layer = save_for_layer &&
printing::MetafileSkiaWrapper::IsPreviewMetafile(canvas)
#endif

[kmadhusu, 2011/09/26 20:42:22]

Done.

+      printing::MetafileSkiaWrapper::IsPreviewMetafile(canvas)) {
+#else
+  // Note: The canvas only has a metafile on it for print preview.
   if (printing::MetafileSkiaWrapper::GetMetafileFromCanvas(canvas)) {
+#endif
     ranges_.push_back(page_range);
     canvas_ = canvas;
     return true;
   } else
-#endif  // OS_LINUX || OS_WIN
+#endif
   {
     return PrintPageHelper(&page_range, 1, canvas);
   }
 }
 
 bool PluginInstance::PrintPageHelper(PP_PrintPageNumberRange_Dev* page_ranges,
                                      int num_ranges,
                                      WebKit::WebCanvas* canvas) {
   // Keep a reference on the stack. See NOTE above.
   scoped_refptr<PluginInstance> ref(this);
@@ skipping 11 matching lines @@
 
   // Now we need to release the print output resource.
   PluginModule::GetCore()->ReleaseResource(print_output);
 
   return ret;
 }
 
 void PluginInstance::PrintEnd() {
   // Keep a reference on the stack. See NOTE above.
   scoped_refptr<PluginInstance> ref(this);
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(USE_SKIA)
   if (!ranges_.empty())
     PrintPageHelper(&(ranges_.front()), ranges_.size(), canvas_.get());
   canvas_ = NULL;
   ranges_.clear();
-#endif  // OS_LINUX || OS_WIN
+#endif  // USE_SKIA
 
   DCHECK(plugin_print_interface_);
   if (plugin_print_interface_)
     plugin_print_interface_->End(pp_instance());
 
   memset(&current_print_settings_, 0, sizeof(current_print_settings_));
 #if defined(OS_MACOSX)
   last_printed_page_ = NULL;
 #endif  // defined(OS_MACOSX)
 }
@@ skipping 684 matching lines @@
 }
 
 void PluginInstance::DoSetCursor(WebCursorInfo* cursor) {
   cursor_.reset(cursor);
   if (fullscreen_container_)
     fullscreen_container_->DidChangeCursor(*cursor);
 }
 
 }  // namespace ppapi
 }  // namespace webkit