roll skia to 4552

Review URL: https://chromiumcodereview.appspot.com/10702144

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146328 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc
index 06d0286..91843f8 100644
--- a/printing/pdf_metafile_skia.cc
+++ b/printing/pdf_metafile_skia.cc
@@ -119,7 +119,7 @@ bool PdfMetafileSkia::GetData(void* dst_buffer,
     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;
 }
 
@@ -127,7 +127,7 @@ 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;
@@ -184,7 +184,7 @@ bool PdfMetafileSkia::RenderPage(unsigned int page_number,
   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);
 }
@@ -202,7 +202,7 @@ bool PdfMetafileSkia::SaveToFD(const base::FileDescriptor& fd) const {
   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;
@@ -234,11 +234,11 @@ PdfMetafileSkia* PdfMetafileSkia::GetMetafileForCurrentPage() {
     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;
 }