diff options
author | sdefresne <sdefresne@chromium.org> | 2015-01-14 01:49:06 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 09:49:52 +0000 |
commit | f900329e4f25bbab1be0514080d14fc500433018 (patch) | |
tree | 482ed0a8b550b1f5eef1dacb64358ca34af24862 /components | |
parent | 45065e9ada154b8443f10fb902d7562794f00565 (diff) | |
download | chromium_src-f900329e4f25bbab1be0514080d14fc500433018.zip chromium_src-f900329e4f25bbab1be0514080d14fc500433018.tar.gz chromium_src-f900329e4f25bbab1be0514080d14fc500433018.tar.bz2 |
Move select_favicon_frames_unittest.cc to favicon_base
Move select_favicon_frames_unittest.cc into the favicon_base
with the code that it is testing.
Add the unit_test to the components_unittests, including when
using gn build system.
BUG=359513
Review URL: https://codereview.chromium.org/851693003
Cr-Commit-Position: refs/heads/master@{#311437}
Diffstat (limited to 'components')
-rw-r--r-- | components/BUILD.gn | 1 | ||||
-rw-r--r-- | components/components_tests.gyp | 6 | ||||
-rw-r--r-- | components/favicon_base/BUILD.gn | 15 | ||||
-rw-r--r-- | components/favicon_base/DEPS | 3 | ||||
-rw-r--r-- | components/favicon_base/select_favicon_frames_unittest.cc | 327 |
5 files changed, 351 insertions, 1 deletions
diff --git a/components/BUILD.gn b/components/BUILD.gn index 739d387..cb58e34 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -240,6 +240,7 @@ test("components_unittests") { "//components/data_reduction_proxy/core/common:unit_tests", "//components/dom_distiller/core:unit_tests", "//components/domain_reliability:unit_tests", + "//components/favicon_base:unit_tests", "//components/google/core/browser:unit_tests", "//components/login:unit_tests", "//components/metrics:unit_tests", diff --git a/components/components_tests.gyp b/components/components_tests.gyp index c9dbf504..081ab7a 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -129,6 +129,7 @@ 'domain_reliability/test_util.h', 'domain_reliability/uploader_unittest.cc', 'domain_reliability/util_unittest.cc', + 'favicon_base/select_favicon_frames_unittest.cc', # Note: GN tests converted to here, need to do the rest. 'enhanced_bookmarks/enhanced_bookmark_model_unittest.cc', 'enhanced_bookmarks/image_store_ios_unittest.mm', @@ -356,7 +357,7 @@ 'components.gyp:content_settings_core_browser', 'components.gyp:content_settings_core_common', 'components.gyp:content_settings_core_test_support', - + # Dependencies of packed CT EV white list 'components.gyp:packed_ct_ev_whitelist', @@ -383,6 +384,9 @@ 'components.gyp:enhanced_bookmarks', 'components.gyp:enhanced_bookmarks_test_support', + # Dependencies of favicon_base + 'components.gyp:favicon_base', + # Dependencies of feedback 'components.gyp:feedback_component', diff --git a/components/favicon_base/BUILD.gn b/components/favicon_base/BUILD.gn index 6e40b06..d1e5a75 100644 --- a/components/favicon_base/BUILD.gn +++ b/components/favicon_base/BUILD.gn @@ -16,7 +16,22 @@ source_set("favicon_base") { deps = [ "//base", "//skia", + "//ui/base", "//ui/gfx", "//url", ] } + +source_set("unit_tests") { + testonly = true + sources = [ + "select_favicon_frames_unittest.cc", + ] + + deps = [ + ":favicon_base", + "//testing/gtest", + "//ui/base", + "//ui/gfx", + ] +} diff --git a/components/favicon_base/DEPS b/components/favicon_base/DEPS index 20ad28e..0265afa 100644 --- a/components/favicon_base/DEPS +++ b/components/favicon_base/DEPS @@ -3,4 +3,7 @@ include_rules = [ "+third_party/skia/include", "+ui/base", "+ui/gfx", + + # favicon_base is used on iOS. + "-content", ] diff --git a/components/favicon_base/select_favicon_frames_unittest.cc b/components/favicon_base/select_favicon_frames_unittest.cc new file mode 100644 index 0000000..df99c72 --- /dev/null +++ b/components/favicon_base/select_favicon_frames_unittest.cc @@ -0,0 +1,327 @@ +// 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 "components/favicon_base/select_favicon_frames.h" + +#include "testing/gtest/include/gtest/gtest.h" +#include "third_party/skia/include/core/SkBitmap.h" +#include "third_party/skia/include/core/SkColor.h" +#include "ui/base/layout.h" +#include "ui/gfx/image/image_skia.h" + +using std::vector; + +namespace { + +const ui::ScaleFactor FaviconScaleFactor1x[] = { + ui::SCALE_FACTOR_100P, +}; + +const ui::ScaleFactor FaviconScaleFactor1xAnd2x[] = { + ui::SCALE_FACTOR_100P, + ui::SCALE_FACTOR_200P, +}; + +#define SCOPED_FAVICON_SCALE_FACTOR(list) \ + ui::test::ScopedSetSupportedScaleFactors scoped( \ + std::vector<ui::ScaleFactor>(list, list + arraysize(list))) + +#define SCOPED_FAVICON_SCALE_FACTOR_1X \ + SCOPED_FAVICON_SCALE_FACTOR(FaviconScaleFactor1x) +#define SCOPED_FAVICON_SCALE_FACTOR_1XAND2X \ + SCOPED_FAVICON_SCALE_FACTOR(FaviconScaleFactor1xAnd2x) + +// Return gfx::Size vector with the pixel sizes of |bitmaps|. +vector<gfx::Size> SizesFromBitmaps(const vector<SkBitmap>& bitmaps) { + vector<gfx::Size> sizes; + for (size_t i = 0; i < bitmaps.size(); ++i) + sizes.push_back(gfx::Size(bitmaps[i].width(), bitmaps[i].height())); + return sizes; +} + +SkBitmap MakeBitmap(SkColor color, int w, int h) { + SkBitmap bitmap; + bitmap.allocN32Pixels(w, h); + bitmap.eraseColor(color); + return bitmap; +} + +SkColor GetColor(const gfx::ImageSkia& image, float scale, + int x = -1, int y = -1) { + const SkBitmap& bitmap = + image.GetRepresentation(scale).sk_bitmap(); + if (x == -1) + x = bitmap.width() / 2; + if (y == -1) + y = bitmap.width() / 2; + bitmap.lockPixels(); + SkColor color = bitmap.getColor(x, y); + bitmap.unlockPixels(); + return color; +} + +SkColor GetColor1x(const gfx::ImageSkia& image) { + return GetColor(image, 1.0f); +} + +SkColor GetColor2x(const gfx::ImageSkia& image) { + return GetColor(image, 2.0f); +} + +TEST(SelectFaviconFramesTest, ZeroSizePicksLargest) { + vector<SkBitmap> bitmaps; + bitmaps.push_back(MakeBitmap(SK_ColorRED, 16, 16)); + bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 48, 48)); + bitmaps.push_back(MakeBitmap(SK_ColorBLUE, 32, 32)); + + gfx::ImageSkia image = CreateFaviconImageSkia(bitmaps, + SizesFromBitmaps(bitmaps), 0, NULL); + EXPECT_EQ(1u, image.image_reps().size()); + ASSERT_TRUE(image.HasRepresentation(1.0f)); + EXPECT_EQ(48, image.width()); + EXPECT_EQ(48, image.height()); + + EXPECT_EQ(SK_ColorGREEN, GetColor1x(image)); +} + +TEST(SelectFaviconFramesTest, _16From16) { + SCOPED_FAVICON_SCALE_FACTOR_1X; + + vector<SkBitmap> bitmaps; + bitmaps.push_back(MakeBitmap(SK_ColorRED, 15, 15)); + bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 16, 16)); + bitmaps.push_back(MakeBitmap(SK_ColorBLUE, 17, 17)); + + gfx::ImageSkia image = CreateFaviconImageSkia(bitmaps, + SizesFromBitmaps(bitmaps), 16, NULL); + image.EnsureRepsForSupportedScales(); + EXPECT_EQ(1u, image.image_reps().size()); + ASSERT_TRUE(image.HasRepresentation(1.0f)); + EXPECT_EQ(16, image.width()); + EXPECT_EQ(16, image.height()); + EXPECT_EQ(SK_ColorGREEN, GetColor1x(image)); + +#if !defined(OS_IOS) + const gfx::ImageSkiaRep& rep = image.GetRepresentation(1.5f); + EXPECT_EQ(1.5f, rep.scale()); + EXPECT_EQ(16, rep.GetWidth()); + EXPECT_EQ(16, rep.GetHeight()); + EXPECT_EQ(24, rep.pixel_width()); + EXPECT_EQ(24, rep.pixel_height()); + EXPECT_EQ(2u, image.image_reps().size()); +#endif +} + +TEST(SelectFaviconFramesTest, _16From17) { + SCOPED_FAVICON_SCALE_FACTOR_1X; + + vector<SkBitmap> bitmaps; + bitmaps.push_back(MakeBitmap(SK_ColorRED, 15, 15)); + bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 17, 17)); + + // Should resample from the bigger candidate. + gfx::ImageSkia image = CreateFaviconImageSkia(bitmaps, + SizesFromBitmaps(bitmaps), 16, NULL); + image.EnsureRepsForSupportedScales(); + EXPECT_EQ(1u, image.image_reps().size()); + ASSERT_TRUE(image.HasRepresentation(1.0f)); + EXPECT_EQ(16, image.width()); + EXPECT_EQ(16, image.height()); + EXPECT_EQ(SK_ColorGREEN, GetColor1x(image)); +} + +TEST(SelectFaviconFramesTest, _16From15) { + SCOPED_FAVICON_SCALE_FACTOR_1X; + + vector<SkBitmap> bitmaps; + bitmaps.push_back(MakeBitmap(SK_ColorRED, 14, 14)); + bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 15, 15)); + + // If nothing else is available, should resample from the next smaller + // candidate. + gfx::ImageSkia image = CreateFaviconImageSkia(bitmaps, + SizesFromBitmaps(bitmaps), 16, NULL); + image.EnsureRepsForSupportedScales(); + EXPECT_EQ(1u, image.image_reps().size()); + ASSERT_TRUE(image.HasRepresentation(1.0f)); + EXPECT_EQ(16, image.width()); + EXPECT_EQ(16, image.height()); + EXPECT_EQ(SK_ColorGREEN, GetColor1x(image)); +} + +TEST(SelectFaviconFramesTest, _16From16_Scale2x_32_From_16) { + SCOPED_FAVICON_SCALE_FACTOR_1XAND2X; + vector<SkBitmap> bitmaps; + bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 16, 16)); + + gfx::ImageSkia image = CreateFaviconImageSkia(bitmaps, + SizesFromBitmaps(bitmaps), 16, NULL); + image.EnsureRepsForSupportedScales(); + EXPECT_EQ(2u, image.image_reps().size()); + ASSERT_TRUE(image.HasRepresentation(1.0f)); + ASSERT_TRUE(image.HasRepresentation(2.0f)); + EXPECT_EQ(16, image.width()); + EXPECT_EQ(16, image.height()); + EXPECT_EQ(SK_ColorGREEN, GetColor1x(image)); + EXPECT_EQ(SK_ColorGREEN, GetColor2x(image)); +} + +TEST(SelectFaviconFramesTest, _16From16_Scale2x_32_From_32) { + SCOPED_FAVICON_SCALE_FACTOR_1XAND2X; + + vector<SkBitmap> bitmaps; + bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 16, 16)); + bitmaps.push_back(MakeBitmap(SK_ColorBLUE, 32, 32)); + + gfx::ImageSkia image = CreateFaviconImageSkia(bitmaps, + SizesFromBitmaps(bitmaps), 16, NULL); + image.EnsureRepsForSupportedScales(); + EXPECT_EQ(2u, image.image_reps().size()); + ASSERT_TRUE(image.HasRepresentation(1.0f)); + ASSERT_TRUE(image.HasRepresentation(2.0f)); + EXPECT_EQ(16, image.width()); + EXPECT_EQ(16, image.height()); + EXPECT_EQ(SK_ColorGREEN, GetColor1x(image)); + EXPECT_EQ(SK_ColorBLUE, GetColor2x(image)); + +#if !defined(OS_IOS) + const gfx::ImageSkiaRep& rep = image.GetRepresentation(1.5f); + EXPECT_EQ(1.5f, rep.scale()); + EXPECT_EQ(16, rep.GetWidth()); + EXPECT_EQ(16, rep.GetHeight()); + EXPECT_EQ(24, rep.pixel_width()); + EXPECT_EQ(24, rep.pixel_height()); + EXPECT_EQ(3u, image.image_reps().size()); +#endif +} + +TEST(SelectFaviconFramesTest, ExactMatchBetterThanLargeBitmap) { + SCOPED_FAVICON_SCALE_FACTOR_1XAND2X; + + float score1; + vector<SkBitmap> bitmaps1; + bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 48, 48)); + CreateFaviconImageSkia( + bitmaps1, + SizesFromBitmaps(bitmaps1), 16, &score1); + + float score2; + vector<SkBitmap> bitmaps2; + bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 16, 16)); + bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 32, 32)); + CreateFaviconImageSkia(bitmaps2, + SizesFromBitmaps(bitmaps2), 16, &score2); + + EXPECT_GT(score2, score1); +} + +TEST(SelectFaviconFramesTest, UpsampleABitBetterThanHugeBitmap) { + SCOPED_FAVICON_SCALE_FACTOR_1XAND2X; + + float score1; + vector<SkBitmap> bitmaps1; + bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 128, 128)); + CreateFaviconImageSkia(bitmaps1, + SizesFromBitmaps(bitmaps1), 16, &score1); + + float score2; + vector<SkBitmap> bitmaps2; + bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 24, 24)); + CreateFaviconImageSkia(bitmaps2, + SizesFromBitmaps(bitmaps2), 16, &score2); + + float score3; + vector<SkBitmap> bitmaps3; + bitmaps3.push_back(MakeBitmap(SK_ColorGREEN, 16, 16)); + CreateFaviconImageSkia(bitmaps3, + SizesFromBitmaps(bitmaps3), 16, &score3); + + float score4; + vector<SkBitmap> bitmaps4; + bitmaps4.push_back(MakeBitmap(SK_ColorGREEN, 15, 15)); + CreateFaviconImageSkia(bitmaps4, + SizesFromBitmaps(bitmaps4), 16, &score4); + + EXPECT_GT(score2, score1); + EXPECT_GT(score3, score1); + EXPECT_GT(score4, score1); +} + +TEST(SelectFaviconFramesTest, DownsamplingBetterThanUpsampling) { + SCOPED_FAVICON_SCALE_FACTOR_1XAND2X; + + float score1; + vector<SkBitmap> bitmaps1; + bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 8, 8)); + CreateFaviconImageSkia(bitmaps1, + SizesFromBitmaps(bitmaps1), 16, &score1); + + float score2; + vector<SkBitmap> bitmaps2; + bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 24, 24)); + CreateFaviconImageSkia(bitmaps2, + SizesFromBitmaps(bitmaps2), 16, &score2); + + EXPECT_GT(score2, score1); +} + +TEST(SelectFaviconFramesTest, DownsamplingLessIsBetter) { + SCOPED_FAVICON_SCALE_FACTOR_1XAND2X; + + float score1; + vector<SkBitmap> bitmaps1; + bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 34, 34)); + CreateFaviconImageSkia(bitmaps1, + SizesFromBitmaps(bitmaps1), 16, &score1); + + float score2; + vector<SkBitmap> bitmaps2; + bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 33, 33)); + CreateFaviconImageSkia(bitmaps2, + SizesFromBitmaps(bitmaps2), 16, &score2); + + EXPECT_GT(score2, score1); +} + +TEST(SelectFaviconFramesTest, UpsamplingLessIsBetter) { + SCOPED_FAVICON_SCALE_FACTOR_1XAND2X; + + float score1; + vector<SkBitmap> bitmaps1; + bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 8, 8)); + CreateFaviconImageSkia(bitmaps1, + SizesFromBitmaps(bitmaps1), 16, &score1); + + float score2; + vector<SkBitmap> bitmaps2; + bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 9, 9)); + CreateFaviconImageSkia(bitmaps2, + SizesFromBitmaps(bitmaps2), 16, &score2); + + EXPECT_GT(score2, score1); +} + +// Test that the score is determined by the |original_sizes| parameter, not the +// |bitmaps| parameter to SelectFaviconFrames(). +TEST(SelectFaviconFramesTest, ScoreDeterminedByOriginalSizes) { + SCOPED_FAVICON_SCALE_FACTOR_1XAND2X; + + vector<SkBitmap> bitmaps1; + bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 16, 16)); + vector<gfx::Size> sizes1; + sizes1.push_back(gfx::Size(256, 256)); + float score1; + CreateFaviconImageSkia(bitmaps1, sizes1, 16, &score1); + + vector<SkBitmap> bitmaps2; + bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 15, 15)); + vector<gfx::Size> sizes2; + sizes2.push_back(gfx::Size(15, 15)); + float score2; + CreateFaviconImageSkia(bitmaps2, sizes2, 16, &score2); + + EXPECT_GT(score2, score1); +} + +} // namespace |