Commit d02a1b81 authored by Emil A Eklund's avatar Emil A Eklund Committed by Commit Bot

Fix formatting in FontFallbackList

Tbr: tzik@chromium.org
Change-Id: I961dd6a0775fbf6458e268cd332cc1fdb509e3a0
Reviewed-on: https://chromium-review.googlesource.com/691454Reviewed-by: default avatarEmil A Eklund <eae@chromium.org>
Commit-Queue: Emil A Eklund <eae@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505294}
parent bd85185f
...@@ -107,10 +107,9 @@ const SimpleFontData* FontFallbackList::DeterminePrimarySimpleFontData( ...@@ -107,10 +107,9 @@ const SimpleFontData* FontFallbackList::DeterminePrimarySimpleFontData(
if (font_data) if (font_data)
return font_data->FontDataForCharacter(kSpaceCharacter); return font_data->FontDataForCharacter(kSpaceCharacter);
FontCache* cache = FontCache::GetFontCache();
SimpleFontData* last_resort_fallback = SimpleFontData* last_resort_fallback =
FontCache::GetFontCache() cache->GetLastResortFallbackFont(font_description).get();
->GetLastResortFallbackFont(font_description)
.get();
DCHECK(last_resort_fallback); DCHECK(last_resort_fallback);
return last_resort_fallback; return last_resort_fallback;
} }
...@@ -217,10 +216,9 @@ FallbackListCompositeKey FontFallbackList::CompositeKey( ...@@ -217,10 +216,9 @@ FallbackListCompositeKey FontFallbackList::CompositeKey(
const FontData* FontFallbackList::FontDataAt( const FontData* FontFallbackList::FontDataAt(
const FontDescription& font_description, const FontDescription& font_description,
unsigned realized_font_index) const { unsigned realized_font_index) const {
if (realized_font_index < font_list_.size()) { // This fallback font is already in our list.
return font_list_[realized_font_index] if (realized_font_index < font_list_.size())
.get(); // This fallback font is already in our list. return font_list_[realized_font_index].get();
}
// Make sure we're not passing in some crazy value here. // Make sure we're not passing in some crazy value here.
DCHECK_EQ(realized_font_index, font_list_.size()); DCHECK_EQ(realized_font_index, font_list_.size());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment