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 /content/renderer/gpu/compositor_software_output_device.cc | |
| 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 'content/renderer/gpu/compositor_software_output_device.cc')
| -rw-r--r-- | content/renderer/gpu/compositor_software_output_device.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/gpu/compositor_software_output_device.cc b/content/renderer/gpu/compositor_software_output_device.cc index 948e3e7..6132590 100644 --- a/content/renderer/gpu/compositor_software_output_device.cc +++ b/content/renderer/gpu/compositor_software_output_device.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "cc/output/software_frame_data.h" #include "content/renderer/render_process.h" +#include "third_party/skia/include/core/SkBitmapDevice.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkDevice.h" #include "third_party/skia/include/core/SkPixelRef.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/skia_util.h" @@ -147,7 +147,7 @@ SkCanvas* CompositorSoftwareOutputDevice::BeginPaint(gfx::Rect damage_rect) { viewport_size_.width(), viewport_size_.height()); bitmap_.setPixels(current->memory()); - device_ = skia::AdoptRef(new SkDevice(bitmap_)); + device_ = skia::AdoptRef(new SkBitmapDevice(bitmap_)); canvas_ = skia::AdoptRef(new SkCanvas(device_.get())); if (!previous) { |