patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.cc

   1 $NetBSD$
   2
   3 --- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig  2011-05-24 08:01:04.000000000 +0000
   4 +++ webkit/plugins/ppapi/ppapi_plugin_instance.cc
   5 @@ -64,7 +64,7 @@
   6  #include "printing/native_metafile_factory.h"
   7  #endif
   8
   9 -#if defined(OS_LINUX)
  10 +#if defined(OS_LINUX) || defined(OS_BSD)
  11  #include "printing/pdf_ps_metafile_cairo.h"
  12  #endif
  13
  14 @@ -328,7 +328,7 @@ PluginInstance::PluginInstance(PluginDel
  15        plugin_pdf_interface_(NULL),
  16        plugin_selection_interface_(NULL),
  17        plugin_zoom_interface_(NULL),
  18 -#if defined(OS_LINUX)
  19 +#if defined(OS_LINUX) || defined(OS_BSD)
  20        canvas_(NULL),
  21  #endif  // defined(OS_LINUX)
  22        plugin_print_interface_(NULL),
  23 @@ -360,7 +360,7 @@ PluginInstance::~PluginInstance() {
  24    module_->InstanceDeleted(this);
  25
  26    ResourceTracker::Get()->InstanceDeleted(pp_instance_);
  27 -#if defined(OS_LINUX)
  28 +#if defined(OS_LINUX) || defined(OS_BSD)
  29    ranges_.clear();
  30  #endif  // defined(OS_LINUX)
  31  }
  32 @@ -930,7 +930,7 @@ int PluginInstance::PrintBegin(const gfx
  33    if (!num_pages)
  34      return 0;
  35    current_print_settings_ = print_settings;
  36 -#if defined(OS_LINUX)
  37 +#if defined(OS_LINUX) || defined(OS_BSD)
  38    canvas_ = NULL;
  39    ranges_.clear();
  40  #endif  // defined(OS_LINUX)
  41 @@ -941,7 +941,7 @@ bool PluginInstance::PrintPage(int page_
  42    DCHECK(plugin_print_interface_);
  43    PP_PrintPageNumberRange_Dev page_range;
  44    page_range.first_page_number = page_range.last_page_number = page_number;
  45 -#if defined(OS_LINUX)
  46 +#if defined(OS_LINUX) || defined(OS_BSD)
  47    ranges_.push_back(page_range);
  48    canvas_ = canvas;
  49    return true;
  50 @@ -976,7 +976,7 @@ bool PluginInstance::PrintPageHelper(PP_
  51  void PluginInstance::PrintEnd() {
  52    // Keep a reference on the stack. See NOTE above.
  53    scoped_refptr<PluginInstance> ref(this);
  54 -#if defined(OS_LINUX)
  55 +#if defined(OS_LINUX) || defined(OS_BSD)
  56    // This hack is here because all pages need to be written to PDF at once.
  57    if (!ranges_.empty())
  58      PrintPageHelper(&(ranges_.front()), ranges_.size(), canvas_);
  59 @@ -1079,7 +1079,7 @@ bool PluginInstance::PrintPDFOutput(PP_R
  60  #endif  // defined(OS_WIN)
  61
  62    bool ret = false;
  63 -#if defined(OS_LINUX)
  64 +#if defined(OS_LINUX) || defined(OS_BSD)
  65    // On Linux we need to get the backing PdfPsMetafile and write the bits
  66    // directly.
  67    cairo_t* context = canvas->beginPlatformPaint();