diff options
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/benchmarking_canvas.cc | 5 | ||||
| -rw-r--r-- | skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc index d2a2b3a..a0bb8a0 100644 --- a/skia/ext/benchmarking_canvas.cc +++ b/skia/ext/benchmarking_canvas.cc @@ -6,7 +6,6 @@ #include "base/logging.h" #include "base/time/time.h" #include "skia/ext/benchmarking_canvas.h" -#include "third_party/skia/include/core/SkBitmapDevice.h" #include "third_party/skia/include/utils/SkProxyCanvas.h" namespace skia { @@ -25,9 +24,7 @@ class TimingCanvas : public SkProxyCanvas { public: TimingCanvas(int width, int height, const BenchmarkingCanvas* track_canvas) : tracking_canvas_(track_canvas) { - skia::RefPtr<SkBaseDevice> device = skia::AdoptRef( - SkNEW_ARGS(SkBitmapDevice, (SkBitmap::kARGB_8888_Config, width, height))); - canvas_ = skia::AdoptRef(SkNEW_ARGS(SkCanvas, (device.get()))); + canvas_ = skia::AdoptRef(SkCanvas::NewRasterN32(width, height)); setProxy(canvas_.get()); } diff --git a/skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc b/skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc index 1cb4d7f..2d37a2d 100644 --- a/skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc +++ b/skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc @@ -4,7 +4,6 @@ #include "base/file_util.h" #include "base/logging.h" -#include "third_party/skia/include/core/SkBitmapDevice.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkFlattenableSerialization.h" #include "third_party/skia/include/core/SkImageFilter.h" @@ -74,10 +73,8 @@ int main(int argc, char** argv) { int ret = 0; SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, BitmapSize, BitmapSize); - bitmap.allocPixels(); - SkBitmapDevice device(bitmap); - SkCanvas canvas(&device); + bitmap.allocN32Pixels(BitmapSize, BitmapSize); + SkCanvas canvas(bitmap); canvas.clear(0x00000000); for (int i = 1; i < argc; i++) |