roll skia

printing/pdf_metafile_skia.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 "printing/pdf_metafile_skia.h"
 
 #include "base/eintr_wrapper.h"
 #include "base/file_descriptor_posix.h"
 #include "base/file_util.h"
 #include "base/hash_tables.h"
 #include "base/metrics/histogram.h"
 #include "skia/ext/vector_platform_device_skia.h"
+#include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/pdf/SkPDFDevice.h"
 #include "third_party/skia/include/pdf/SkPDFDocument.h"
 #include "third_party/skia/include/pdf/SkPDFFont.h"
 #include "third_party/skia/include/pdf/SkPDFPage.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
@@ skipping 95 matching lines @@
 
 uint32 PdfMetafileSkia::GetDataSize() const {
   return data_->pdf_stream_.getOffset();
 }
 
 bool PdfMetafileSkia::GetData(void* dst_buffer,
                               uint32 dst_buffer_size) const {
   if (dst_buffer_size < GetDataSize())
     return false;
 
-  memcpy(dst_buffer, data_->pdf_stream_.getStream(), dst_buffer_size);
+  SkAutoDataUnref data(data_->pdf_stream_.copyToData());
+  memcpy(dst_buffer, data.bytes(), dst_buffer_size);
   return true;
 }
 
 bool PdfMetafileSkia::SaveTo(const FilePath& file_path) const {
   DCHECK_GT(data_->pdf_stream_.getOffset(), 0U);
-  if (file_util::WriteFile(file_path, data_->pdf_stream_.getStream(),
+  SkAutoDataUnref data(data_->pdf_stream_.copyToData());
+  if (file_util::WriteFile(file_path,
+                           reinterpret_cast<const char*>(data.data()),
                            GetDataSize()) != static_cast<int>(GetDataSize())) {
     DLOG(ERROR) << "Failed to save file " << file_path.value().c_str();
     return false;
   }
   return true;
 }
 
 gfx::Rect PdfMetafileSkia::GetPageBounds(unsigned int page_number) const {
   // TODO(vandebo) add a method to get the page size for a given page to
   // SkPDFDocument.
@@ skipping 37 matching lines @@
 http://codereview.chromium.org/7200040/diff/1/webkit/plugins/ppapi/ppapi_plugin_instance.cc
 */
 bool PdfMetafileSkia::RenderPage(unsigned int page_number,
                                  CGContextRef context,
                                  const CGRect rect,
                                  bool shrink_to_fit,
                                  bool stretch_to_fit,
                                  bool center_horizontally,
                                  bool center_vertically) const {
   DCHECK_GT(data_->pdf_stream_.getOffset(), 0U);
-  if (data_->pdf_cg_.GetDataSize() == 0)
-    data_->pdf_cg_.InitFromData(data_->pdf_stream_.getStream(),
-                                data_->pdf_stream_.getOffset());
+  if (data_->pdf_cg_.GetDataSize() == 0) {
+    SkAutoDataUnref data(data_->pdf_stream_.copyToData());
+    data_->pdf_cg_.InitFromData(data.bytes(), data.size());
+  }
   return data_->pdf_cg_.RenderPage(page_number, context, rect, shrink_to_fit,
                                    stretch_to_fit, center_horizontally,
                                    center_vertically);
 }
 #endif
 
 #if defined(OS_CHROMEOS)
 bool PdfMetafileSkia::SaveToFD(const base::FileDescriptor& fd) const {
   DCHECK_GT(data_->pdf_stream_.getOffset(), 0U);
 
   if (fd.fd < 0) {
     DLOG(ERROR) << "Invalid file descriptor!";
     return false;
   }
 
   bool result = true;
-  if (file_util::WriteFileDescriptor(fd.fd, data_->pdf_stream_.getStream(),
+  SkAutoDataUnref data(data_->pdf_stream_.copyToData());
+  if (file_util::WriteFileDescriptor(fd.fd,
+                                     reinterpret_cast<const char*>(data.data()),
                                      GetDataSize()) !=
       static_cast<int>(GetDataSize())) {
     DLOG(ERROR) << "Failed to save file with fd " << fd.fd;
     result = false;
   }
 
   if (fd.auto_close) {
     if (HANDLE_EINTR(close(fd.fd)) < 0) {
       DPLOG(WARNING) << "close";
       result = false;
     }
   }
   return result;
 }
 #endif
 
 PdfMetafileSkia::PdfMetafileSkia()
     : data_(new PdfMetafileSkiaData),
       draft_(false) {}
 
 void PdfMetafileSkia::set_draft(bool draft) const {
   draft_ = draft;
 }
 }  // namespace printing