diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 18:37:29 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 18:37:29 +0000 |
| commit | 598e4f866fb1540d4d5e4351694bb3c9b0a20a1b (patch) | |
| tree | df1a98aa62ccff7ffacacfa4c961d2ee74e6bf2f /cc/output/software_output_device.h | |
| parent | 93773d08322990032231aa26c4eba4f02014de99 (diff) | |
| download | chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.zip chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.tar.gz chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.tar.bz2 | |
Skia is going to Split the SkDevice class into SkBaseDevice and SkBitmapDevice. Right now Skia has typedefs redirecting SkBaseDevice and SkBitmapDevice to SkDevice. This CL begins the Chromium-side renaming process in preparation for the real change (https://codereview.chromium.org/22978012/)
BUG=278148
Review URL: https://chromiumcodereview.appspot.com/22796028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/software_output_device.h')
| -rw-r--r-- | cc/output/software_output_device.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h index c1a97dcb..788673e 100644 --- a/cc/output/software_output_device.h +++ b/cc/output/software_output_device.h @@ -8,12 +8,13 @@ #include "base/basictypes.h" #include "cc/base/cc_export.h" #include "skia/ext/refptr.h" +// TODO(robertphillips): change this to "class SkBaseDevice;" +#include "third_party/skia/include/core/SkDevice.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/gfx/vector2d.h" class SkBitmap; -class SkDevice; class SkCanvas; namespace cc { @@ -46,7 +47,7 @@ class CC_EXPORT SoftwareOutputDevice { protected: gfx::Size viewport_size_; gfx::Rect damage_rect_; - skia::RefPtr<SkDevice> device_; + skia::RefPtr<SkBaseDevice> device_; skia::RefPtr<SkCanvas> canvas_; private: |