Simplify accelerated paint and remove windows CanvasSkiaPaint

content/browser/compositor/software_output_device_win.cc

 // Copyright 2014 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/compositor/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"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/skia_util.h"
 
 namespace content {
 
 SoftwareOutputDeviceWin::SoftwareOutputDeviceWin(ui::Compositor* compositor)
     : hwnd_(compositor->widget()),
       is_hwnd_composited_(false) {
   // TODO(skaslev) Remove this when crbug.com/180702 is fixed.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 75 matching lines @@
 
 void SoftwareOutputDeviceWin::CopyToPixels(const gfx::Rect& rect,
                                            void* pixels) {
   DCHECK(contents_);
   SkImageInfo info = SkImageInfo::MakeN32Premul(rect.width(), rect.height());
   contents_->sk_canvas()->readPixels(
       info, pixels, info.minRowBytes(), rect.x(), rect.y());
 }
 
 }  // namespace content