Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98a2334b authored by Raph Levien's avatar Raph Levien Committed by android-build-merger
Browse files

Merge "Don\'t do layout in hasGlyph for codepoint + vs" into nyc-dev 

am: 6e49a7fc

* commit '6e49a7fc':
  Don't do layout in hasGlyph for codepoint + vs

Change-Id: I0ea9c5b553239fbfb6d3517e869bd854fbf8837c
parents ebef0414 6e49a7fc

core/jni/android/graphics/Paint.cpp

+9 −4
Original line number Diff line number Diff line
@@ -815,10 +815,15 @@ namespace PaintGlue { 
            }



            if (prevCp != kStartOfString &&

                ((0xFE00 <= cp && cp <= 0xFE0F) || (0xE0100 <= cp && cp <= 0xE01EF)) &&

                !MinikinUtils::hasVariationSelector(typeface, prevCp, cp)) {

                ((0xFE00 <= cp && cp <= 0xFE0F) || (0xE0100 <= cp && cp <= 0xE01EF))) {

                bool hasVS = MinikinUtils::hasVariationSelector(typeface, prevCp, cp);

                if (!hasVS) {

                    // No font has a glyph for the code point and variation selector pair.

                    return false;

                } else if (nChars == 1 && i + 1 == str.size()) {

                    // The string is just a codepoint and a VS, we have an authoritative answer

                    return true;

                }

            }

            nChars++;

            prevCp = cp;