roll skia to 4552

printing/pdf_metafile_skia.cc

 // Copyright (c) 2012 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"
@@ skipping 101 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;
 
   SkAutoDataUnref data(data_->pdf_stream_.copyToData());
-  memcpy(dst_buffer, data.bytes(), dst_buffer_size);
+  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);
   SkAutoDataUnref data(data_->pdf_stream_.copyToData());
   if (file_util::WriteFile(file_path,
-                           reinterpret_cast<const char*>(data.data()),
+                           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 36 matching lines @@
    should do something like the following CL in PluginInstance::PrintPDFOutput:
 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,
                                  const MacRenderPageParams& params) const {
   DCHECK_GT(data_->pdf_stream_.getOffset(), 0U);
   if (data_->pdf_cg_.GetDataSize() == 0) {
     SkAutoDataUnref data(data_->pdf_stream_.copyToData());
-    data_->pdf_cg_.InitFromData(data.bytes(), data.size());
+    data_->pdf_cg_.InitFromData(data->bytes(), data->size());
   }
   return data_->pdf_cg_.RenderPage(page_number, context, rect, params);
 }
 #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;
   SkAutoDataUnref data(data_->pdf_stream_.copyToData());
   if (file_util::WriteFileDescriptor(fd.fd,
-                                     reinterpret_cast<const char*>(data.data()),
+                                     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;
@@ skipping 11 matching lines @@
 PdfMetafileSkia* PdfMetafileSkia::GetMetafileForCurrentPage() {
   SkPDFDocument pdf_doc(SkPDFDocument::kDraftMode_Flags);
   SkDynamicMemoryWStream pdf_stream;
   if (!pdf_doc.appendPage(data_->current_page_.get()))
     return NULL;
 
   if (!pdf_doc.emitPDF(&pdf_stream))
     return NULL;
 
   SkAutoDataUnref data(pdf_stream.copyToData());
-  if (data.size() == 0)
+  if (data->size() == 0)
     return NULL;
 
   PdfMetafileSkia* metafile = new PdfMetafileSkia;
-  metafile->InitFromData(data.bytes(), data.size());
+  metafile->InitFromData(data->bytes(), data->size());
   return metafile;
 }
 
 }  // namespace printing