diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 20:24:31 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 20:24:31 +0000 |
| commit | b7bd9783da31195a346c5eb76be246844a9780ab (patch) | |
| tree | e6ea85ea1438a7675b306e78941dee3a6d0c5c79 /skia | |
| parent | 54a9c6e510c97663fa8b4246e6bb32f6a6b9dd4f (diff) | |
| download | chromium_src-b7bd9783da31195a346c5eb76be246844a9780ab.zip chromium_src-b7bd9783da31195a346c5eb76be246844a9780ab.tar.gz chromium_src-b7bd9783da31195a346c5eb76be246844a9780ab.tar.bz2 | |
Revert 128039 - aura: Use platform independent canvas by default.
This CL cause Win Aura to fail, unable to find a PlatformCanvas::initialize() with the necessary signature.
BUG=111587
TEST=none
Review URL: http://codereview.chromium.org/9722032
TBR=reveman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9815022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -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', |