diff options
| -rw-r--r-- | skia/ext/platform_canvas_skia.cc | 41 | ||||
| -rw-r--r-- | skia/skia.gyp | 10 |
2 files changed, 0 insertions, 51 deletions
diff --git a/skia/ext/platform_canvas_skia.cc b/skia/ext/platform_canvas_skia.cc deleted file mode 100644 index 8551792..0000000 --- a/skia/ext/platform_canvas_skia.cc +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "skia/ext/platform_canvas.h" - -#include "base/debug/trace_event.h" -#include "skia/ext/bitmap_platform_device.h" - -namespace skia { - -PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque) { - TRACE_EVENT2("skia", "PlatformCanvas::PlatformCanvas", - "width", width, "height", height); - if (!initialize(width, height, is_opaque)) - SK_CRASH(); -} - -PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque, - uint8_t* data) { - TRACE_EVENT2("skia", "PlatformCanvas::PlatformCanvas", - "width", width, "height", height); - if (!initialize(width, height, is_opaque, data)) - SK_CRASH(); -} - -PlatformCanvas::~PlatformCanvas() { -} - -bool PlatformCanvas::initialize(int width, int height, bool is_opaque, - uint8_t* data) { - // Use platform specific device for data. - if (data) - return initializeWithDevice(BitmapPlatformDevice::Create( - width, height, is_opaque, data)); - - return initializeWithDevice(new SkDevice( - SkBitmap::kARGB_8888_Config, width, height, is_opaque)); -} - -} // namespace skia diff --git a/skia/skia.gyp b/skia/skia.gyp index f20a2c1..85b34b87 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -712,7 +712,6 @@ 'ext/platform_canvas.h', 'ext/platform_canvas_linux.cc', 'ext/platform_canvas_mac.cc', - 'ext/platform_canvas_skia.cc', 'ext/platform_canvas_win.cc', 'ext/platform_device.cc', 'ext/platform_device.h', @@ -856,15 +855,6 @@ ['include', 'ext/platform_canvas_linux\\.cc$'], ], }], - [ 'use_aura == 1', { - 'sources/': [ - ['exclude', 'ext/platform_canvas_mac\\.cc$'], - ['exclude', 'ext/platform_canvas_linux\\.cc$'], - ['exclude', 'ext/platform_canvas_win\\.cc$'], - ], - }, { # use_aura == 0 - 'sources/': [ ['exclude', 'ext/platform_canvas_skia\\.cc$'] ], - }], [ 'toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gdk', |