CL removing inheritance of SkDevice from PlatformDevice. Flavours of PlatformDevice classes now ...

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"
@@ skipping 43 matching lines @@
   DCHECK(!page_outstanding_);
   page_outstanding_ = true;
 
   // Adjust for the margins and apply the scale factor.
   SkMatrix transform;
   transform.setTranslate(SkIntToScalar(content_area.x()),
                          SkIntToScalar(content_area.y()));
   transform.preScale(SkFloatToScalar(scale_factor),
                      SkFloatToScalar(scale_factor));
 
   // TODO(ctguil): Refactor: don't create the PDF device explicitly here.

[vandebo (ex-Chrome), 2011/08/23 17:40:35]

nit: remove now old comment.

[Jeff Timanus, 2011/08/23 21:13:02]

Done.

   SkISize pdf_page_size = SkISize::Make(page_size.width(), page_size.height());
   SkISize pdf_content_size =
       SkISize::Make(content_area.width(), content_area.height());
   SkRefPtr<SkPDFDevice> pdf_device =
-      new SkPDFDevice(pdf_page_size, pdf_content_size, transform);
-  pdf_device->unref();  // SkRefPtr and new both took a reference.
-  skia::VectorPlatformDeviceSkia* device =
-      new skia::VectorPlatformDeviceSkia(pdf_device.get());
-  data_->current_page_ = device->PdfDevice();
-  return device;
+      new skia::VectorPlatformDeviceSkia(pdf_page_size, pdf_content_size,
+                                         transform);
+  data_->current_page_ = pdf_device;
+  return pdf_device.get();
 }
 
 bool PdfMetafileSkia::StartPage(const gfx::Size& page_size,
                                 const gfx::Rect& content_area,
                                 const float& scale_factor) {
   NOTREACHED();
   return NULL;
 }
 
 bool PdfMetafileSkia::FinishPage() {
@@ skipping 166 matching lines @@
   SkAutoDataUnref data(pdf_stream.copyToData());
   if (data.size() == 0)
     return NULL;
 
   PdfMetafileSkia* metafile = new printing::PdfMetafileSkia;
   metafile->InitFromData(data.bytes(), data.size());
   return metafile;
 }
 
 }  // namespace printing