Upstream version 5.34.104.0

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

diff --git a/src/ui/gfx/render_text_win.cc b/src/ui/gfx/render_text_win.cc
index 58ee2c7..04e83cc 100644 (file)
--- a/src/ui/gfx/render_text_win.cc
+++ b/src/ui/gfx/render_text_win.cc
@@ -118,7 +118,7 @@ void DeriveFontIfNecessary(int font_size,
   const int current_style = (font->GetStyle() & kStyleMask);
   const int current_size = font->GetFontSize();
   if (current_style != target_style || current_size != font_size)
-    *font = font->DeriveFont(font_size - current_size, target_style);
+    *font = font->Derive(font_size - current_size, target_style);
 }
 
 // Returns true if |c| is a Unicode BiDi control character.
@@ -800,7 +800,8 @@ void RenderTextWin::DrawVisualText(Canvas* canvas) {
   GetCachedFontSmoothingSettings(&smoothing_enabled, &cleartype_enabled);
   // Note that |cleartype_enabled| corresponds to Skia's |enable_lcd_text|.
   renderer.SetFontSmoothingSettings(
-      smoothing_enabled, cleartype_enabled && !background_is_transparent());
+      smoothing_enabled, cleartype_enabled && !background_is_transparent(),
+      smoothing_enabled /* subpixel_positioning */);
 
   ApplyCompositionAndSelectionStyles();