Merge 183104 "Force ComplexPath if any part of the node requires it"

Source/platform/text/TextRun.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 48 matching lines @@
         , m_len(len)
         , m_xpos(xpos)
         , m_horizontalGlyphStretch(1)
         , m_expansion(expansion)
         , m_expansionBehavior(expansionBehavior)
         , m_is8Bit(true)
         , m_allowTabs(false)
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_characterScanForCodePath(characterScanForCodePath)
+        , m_useComplexCodePath(false)
         , m_disableSpacing(false)
         , m_tabSize(0)
         , m_normalizeSpace(false)
     {
         m_data.characters8 = c;
     }
 
     TextRun(const UChar* c, unsigned len, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true)
         : m_charactersLength(len)
         , m_len(len)
         , m_xpos(xpos)
         , m_horizontalGlyphStretch(1)
         , m_expansion(expansion)
         , m_expansionBehavior(expansionBehavior)
         , m_is8Bit(false)
         , m_allowTabs(false)
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_characterScanForCodePath(characterScanForCodePath)
+        , m_useComplexCodePath(false)
         , m_disableSpacing(false)
         , m_tabSize(0)
         , m_normalizeSpace(false)
     {
         m_data.characters16 = c;
     }
 
     TextRun(const String& string, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, bool normalizeSpace = false)
         : m_charactersLength(string.length())
         , m_len(string.length())
         , m_xpos(xpos)
         , m_horizontalGlyphStretch(1)
         , m_expansion(expansion)
         , m_expansionBehavior(expansionBehavior)
         , m_allowTabs(false)
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_characterScanForCodePath(characterScanForCodePath)
+        , m_useComplexCodePath(false)
         , m_disableSpacing(false)
         , m_tabSize(0)
         , m_normalizeSpace(normalizeSpace)
     {
         if (!m_charactersLength) {
             m_is8Bit = true;
             m_data.characters8 = 0;
         } else if (string.is8Bit()) {
             m_data.characters8 = string.characters8();
             m_is8Bit = true;
         } else {
             m_data.characters16 = string.characters16();
             m_is8Bit = false;
         }
     }
 
     TextRun(const StringView& string, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, bool normalizeSpace = false)
         : m_charactersLength(string.length())
         , m_len(string.length())
         , m_xpos(xpos)
         , m_horizontalGlyphStretch(1)
         , m_expansion(expansion)
         , m_expansionBehavior(expansionBehavior)
         , m_allowTabs(false)
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_characterScanForCodePath(characterScanForCodePath)
+        , m_useComplexCodePath(false)
         , m_disableSpacing(false)
         , m_tabSize(0)
         , m_normalizeSpace(normalizeSpace)
     {
         if (!m_charactersLength) {
             m_is8Bit = true;
             m_data.characters8 = 0;
         } else if (string.is8Bit()) {
             m_data.characters8 = string.characters8();
             m_is8Bit = true;
@@ skipping 46 matching lines @@
     float xPos() const { return m_xpos; }
     void setXPos(float xPos) { m_xpos = xPos; }
     float expansion() const { return m_expansion; }
     bool allowsLeadingExpansion() const { return m_expansionBehavior & AllowLeadingExpansion; }
     bool allowsTrailingExpansion() const { return m_expansionBehavior & AllowTrailingExpansion; }
     TextDirection direction() const { return static_cast<TextDirection>(m_direction); }
     bool rtl() const { return m_direction == RTL; }
     bool ltr() const { return m_direction == LTR; }
     bool directionalOverride() const { return m_directionalOverride; }
     bool characterScanForCodePath() const { return m_characterScanForCodePath; }
+    bool useComplexCodePath() const { return m_useComplexCodePath; }
     bool spacingDisabled() const { return m_disableSpacing; }
 
     void disableSpacing() { m_disableSpacing = true; }
     void setDirection(TextDirection direction) { m_direction = direction; }
     void setDirectionalOverride(bool override) { m_directionalOverride = override; }
     void setCharacterScanForCodePath(bool scan) { m_characterScanForCodePath = scan; }
+    void setUseComplexCodePath(bool useComplex) { m_useComplexCodePath = useComplex; }
 
     class RenderingContext : public RefCounted<RenderingContext> {
     public:
         virtual ~RenderingContext() { }
 
         virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, WidthIterator&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceLength) = 0;
         virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const = 0;
         virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, Glyph& glyphId) const = 0;
     };
 
@@ skipping 14 matching lines @@
     float m_xpos;
     float m_horizontalGlyphStretch;
 
     float m_expansion;
     ExpansionBehavior m_expansionBehavior : 2;
     unsigned m_is8Bit : 1;
     unsigned m_allowTabs : 1;
     unsigned m_direction : 1;
     unsigned m_directionalOverride : 1; // Was this direction set by an override character.
     unsigned m_characterScanForCodePath : 1;
+    unsigned m_useComplexCodePath : 1;
     unsigned m_disableSpacing : 1;
     unsigned m_tabSize;
     bool m_normalizeSpace;
     RefPtr<RenderingContext> m_renderingContext;
 };
 
 inline void TextRun::setTabSize(bool allow, unsigned size)
 {
     m_allowTabs = allow;
     m_tabSize = size;
 }
 
 // Container for parameters needed to paint TextRun.
 struct TextRunPaintInfo {
     explicit TextRunPaintInfo(const TextRun& r)
         : run(r)
         , from(0)
         , to(r.length())
     {
     }
 
     const TextRun& run;
     int from;
     int to;
     FloatRect bounds;
 };
 
 }
 #endif