Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/child/dwrite_font_proxy/font_fallback_win_unittest.cc

Issue 1906633003: Implement fallback cache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blinkfontfallback
Patch Set: Add some checks and comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/dwrite_font_proxy/font_fallback_win.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/dwrite_font_proxy/font_fallback_win_unittest.cc
diff --git a/content/child/dwrite_font_proxy/font_fallback_win_unittest.cc b/content/child/dwrite_font_proxy/font_fallback_win_unittest.cc
index 4a5cd4b012390591128a28c22af609242d219a33..aab440c487200ce48e483ee7fbe61d2ab5cb68e7 100644
--- a/content/child/dwrite_font_proxy/font_fallback_win_unittest.cc
+++ b/content/child/dwrite_font_proxy/font_fallback_win_unittest.cc
@@ -35,13 +35,13 @@ class FontFallbackUnitTest : public testing::Test {
font_path.resize(MAX_PATH);
SHGetSpecialFolderPath(nullptr /* hwndOwner - reserved */, font_path.data(),
CSIDL_FONTS, FALSE /* fCreate*/);
- base::string16 arial_path;
- arial_path.append(font_path.data()).append(L"\\arial.ttf");
+ base::string16 segoe_path;
+ segoe_path.append(font_path.data()).append(L"\\seguisym.ttf");
fake_collection_ = new FakeFontCollection();
- fake_collection_->AddFont(L"Arial")
- .AddFamilyName(L"en-us", L"Arial")
- .AddFilePath(arial_path);
+ fake_collection_->AddFont(L"Segoe UI Symbol")
+ .AddFamilyName(L"en-us", L"Segoe UI Symbol")
+ .AddFilePath(segoe_path);
mswr::MakeAndInitialize<DWriteFontCollectionProxy>(
&collection_, factory_.Get(), fake_collection_->GetSender());
@@ -72,7 +72,7 @@ class FontFallbackUnitTest : public testing::Test {
TEST_F(FontFallbackUnitTest, MapCharacters) {
mswr::ComPtr<FontFallback> fallback;
mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
- fake_collection_->GetTrackingSender());
+ fake_collection_->GetSender());
mswr::ComPtr<IDWriteFont> font;
UINT32 mapped_length = 0;
@@ -82,7 +82,7 @@ TEST_F(FontFallbackUnitTest, MapCharacters) {
mswr::MakeAndInitialize<TextAnalysisSource>(
&text, L"hello", L"en-us", number_substitution_.Get(),
DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
- fallback->MapCharacters(text.Get(), 0, 1, nullptr, nullptr,
+ fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
&scale);
@@ -91,5 +91,116 @@ TEST_F(FontFallbackUnitTest, MapCharacters) {
EXPECT_NE(nullptr, font.Get());
}
+TEST_F(FontFallbackUnitTest, DuplicateCallsShouldNotRepeatIPC) {
+ mswr::ComPtr<FontFallback> fallback;
+ mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
+ fake_collection_->GetTrackingSender());
+
+ mswr::ComPtr<IDWriteFont> font;
+ UINT32 mapped_length = 0;
+ float scale = 0.0;
+
+ mswr::ComPtr<TextAnalysisSource> text;
+ mswr::MakeAndInitialize<TextAnalysisSource>(
+ &text, L"hello", L"en-us", number_substitution_.Get(),
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
+ fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
+ DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
+ &scale);
+ mapped_length = 0;
+ fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
+ DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
+ &scale);
+
+ EXPECT_EQ(1u, fake_collection_->MessageCount());
+ EXPECT_EQ(5u, mapped_length);
+}
+
+TEST_F(FontFallbackUnitTest, DifferentFamilyShouldNotReuseCache) {
+ mswr::ComPtr<FontFallback> fallback;
+ mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
+ fake_collection_->GetTrackingSender());
+
+ mswr::ComPtr<IDWriteFont> font;
+ UINT32 mapped_length = 0;
+ float scale = 0.0;
+
+ mswr::ComPtr<TextAnalysisSource> text;
+ mswr::MakeAndInitialize<TextAnalysisSource>(
+ &text, L"hello", L"en-us", number_substitution_.Get(),
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
+ fallback->MapCharacters(text.Get(), 0, 5, nullptr, L"font1",
+ DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
+ &scale);
+ fallback->MapCharacters(text.Get(), 0, 5, nullptr, L"font2",
+ DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
+ &scale);
+
+ EXPECT_EQ(2u, fake_collection_->MessageCount());
+}
+
+TEST_F(FontFallbackUnitTest, CacheMissShouldRepeatIPC) {
+ mswr::ComPtr<FontFallback> fallback;
+ mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
+ fake_collection_->GetTrackingSender());
+
+ mswr::ComPtr<IDWriteFont> font;
+ UINT32 mapped_length = 0;
+ float scale = 0.0;
+
+ mswr::ComPtr<TextAnalysisSource> text;
+ mswr::MakeAndInitialize<TextAnalysisSource>(
+ &text, L"hello", L"en-us", number_substitution_.Get(),
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
+ mswr::ComPtr<TextAnalysisSource> unmappable_text;
+ mswr::MakeAndInitialize<TextAnalysisSource>(
+ &unmappable_text, L"\uffff", L"en-us", number_substitution_.Get(),
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
+ fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
+ DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
+ &scale);
+ fallback->MapCharacters(unmappable_text.Get(), 0, 1, nullptr, nullptr,
+ DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
+ &scale);
+
+ EXPECT_EQ(2u, fake_collection_->MessageCount());
+}
+
+TEST_F(FontFallbackUnitTest, SurrogatePairCacheHit) {
+ mswr::ComPtr<FontFallback> fallback;
+ mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
+ fake_collection_->GetTrackingSender());
+
+ mswr::ComPtr<IDWriteFont> font;
+ UINT32 mapped_length = 0;
+ float scale = 0.0;
+
+ mswr::ComPtr<TextAnalysisSource> text;
+ mswr::MakeAndInitialize<TextAnalysisSource>(
+ &text, L"hello", L"en-us", number_substitution_.Get(),
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
+ mswr::ComPtr<TextAnalysisSource> surrogate_pair_text;
+ mswr::MakeAndInitialize<TextAnalysisSource>(
+ &surrogate_pair_text, L"\U0001d300", L"en-us", number_substitution_.Get(),
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
+ fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
+ DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
+ &scale);
+ fallback->MapCharacters(surrogate_pair_text.Get(), 0, 2, nullptr, nullptr,
+ DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
+ DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
+ &scale);
+
+ EXPECT_EQ(1u, fake_collection_->MessageCount());
+ EXPECT_EQ(2u, mapped_length);
+}
+
} // namespace
} // namespace content
« no previous file with comments | « content/child/dwrite_font_proxy/font_fallback_win.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698