From aad6e5030e65549c3f80f3a102f40f181bc57899 Mon Sep 17 00:00:00 2001 From: "xji@chromium.org" Date: Mon, 16 Apr 2012 23:32:16 +0000 Subject: [PATCH] platform/graphics/skia/GlyphPageTreeNodeSkia.cpp mis-use 'continue' for 'break' https://bugs.webkit.org/show_bug.cgi?id=83521 Reviewed by David Levin. No functionality change, so no new tests. * platform/graphics/skia/GlyphPageTreeNodeSkia.cpp: (WebCore::GlyphPage::fill): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114316 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 12 ++++++++++++ .../WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp | 7 ++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 1b727a6..64817ec 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2012-04-16 Xiaomei Ji + + platform/graphics/skia/GlyphPageTreeNodeSkia.cpp mis-use 'continue' for 'break' + https://bugs.webkit.org/show_bug.cgi?id=83521 + + Reviewed by David Levin. + + No functionality change, so no new tests. + + * platform/graphics/skia/GlyphPageTreeNodeSkia.cpp: + (WebCore::GlyphPage::fill): + 2012-04-16 Levi Weintraub Make borderBoxRect sub-pixel precise and add a pixel snapped version diff --git a/Source/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp b/Source/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp index 95a2144..66882cf 100644 --- a/Source/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp +++ b/Source/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp @@ -96,15 +96,12 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b } if (fontData->hasVerticalGlyphs()) { - bool lookVariants = false; for (unsigned i = 0; i < bufferLength; ++i) { if (!Font::isCJKIdeograph(buffer[i])) { - lookVariants = true; - continue; + substituteWithVerticalGlyphs(fontData, glyphs, length); + break; } } - if (lookVariants) - substituteWithVerticalGlyphs(fontData, glyphs, length); } unsigned allGlyphs = 0; // track if any of the glyphIDs are non-zero -- 2.7.4