Render Unicode control characters

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 14 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/fonts/shaping/HarfBuzzShaper.h"
 
 #include "platform/Logging.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/Font.h"
 #include "platform/fonts/FontFallbackIterator.h"
 #include "platform/fonts/GlyphBuffer.h"
 #include "platform/fonts/UTF16TextIterator.h"
 #include "platform/fonts/opentype/OpenTypeCapsSupport.h"
 #include "platform/fonts/shaping/CaseMappingHarfBuzzBufferFiller.h"
 #include "platform/fonts/shaping/HarfBuzzFace.h"
 #include "platform/fonts/shaping/RunSegmenter.h"
 #include "platform/fonts/shaping/ShapeResultInlineHeaders.h"
 #include "platform/text/Character.h"
@@ skipping 46 matching lines @@
         source = stringFor8BitRun.characters16();
     } else {
         source = run.characters16();
     }
 
     *destinationLength = 0;
     while (position < length) {
         UChar32 character;
         U16_NEXT(source, position, length, character);
         // Don't normalize tabs as they are not treated as spaces for word-end.
-        if (run.normalizeSpace() && Character::isNormalizedCanvasSpaceCharacter(character))
+        if (run.normalizeSpace() && Character::isNormalizedCanvasSpaceCharacter(character)) {
             character = spaceCharacter;
-        else if (Character::treatAsSpace(character) && character != noBreakSpaceCharacter)
+        } else if (Character::treatAsSpace(character) && character != noBreakSpaceCharacter) {
             character = spaceCharacter;
-        else if (Character::treatAsZeroWidthSpaceInComplexScript(character))
+        } else if (!RuntimeEnabledFeatures::renderUnicodeControlCharactersEnabled()
+            && Character::legacyTreatAsZeroWidthSpaceInComplexScript(character)) {
             character = zeroWidthSpaceCharacter;
+        } else if (Character::treatAsZeroWidthSpaceInComplexScript(character)) {
+            character = zeroWidthSpaceCharacter;
+        }
 
         U16_APPEND(destination, *destinationLength, length, character, error);
         ASSERT_UNUSED(error, !error);
     }
 }
 
 HarfBuzzShaper::HarfBuzzShaper(const Font* font, const TextRun& run)
     : Shaper(font, run)
     , m_normalizedBufferLength(0)
 {
@@ skipping 550 matching lines @@
     result->m_width = run->m_width;
     result->m_numGlyphs = count;
     ASSERT(result->m_numGlyphs == count); // no overflow
     result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright();
     result->m_runs.append(run.release());
     return result.release();
 }
 
 
 } // namespace blink