Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / gfx / font_render_params_linux_unittest.cc

diff --git a/src/ui/gfx/font_render_params_linux_unittest.cc b/src/ui/gfx/font_render_params_linux_unittest.cc
index 46c82b4..c752cc3 100644 (file)
--- a/src/ui/gfx/font_render_params_linux_unittest.cc
+++ b/src/ui/gfx/font_render_params_linux_unittest.cc
@@ -23,19 +23,19 @@ namespace {
 class TestFontDelegate : public LinuxFontDelegate {
  public:
   TestFontDelegate() {}
-  virtual ~TestFontDelegate() {}
+  ~TestFontDelegate() override {}
 
   void set_params(const FontRenderParams& params) { params_ = params; }
 
-  virtual FontRenderParams GetDefaultFontRenderParams() const OVERRIDE {
+  FontRenderParams GetDefaultFontRenderParams() const override {
     return params_;
   }
-  virtual scoped_ptr<ScopedPangoFontDescription>
-      GetDefaultPangoFontDescription() const OVERRIDE {
+  scoped_ptr<ScopedPangoFontDescription> GetDefaultPangoFontDescription()
+      const override {
     NOTIMPLEMENTED();
     return scoped_ptr<ScopedPangoFontDescription>();
   }
-  virtual double GetFontDPI() const OVERRIDE {
+  double GetFontDPI() const override {
     NOTIMPLEMENTED();
     return 96.0;
   }
@@ -70,7 +70,7 @@ class FontRenderParamsTest : public testing::Test {
     ClearFontRenderParamsCacheForTest();
   }
 
-  virtual ~FontRenderParamsTest() {
+  ~FontRenderParamsTest() override {
     LinuxFontDelegate::SetInstance(
         const_cast<LinuxFontDelegate*>(original_font_delegate_));
     TearDownFontconfig();
@@ -86,25 +86,33 @@ class FontRenderParamsTest : public testing::Test {
 };
 
 TEST_F(FontRenderParamsTest, Default) {
-  // Fontconfig needs to know about at least one font to return a match.
   ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
+      CreateFontconfigEditStanza("antialias", "bool", "true") +
+      CreateFontconfigEditStanza("autohint", "bool", "true") +
+      CreateFontconfigEditStanza("hinting", "bool", "true") +
+      CreateFontconfigEditStanza("hintstyle", "const", "hintslight") +
+      CreateFontconfigEditStanza("rgba", "const", "rgb") +
+      kFontconfigMatchFooter +
+      // Add a font match for Arial; it shouldn't be used when querying for
+      // default settings: http://crbug.com/421247
+      kFontconfigMatchFontHeader +
+      CreateFontconfigTestStanza("family", "eq", "string", "Arial") +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       CreateFontconfigEditStanza("autohint", "bool", "false") +
       CreateFontconfigEditStanza("hinting", "bool", "true") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintfull") +
-      CreateFontconfigEditStanza("rgba", "const", "rgb") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
   FontRenderParams params = GetFontRenderParams(
       FontRenderParamsQuery(true), NULL);
   EXPECT_TRUE(params.antialiasing);
-  EXPECT_FALSE(params.autohinter);
+  EXPECT_TRUE(params.autohinter);
   EXPECT_TRUE(params.use_bitmaps);
-  EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
+  EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
   EXPECT_FALSE(params.subpixel_positioning);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
@@ -114,17 +122,17 @@ TEST_F(FontRenderParamsTest, Size) {
   ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       CreateFontconfigEditStanza("hinting", "bool", "true") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintfull") +
       CreateFontconfigEditStanza("rgba", "const", "none") +
       kFontconfigMatchFooter +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigTestStanza("pixelsize", "less_eq", "double", "10") +
       CreateFontconfigEditStanza("antialias", "bool", "false") +
       kFontconfigMatchFooter +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigTestStanza("size", "more_eq", "double", "20") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintslight") +
       CreateFontconfigEditStanza("rgba", "const", "rgb") +
@@ -163,17 +171,17 @@ TEST_F(FontRenderParamsTest, Style) {
   // hinting for italic text.
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       CreateFontconfigEditStanza("hinting", "bool", "true") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintslight") +
       CreateFontconfigEditStanza("rgba", "const", "rgb") +
       kFontconfigMatchFooter +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigTestStanza("weight", "eq", "const", "bold") +
       CreateFontconfigEditStanza("rgba", "const", "none") +
       kFontconfigMatchFooter +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigTestStanza("slant", "eq", "const", "italic") +
       CreateFontconfigEditStanza("hinting", "bool", "false") +
       kFontconfigMatchFooter +
@@ -206,14 +214,13 @@ TEST_F(FontRenderParamsTest, Style) {
 }
 
 TEST_F(FontRenderParamsTest, Scalable) {
-  ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   // Load a config that only enables antialiasing for scalable fonts.
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigEditStanza("antialias", "bool", "false") +
       kFontconfigMatchFooter +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigTestStanza("scalable", "eq", "bool", "true") +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       kFontconfigMatchFooter +
@@ -230,10 +237,10 @@ TEST_F(FontRenderParamsTest, UseBitmaps) {
   // Load a config that enables embedded bitmaps for fonts <= 10 pixels.
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigEditStanza("embeddedbitmap", "bool", "false") +
       kFontconfigMatchFooter +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigTestStanza("pixelsize", "less_eq", "double", "10") +
       CreateFontconfigEditStanza("embeddedbitmap", "bool", "true") +
       kFontconfigMatchFooter +
@@ -251,10 +258,9 @@ TEST_F(FontRenderParamsTest, UseBitmaps) {
 TEST_F(FontRenderParamsTest, ForceFullHintingWhenAntialiasingIsDisabled) {
   // Load a config that disables antialiasing and hinting while requesting
   // subpixel rendering.
-  ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigEditStanza("antialias", "bool", "false") +
       CreateFontconfigEditStanza("hinting", "bool", "false") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintnone") +
@@ -304,10 +310,9 @@ TEST_F(FontRenderParamsTest, OnlySetConfiguredValues) {
 
   // Load a Fontconfig config that enables antialiasing but doesn't say anything
   // about subpixel rendering.
-  ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
@@ -361,7 +366,7 @@ TEST_F(FontRenderParamsTest, SubstituteFamily) {
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
       CreateFontconfigAliasStanza("Helvetica", "Verdana") +
-      kFontconfigMatchHeader +
+      kFontconfigMatchPatternHeader +
       CreateFontconfigTestStanza("family", "eq", "string", "Arial") +
       CreateFontconfigEditStanza("family", "string", "Verdana") +
       kFontconfigMatchFooter +