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

chrome/renderer/print_web_view_helper.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 "chrome/renderer/print_web_view_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 21 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_POSIX)
 #include "content/common/view_messages.h"
 #endif
 
 #if defined(USE_SKIA)
 #include "base/string_number_conversions.h"
 #include "skia/ext/vector_canvas.h"
-#include "skia/ext/vector_platform_device_skia.h"
 #include "third_party/skia/include/core/SkTypeface.h"
+#include "third_party/skia/include/pdf/SkPDFDevice.h"
 #endif  // defined(USE_SKIA)
 
 using base::Time;
 using printing::ConvertPixelsToPoint;
 using printing::ConvertPixelsToPointDouble;
 using printing::ConvertUnit;
 using printing::ConvertUnitDouble;
 using printing::GetHeaderFooterSegmentWidth;
 using WebKit::WebConsoleMessage;
 using WebKit::WebDocument;
@@ skipping 129 matching lines @@
 #if defined(USE_SKIA)
 // static - Not anonymous so that platform implementations can use it.
 void PrintWebViewHelper::PrintHeaderAndFooter(
     SkDevice* device,
     skia::VectorCanvas* canvas,
     int page_number,
     int total_pages,
     float webkit_scale_factor,
     const PageSizeMargins& page_layout,
     const DictionaryValue& header_footer_info) {
-  static_cast<skia::VectorPlatformDeviceSkia*>(device)->setDrawingArea(
+  static_cast<SkPDFDevice*>(device)->setDrawingArea(
       SkPDFDevice::kMargin_DrawingArea);
 
   SkPaint paint;
   paint.setColor(SK_ColorBLACK);
   paint.setTextEncoding(SkPaint::kUTF16_TextEncoding);
   paint.setTextSize(printing::kSettingHeaderFooterFontSize);
   paint.setTypeface(SkTypeface::CreateFromName(
       printing::kSettingHeaderFooterFontFamilyName, SkTypeface::kNormal));
 
   // Print the headers onto the |canvas| if there is enough space to print
@@ skipping 40 matching lines @@
       printing::kSettingHeaderFooterInterstice + footer_bounds.height();
   if (text_height <= page_layout.margin_bottom) {
     PrintHeaderFooterText(page_of_total_pages, canvas, paint,
                           webkit_scale_factor, page_layout, printing::RIGHT,
                           printing::BOTTOM, footer_bounds.bottom());
     PrintHeaderFooterText(url, canvas, paint, webkit_scale_factor, page_layout,
                           printing::LEFT, printing::BOTTOM,
                           footer_bounds.bottom());
   }
 
-  static_cast<skia::VectorPlatformDeviceSkia*>(device)->setDrawingArea(
+  static_cast<SkPDFDevice*>(device)->setDrawingArea(
       SkPDFDevice::kContent_DrawingArea);
 }
 #endif  // defined(USE_SKIA)
 
 PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint(
     const PrintMsg_Print_Params& print_params,
     WebFrame* frame,
     WebNode* node)
         : frame_(frame),
           web_view_(frame->view()),
@@ skipping 1030 matching lines @@
 const gfx::Size&
 PrintWebViewHelper::PrintPreviewContext::GetPrintCanvasSize() const {
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   rendered_pages_.clear();
 }