Implement direct write fallback proxy

content/browser/renderer_host/dwrite_font_proxy_message_filter_win_unittest.cc

Index: content/browser/renderer_host/dwrite_font_proxy_message_filter_win_unittest.cc
diff --git a/content/browser/renderer_host/dwrite_font_proxy_message_filter_win_unittest.cc b/content/browser/renderer_host/dwrite_font_proxy_message_filter_win_unittest.cc
index b9772c1a9acf6f057c187f974eb6b660ff6ba173..ad92eef473a04fe21a034f8b36487f6ab4197b1f 100644
--- a/content/browser/renderer_host/dwrite_font_proxy_message_filter_win_unittest.cc
+++ b/content/browser/renderer_host/dwrite_font_proxy_message_filter_win_unittest.cc
@@ -5,11 +5,13 @@
 #include "content/browser/renderer_host/dwrite_font_proxy_message_filter_win.h"
 
 #include <dwrite.h>
+#include <dwrite_2.h>
 
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "base/win/windows_version.h"
 #include "content/common/dwrite_font_proxy_messages.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "ipc/ipc_message_macros.h"
@@ -56,6 +58,19 @@ class DWriteFontProxyMessageFilterUnitTest : public testing::Test {
     serializer->SerializeOutputParameters(*(filter_->GetReply()));
   }
 
+  bool IsDWrite2Available() {
+    mswr::ComPtr<IDWriteFactory> factory;
+    gfx::win::CreateDWriteFactory(&factory);
+    mswr::ComPtr<IDWriteFactory2> factory2;
+    factory.As<IDWriteFactory2>(&factory2);
+
+    if (!factory2.Get()) {
+      // IDWriteFactory2 is expected to not be available before Win8.1
+      EXPECT_GT(base::win::VERSION_WIN8_1, base::win::GetVersion());

[scottmg, 2016/04/13 21:23:16]

EXPECT_LT(GetVersion(), WIN8_1) would be easier to read.

[Ilya Kulshin, 2016/04/13 22:31:29]

Done.

+    }
+    return factory2.Get();
+  }
+
   scoped_refptr<FilterWithFakeSender> filter_;
   content::TestBrowserThreadBundle thread_bundle_;
 };
@@ -140,6 +155,65 @@ TEST_F(DWriteFontProxyMessageFilterUnitTest, GetFontFilesIndexOutOfBounds) {
   EXPECT_EQ(0u, files.size());
 }
 
+TEST_F(DWriteFontProxyMessageFilterUnitTest, MapCharacter) {
+  if (!gfx::win::ShouldUseDirectWrite() || !IsDWrite2Available())
+    return;
+
+  DWriteFontStyle font_style;
+  font_style.font_weight = DWRITE_FONT_WEIGHT_NORMAL;
+  font_style.font_slant = DWRITE_FONT_STYLE_NORMAL;
+  font_style.font_stretch = DWRITE_FONT_STRETCH_NORMAL;
+
+  MapCharactersResult result;
+  Send(new DWriteFontProxyMsg_MapCharacters(
+      L"abc", font_style, L"", DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, L"",
+      &result));
+
+  EXPECT_NE(UINT32_MAX, result.family_index);
+  EXPECT_STRNE(L"", result.family_name.c_str());
+  EXPECT_EQ(3u, result.mapped_length);
+  EXPECT_NE(0.0, result.scale);
+}
+
+TEST_F(DWriteFontProxyMessageFilterUnitTest, MapCharacterInvalidCharacter) {
+  if (!gfx::win::ShouldUseDirectWrite() || !IsDWrite2Available())
+    return;
+
+  DWriteFontStyle font_style;
+  font_style.font_weight = DWRITE_FONT_WEIGHT_NORMAL;
+  font_style.font_slant = DWRITE_FONT_STYLE_NORMAL;
+  font_style.font_stretch = DWRITE_FONT_STRETCH_NORMAL;
+
+  MapCharactersResult result;
+  Send(new DWriteFontProxyMsg_MapCharacters(
+      L"\ufffe\uffffabc", font_style, L"en-us",
+      DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, L"", &result));
+
+  EXPECT_EQ(UINT32_MAX, result.family_index);
+  EXPECT_STREQ(L"", result.family_name.c_str());
+  EXPECT_EQ(2u, result.mapped_length);
+}
+
+TEST_F(DWriteFontProxyMessageFilterUnitTest, MapCharacterInvalidAfterValid) {
+  if (!gfx::win::ShouldUseDirectWrite() || !IsDWrite2Available())
+    return;
+
+  DWriteFontStyle font_style;
+  font_style.font_weight = DWRITE_FONT_WEIGHT_NORMAL;
+  font_style.font_slant = DWRITE_FONT_STYLE_NORMAL;
+  font_style.font_stretch = DWRITE_FONT_STRETCH_NORMAL;
+
+  MapCharactersResult result;
+  Send(new DWriteFontProxyMsg_MapCharacters(
+      L"abc\ufffe\uffff", font_style, L"en-us",
+      DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, L"", &result));
+
+  EXPECT_NE(UINT32_MAX, result.family_index);
+  EXPECT_STRNE(L"", result.family_name.c_str());
+  EXPECT_EQ(3u, result.mapped_length);
+  EXPECT_NE(0.0, result.scale);
+}
+

[scottmg, 2016/04/13 21:23:16]

Can you add a test here for something that this is trying to address? (language
fallback or whatever)

[Ilya Kulshin, 2016/04/13 22:31:29]

In a unittest, I'd rather not, since the ability to fallback on other languages
depends on having fonts for those languages installed on the system. The logic
for latin vs other fallback should be the same, at least as far as our code is
concerned. I could in theory mock out the system fallback, but that's a lot of
work for questionable benefit. I am adding an end-to-end test that validates
fallback as a blink layout test in part 3, so that case will ultimately still be
covered.

 }  // namespace
 
 }  // namespace content