From 203339a2aa88bb31576233220d7ced73920a596f Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Thu, 23 Aug 2018 20:58:14 +0000 Subject: Fix shadowed variables This CL fixes instances of variable shadowing that are discovered by turning on -Wshadow. BUG=pdfium:1137 Change-Id: I418d50de89ecbeb12e85b23a358bc61e8f16e888 Reviewed-on: https://pdfium-review.googlesource.com/41150 Commit-Queue: Ryan Harrison Reviewed-by: Tom Sepez Reviewed-by: Henrique Nakashima --- core/fxge/android/cfpf_skiafontmgr.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'core/fxge/android/cfpf_skiafontmgr.cpp') diff --git a/core/fxge/android/cfpf_skiafontmgr.cpp b/core/fxge/android/cfpf_skiafontmgr.cpp index f9afdabb93..2288a86e92 100644 --- a/core/fxge/android/cfpf_skiafontmgr.cpp +++ b/core/fxge/android/cfpf_skiafontmgr.cpp @@ -252,9 +252,9 @@ CFPF_SkiaFont* CFPF_SkiaFontMgr::CreateFont(const ByteStringView& bsFamilyname, uint8_t uCharset, uint32_t dwStyle) { uint32_t dwHash = FPF_SKIAGetFamilyHash(bsFamilyname, dwStyle, uCharset); - auto it = m_FamilyFonts.find(dwHash); - if (it != m_FamilyFonts.end()) - return it->second.get(); + auto family_iter = m_FamilyFonts.find(dwHash); + if (family_iter != m_FamilyFonts.end()) + return family_iter->second.get(); uint32_t dwFaceName = FPF_SKIANormalizeFontName(bsFamilyname); uint32_t dwSubst = FPF_SkiaGetSubstFont(dwFaceName, g_SkiaFontmap, @@ -273,8 +273,9 @@ CFPF_SkiaFont* CFPF_SkiaFontMgr::CreateFont(const ByteStringView& bsFamilyname, const CFPF_SkiaPathFont* pBestFont = nullptr; int32_t nMax = -1; int32_t nGlyphNum = 0; - for (auto it = m_FontFaces.rbegin(); it != m_FontFaces.rend(); ++it) { - const CFPF_SkiaPathFont* pFont = it->get(); + for (auto face_iter = m_FontFaces.rbegin(); face_iter != m_FontFaces.rend(); + ++face_iter) { + const CFPF_SkiaPathFont* pFont = face_iter->get(); if (!(pFont->charsets() & FPF_SkiaGetCharset(uCharset))) continue; int32_t nFind = 0; @@ -301,19 +302,19 @@ CFPF_SkiaFont* CFPF_SkiaFontMgr::CreateFont(const ByteStringView& bsFamilyname, if (uCharset == FX_CHARSET_Default || bMaybeSymbol) { if (nFind > nMax && bMatchedName) { nMax = nFind; - pBestFont = it->get(); + pBestFont = face_iter->get(); } } else if (FPF_SkiaIsCJK(uCharset)) { if (bMatchedName || pFont->glyph_num() > nGlyphNum) { - pBestFont = it->get(); + pBestFont = face_iter->get(); nGlyphNum = pFont->glyph_num(); } } else if (nFind > nMax) { nMax = nFind; - pBestFont = it->get(); + pBestFont = face_iter->get(); } if (nExpectVal <= nFind) { - pBestFont = it->get(); + pBestFont = face_iter->get(); break; } } -- cgit v1.2.3