diff options
author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 13:10:27 +0000 |
---|---|---|
committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 13:10:27 +0000 |
commit | 61b86fbd9ea4e2bb6c125dcf995526031bde6eda (patch) | |
tree | 53c0944b8a07a169a0680d04056e668629f6fbd6 /ui/gfx/image_unittest_util.cc | |
parent | 867ba4b6c9c68a567382289e154ce08918a320a6 (diff) | |
download | chromium_src-61b86fbd9ea4e2bb6c125dcf995526031bde6eda.zip chromium_src-61b86fbd9ea4e2bb6c125dcf995526031bde6eda.tar.gz chromium_src-61b86fbd9ea4e2bb6c125dcf995526031bde6eda.tar.bz2 |
Revert 82841 - Adding missing files from r82838
TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/6895049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image_unittest_util.cc')
-rw-r--r-- | ui/gfx/image_unittest_util.cc | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/ui/gfx/image_unittest_util.cc b/ui/gfx/image_unittest_util.cc deleted file mode 100644 index b996a86..0000000 --- a/ui/gfx/image_unittest_util.cc +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) 2011 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. - -// Because the unit tests for gfx::Image are spread across multiple -// implementation files, this header contains the reusable components. - -#include "base/memory/scoped_ptr.h" -#include "ui/gfx/image_unittest_util.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "third_party/skia/include/core/SkBitmap.h" - -#if defined(OS_LINUX) -#include "ui/gfx/gtk_util.h" -#elif defined(OS_MACOSX) -#include "base/mac/mac_util.h" -#include "skia/ext/skia_utils_mac.h" -#endif - -namespace gfx { -namespace test { - -SkBitmap* CreateBitmap(int width, int height) { - SkBitmap* bitmap = new SkBitmap(); - bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height); - bitmap->allocPixels(); - bitmap->eraseRGB(255, 0, 0); - return bitmap; -} - -PlatformImage CreatePlatformImage() { - scoped_ptr<SkBitmap> bitmap(CreateBitmap(25, 25)); -#if defined(OS_MACOSX) - NSImage* image = gfx::SkBitmapToNSImage(*(bitmap.get())); - base::mac::NSObjectRetain(image); - return image; -#elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS) - return gfx::GdkPixbufFromSkBitmap(bitmap.get()); -#else - return bitmap.release(); -#endif -} - -gfx::Image::RepresentationType GetPlatformRepresentationType() { -#if defined(OS_MACOSX) - return gfx::Image::kNSImageRep; -#elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS) - return gfx::Image::kGdkPixbufRep; -#else - return gfx::Image::kSkBitmapRep; -#endif -} - -} // namespace test -} // namespace gfx |