diff options
Diffstat (limited to 'content')
6 files changed, 13 insertions, 12 deletions
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc index 1faed9e..1919d73 100644 --- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc +++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc @@ -15,8 +15,8 @@ #include "content/browser/android/in_process/synchronous_compositor_impl.h" #include "content/public/browser/browser_thread.h" #include "gpu/command_buffer/client/gl_in_process_context.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 "ui/gfx/rect_conversions.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/transform.h" @@ -96,7 +96,7 @@ class SynchronousCompositorOutputSurface::SoftwareDevice private: SynchronousCompositorOutputSurface* surface_; - SkDevice null_device_; + SkBitmapDevice null_device_; SkCanvas null_canvas_; DISALLOW_COPY_AND_ASSIGN(SoftwareDevice); diff --git a/content/browser/aura/software_output_device_win.cc b/content/browser/aura/software_output_device_win.cc index 1a5af46..47eac50 100644 --- a/content/browser/aura/software_output_device_win.cc +++ b/content/browser/aura/software_output_device_win.cc @@ -85,7 +85,7 @@ void SoftwareOutputDeviceWin::EndPaint(cc::SoftwareFrameData* frame_data) { 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, @@ -102,7 +102,7 @@ void SoftwareOutputDeviceWin::EndPaint(cc::SoftwareFrameData* frame_data) { 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)); } diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index 05ce07d..9adb554 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -25,8 +25,8 @@ #include "media/filters/skcanvas_video_renderer.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.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 "ui/base/ui_base_switches.h" #include "ui/gfx/size_conversions.h" #include "ui/gl/gl_switches.h" @@ -568,7 +568,7 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture bitmap.allocPixels(); bitmap.setIsOpaque(true); - SkDevice device(bitmap); + SkBitmapDevice device(bitmap); SkCanvas canvas(&device); video_renderer.Paint(video_frame.get(), 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) { diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc index 8ea59f1..95e2698 100644 --- a/content/renderer/skia_benchmarking_extension.cc +++ b/content/renderer/skia_benchmarking_extension.cc @@ -12,9 +12,9 @@ #include "skia/ext/benchmarking_canvas.h" #include "third_party/WebKit/public/platform/WebArrayBuffer.h" #include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/skia/include/core/SkBitmapDevice.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColorPriv.h" -#include "third_party/skia/include/core/SkDevice.h" #include "third_party/skia/include/core/SkGraphics.h" #include "third_party/skia/src/utils/debugger/SkDebugCanvas.h" #include "third_party/skia/src/utils/debugger/SkDrawCommand.h" @@ -250,8 +250,9 @@ class SkiaBenchmarkingWrapper : public v8::Extension { gfx::Rect bounds = picture->LayerRect(); // Measure the total time by drawing straight into a bitmap-backed canvas. - skia::RefPtr<SkDevice> device = skia::AdoptRef(SkNEW_ARGS(SkDevice, - (SkBitmap::kARGB_8888_Config, bounds.width(), bounds.height()))); + skia::RefPtr<SkBaseDevice> device = skia::AdoptRef( + SkNEW_ARGS(SkBitmapDevice, + (SkBitmap::kARGB_8888_Config, bounds.width(), bounds.height()))); SkCanvas bitmap_canvas(device.get()); bitmap_canvas.clear(SK_ColorTRANSPARENT); base::TimeTicks t0 = base::TimeTicks::HighResNow(); diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index 7f11fb9..d93a967 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -110,7 +110,7 @@ void MakeBitmapOpaque(SkBitmap* bitmap) { #endif void CopyCanvasToBitmap(SkCanvas* canvas, SkBitmap* snapshot) { - SkDevice* device = skia::GetTopDevice(*canvas); + SkBaseDevice* device = skia::GetTopDevice(*canvas); const SkBitmap& bitmap = device->accessBitmap(false); const bool success = bitmap.copyTo(snapshot, SkBitmap::kARGB_8888_Config); DCHECK(success); |