Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

content/browser/aura/software_output_device_win.cc

 // Copyright 2013 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 "content/browser/aura/software_output_device_win.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/compositor/compositor.h"
@@ skipping 67 matching lines @@
     DWORD style = GetWindowLong(hwnd_, GWL_EXSTYLE);
     style &= ~WS_EX_COMPOSITED;
     style |= WS_EX_LAYERED;
     SetWindowLong(hwnd_, GWL_EXSTYLE, style);
 
     HDC dib_dc = skia::BeginPlatformPaint(canvas);
     ::UpdateLayeredWindow(hwnd_, NULL, &position, &size, dib_dc, &zero,
                           RGB(0xFF, 0xFF, 0xFF), &blend, ULW_ALPHA);
     skia::EndPlatformPaint(canvas);
   } else {
-    SkDevice* device = canvas->getDevice();
+    SkBaseDevice* device = canvas->getDevice();
     const SkBitmap& bitmap = device->accessBitmap(false);
     HDC hdc = ::GetDC(hwnd_);
     gfx::StretchDIBits(hdc,
                        rect.x(), rect.y(),
                        rect.width(), rect.height(),
                        rect.x(), rect.y(),
                        rect.width(), rect.height(),
                        bitmap.getPixels(),
                        &bitmap_info_);
     ::ReleaseDC(hwnd_, hdc);
   }
 }
 
 void SoftwareOutputDeviceWin::CopyToBitmap(
     gfx::Rect rect, SkBitmap* output) {
   DCHECK(contents_);
-  SkDevice* device = contents_->sk_canvas()->getDevice();
+  SkBaseDevice* device = contents_->sk_canvas()->getDevice();
   const SkBitmap& bitmap = device->accessBitmap(false);
   bitmap.extractSubset(output, gfx::RectToSkIRect(rect));
 }
 
 }  // namespace content