| OLD | NEW | 
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ | 5 #ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ | 
| 6 #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ | 6 #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ | 
| 7 | 7 | 
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" | 
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" | 
| 10 #include "cc/base/cc_export.h" | 10 #include "cc/base/cc_export.h" | 
| 11 #include "skia/ext/refptr.h" | 11 #include "skia/ext/refptr.h" | 
| 12 // TODO(robertphillips): change this to "class SkBaseDevice;" | 12 // TODO(robertphillips): change this to "class SkBaseDevice;" | 
| 13 #include "third_party/skia/include/core/SkDevice.h" | 13 #include "third_party/skia/include/core/SkDevice.h" | 
|  | 14 #include "ui/gfx/geometry/vector2d.h" | 
| 14 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" | 
| 15 #include "ui/gfx/size.h" | 16 #include "ui/gfx/size.h" | 
| 16 #include "ui/gfx/vector2d.h" |  | 
| 17 | 17 | 
| 18 class SkBitmap; | 18 class SkBitmap; | 
| 19 class SkCanvas; | 19 class SkCanvas; | 
| 20 | 20 | 
| 21 namespace gfx { | 21 namespace gfx { | 
| 22 class VSyncProvider; | 22 class VSyncProvider; | 
| 23 } | 23 } | 
| 24 | 24 | 
| 25 namespace cc { | 25 namespace cc { | 
| 26 | 26 | 
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 80   skia::RefPtr<SkCanvas> canvas_; | 80   skia::RefPtr<SkCanvas> canvas_; | 
| 81   scoped_ptr<gfx::VSyncProvider> vsync_provider_; | 81   scoped_ptr<gfx::VSyncProvider> vsync_provider_; | 
| 82 | 82 | 
| 83  private: | 83  private: | 
| 84   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice); | 84   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice); | 
| 85 }; | 85 }; | 
| 86 | 86 | 
| 87 }  // namespace cc | 87 }  // namespace cc | 
| 88 | 88 | 
| 89 #endif  // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ | 89 #endif  // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ | 
| OLD | NEW | 
|---|