diff options
| author | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 20:53:41 +0000 |
|---|---|---|
| committer | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 20:53:41 +0000 |
| commit | c6ed21c4291e11007cae2dc946256faac1b36188 (patch) | |
| tree | 326d91d92dfd4358814b12c8091b806dc9393b12 /chrome/browser/ui/tests | |
| parent | 930c66b72e00d1b1a0b6e12bf1b9ca81c6b58b33 (diff) | |
| download | chromium_src-c6ed21c4291e11007cae2dc946256faac1b36188.zip chromium_src-c6ed21c4291e11007cae2dc946256faac1b36188.tar.gz chromium_src-c6ed21c4291e11007cae2dc946256faac1b36188.tar.bz2 | |
Revert due to NSImageRepToSkBitmap failure on MAC
Revert 82688 - Use large icon resource pakThis is a part of r82185 that was reverted. The change was reverted because it caused a performance regression.In r82538 and r82584 I re-checked in code to split high-res icons into a seperate resource pak and load it.This change adds code to actually use use the high-res icons.BUG=NoneTEST=NoneReview URL: http://codereview.chromium.org/6897013
TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/6896034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tests')
| -rw-r--r-- | chrome/browser/ui/tests/ui_gfx_image_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/tests/ui_gfx_image_unittest.mm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc index 7c8f100..cfe1c9b 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc @@ -6,7 +6,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image.h" -#include "ui/gfx/image_unittest_util.h" +#include "ui/gfx/image_unittest.h" #if defined(OS_LINUX) #include <gtk/gtk.h> @@ -43,7 +43,7 @@ TEST(UiGfxImageTest, GtkImageView) { GtkWidget* fixed = gtk_fixed_new(); gtk_container_add(GTK_CONTAINER(window), fixed); - gfx::Image image(gfx::test::CreateBitmap(25, 25)); + gfx::Image image(gfx::test::CreateBitmap()); GtkWidget* image_view = gtk_image_new_from_pixbuf(image); gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10); gtk_widget_set_size_request(image_view, 25, 25); diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.mm b/chrome/browser/ui/tests/ui_gfx_image_unittest.mm index 7245ff1..9f62332 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.mm +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.mm @@ -9,7 +9,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image.h" -#include "ui/gfx/image_unittest_util.h" +#include "ui/gfx/image_unittest.h" namespace { @@ -17,7 +17,7 @@ class UiGfxImageTest : public CocoaTest { }; TEST_F(UiGfxImageTest, CheckColor) { - gfx::Image image(gfx::test::CreateBitmap(25, 25)); + gfx::Image image(gfx::test::CreateBitmap()); [image lockFocus]; NSColor* color = NSReadPixel(NSMakePoint(10, 10)); [image unlockFocus]; @@ -42,7 +42,7 @@ TEST_F(UiGfxImageTest, ImageView) { [[test_window() contentView] addSubview:image_view]; [test_window() orderFront:nil]; - gfx::Image image(gfx::test::CreateBitmap(25, 25)); + gfx::Image image(gfx::test::CreateBitmap()); [image_view setImage:image]; } |