diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 08:59:18 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 08:59:18 +0000 |
| commit | 8fd6f348dd53f9cfdf84dfad1a46252a30bca0fb (patch) | |
| tree | b58b63783e0fc0ba0bf996dd3dd2048859073c36 /chrome/browser/ui/tests | |
| parent | 68764f11c914c41cfdc6d11ce0d66fe547077347 (diff) | |
| download | chromium_src-8fd6f348dd53f9cfdf84dfad1a46252a30bca0fb.zip chromium_src-8fd6f348dd53f9cfdf84dfad1a46252a30bca0fb.tar.gz chromium_src-8fd6f348dd53f9cfdf84dfad1a46252a30bca0fb.tar.bz2 | |
Temporary change to test perf regression (full)
This change tests which part of this review:
http://codereview.chromium.org/6897013/
is causing a performance regression. This change will be reverted later tonight.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82838 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 cfe1c9b..7c8f100 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.h" +#include "ui/gfx/image_unittest_util.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()); + gfx::Image image(gfx::test::CreateBitmap(25, 25)); 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 9f62332..7245ff1 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.h" +#include "ui/gfx/image_unittest_util.h" namespace { @@ -17,7 +17,7 @@ class UiGfxImageTest : public CocoaTest { }; TEST_F(UiGfxImageTest, CheckColor) { - gfx::Image image(gfx::test::CreateBitmap()); + gfx::Image image(gfx::test::CreateBitmap(25, 25)); [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()); + gfx::Image image(gfx::test::CreateBitmap(25, 25)); [image_view setImage:image]; } |