summaryrefslogtreecommitdiffstats
path: root/ui/gfx/render_text_harfbuzz.cc
diff options
context:
space:
mode:
authormukai <mukai@chromium.org>2015-02-19 13:44:42 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-19 21:45:17 +0000
commit4b75bd7856f4838e43bbda59badd9c2031da2073 (patch)
treee7c5ce3017ba616c3ddfe16c8e332cf93dcc187d /ui/gfx/render_text_harfbuzz.cc
parentb2c51d4e97ea326831be62c789cb45312aba0691 (diff)
downloadchromium_src-4b75bd7856f4838e43bbda59badd9c2031da2073.zip
chromium_src-4b75bd7856f4838e43bbda59badd9c2031da2073.tar.gz
chromium_src-4b75bd7856f4838e43bbda59badd9c2031da2073.tar.bz2
Rename: background_is_transparent -> subpixel_rendering_enabled
This is derived from crrev.com/867003002. RenderText::background_is_transparent() field does not directly mean the background color is transparent. This is a flag to control the subpixel rendering (see canvas_skia.cc) and can be set for various reasons. Considering this situation, it is clearer to rename the field to subpixel_rendering_enabled(). R=msw@chromium.org TEST=no functional changes, build succeeds BUG=None Review URL: https://codereview.chromium.org/941523002 Cr-Commit-Position: refs/heads/master@{#317139}
Diffstat (limited to 'ui/gfx/render_text_harfbuzz.cc')
-rw-r--r--ui/gfx/render_text_harfbuzz.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc
index 21279df..0580abe 100644
--- a/ui/gfx/render_text_harfbuzz.cc
+++ b/ui/gfx/render_text_harfbuzz.cc
@@ -1018,7 +1018,7 @@ void RenderTextHarfBuzz::DrawVisualTextInternal(
renderer->SetTypeface(run.skia_face.get());
renderer->SetTextSize(SkIntToScalar(run.font_size));
renderer->SetFontRenderParams(run.render_params,
- background_is_transparent());
+ subpixel_rendering_suppressed());
Range glyphs_range = run.CharRangeToGlyphRange(segment.char_range);
scoped_ptr<SkPoint[]> positions(new SkPoint[glyphs_range.length()]);
SkScalar offset_x = preceding_segment_widths -
@@ -1308,7 +1308,7 @@ bool RenderTextHarfBuzz::ShapeRunWithFont(const base::string16& text,
hb_font_t* harfbuzz_font = CreateHarfBuzzFont(
run->skia_face.get(), SkIntToScalar(run->font_size), run->render_params,
- background_is_transparent());
+ subpixel_rendering_suppressed());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/431326 is fixed.
tracked_objects::ScopedTracker tracking_profile1(