Changeset 88613 in webkit

Timestamp:

Jun 12, 2011 5:40:40 AM (13 years ago)

Author:

Nikolas Zimmermann

Message:

2011-06-11 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Add TextRun charactersLength member
​https://bugs.webkit.org/show_bug.cgi?id=62501

Preparation patch 2: Propagate the maximum length of the characters buffer the TextRun operates on, even when we're only measuring a substring.
For example: In RenderText when we're measuring 'len' characters starting from "text()->characters() + start", there's a portion
of "textLength() - start" characters that we're not processing. In order to support ligatures when integrating SVG Fonts
within the GlyphPage concept, we need this extra information, to lookup ligatures even when single chars are measured.
If a font defines an eg "ffl" ligature, and we're measuring the "f" of "ffl", it shall looukp the "ffl" glyph from the font,
and skip the next two characters (this will be done in WidthIterator).

This doesn't yet affect any test, the new SVG Fonts code is not merged yet, this is the preparaion patch 2.

• platform/graphics/Font.h: Add yet-unused "const TextRun&" parameter to drawGlyphBuffer/drawEmphasisMarks.
• platform/graphics/FontFastPath.cpp: Ditto. This parameter will be used to looukp the TextRunRenderingContext in a follow-up patch. (WebCore::Font::drawSimpleText): (WebCore::Font::drawEmphasisMarksForSimpleText): (WebCore::Font::drawGlyphBuffer): (WebCore::Font::drawEmphasisMarks):
• platform/graphics/TextRun.h: Add "int m_charactersLength", similar to "int m_len". It denotes the maximum length of the characters buffer

that we're holding. It defaults to the passed "len" value, but is overriden by explicit setCharactersLength calls.

(WebCore::TextRun::TextRun):
(WebCore::TextRun::charactersLength):
(WebCore::TextRun::setCharactersLength):

• platform/graphics/mac/FontComplexTextMac.cpp: Pass TextRun do drawGlyphBuffer/drawEmphasisMarks. (WebCore::Font::drawComplexText): (WebCore::Font::drawEmphasisMarksForComplexText):
• platform/graphics/win/FontWin.cpp: Ditto. (WebCore::Font::drawComplexText): (WebCore::Font::drawEmphasisMarksForComplexText):
• platform/graphics/wx/FontWx.cpp: Ditto. (WebCore::Font::drawComplexText): (WebCore::Font::drawEmphasisMarksForComplexText):
• rendering/InlineTextBox.cpp: Call setCharactersLength on the processed TextRun. (WebCore::InlineTextBox::constructTextRun):
• rendering/RenderBlockLineLayout.cpp: Ditto. (WebCore::textWidth): (WebCore::tryHyphenating):
• rendering/RenderText.cpp: Ditto. (WebCore::RenderText::widthFromCache): (WebCore::RenderText::computePreferredLogicalWidths): (WebCore::RenderText::width):
• rendering/svg/SVGInlineTextBox.cpp: Ditto. (WebCore::SVGInlineTextBox::constructTextRun):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.h (modified) (1 diff)
• platform/graphics/FontFastPath.cpp (modified) (4 diffs)
• platform/graphics/TextRun.h (modified) (4 diffs)
• platform/graphics/mac/FontComplexTextMac.cpp (modified) (2 diffs)
• platform/graphics/win/FontWin.cpp (modified) (2 diffs)
• platform/graphics/wx/FontWx.cpp (modified) (2 diffs)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (2 diffs)
• rendering/RenderText.cpp (modified) (3 diffs)
• rendering/svg/SVGInlineTextBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-11  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Add TextRun charactersLength member
+        https://bugs.webkit.org/show_bug.cgi?id=62501
+
+        Preparation patch 2: Propagate the maximum length of the characters buffer the TextRun operates on, even when we're only measuring a substring.
+        For example: In RenderText when we're measuring 'len' characters starting from "text()->characters() + start", there's a portion
+        of "textLength() - start" characters that we're not processing. In order to support ligatures when integrating SVG Fonts
+        within the GlyphPage concept, we need this extra information, to lookup ligatures even when single chars are measured.
+        If a font defines an eg "ffl" ligature, and we're measuring the "f" of "ffl", it shall looukp the "ffl" glyph from the font,
+        and skip the next two characters (this will be done in WidthIterator).
+
+        This doesn't yet affect any test, the new SVG Fonts code is not merged yet, this is the preparaion patch 2.
+
+        * platform/graphics/Font.h: Add yet-unused "const TextRun&" parameter to drawGlyphBuffer/drawEmphasisMarks.
+        * platform/graphics/FontFastPath.cpp: Ditto. This parameter will be used to looukp the TextRunRenderingContext in a follow-up patch.
+        (WebCore::Font::drawSimpleText):
+        (WebCore::Font::drawEmphasisMarksForSimpleText):
+        (WebCore::Font::drawGlyphBuffer):
+        (WebCore::Font::drawEmphasisMarks):
+        * platform/graphics/TextRun.h: Add "int m_charactersLength", similar to "int m_len". It denotes the maximum length of the characters buffer
+                                       that we're holding. It defaults to the passed "len" value, but is overriden by explicit setCharactersLength calls.
+        (WebCore::TextRun::TextRun):
+        (WebCore::TextRun::charactersLength):
+        (WebCore::TextRun::setCharactersLength):
+        * platform/graphics/mac/FontComplexTextMac.cpp: Pass TextRun do drawGlyphBuffer/drawEmphasisMarks.
+        (WebCore::Font::drawComplexText):
+        (WebCore::Font::drawEmphasisMarksForComplexText):
+        * platform/graphics/win/FontWin.cpp: Ditto.
+        (WebCore::Font::drawComplexText):
+        (WebCore::Font::drawEmphasisMarksForComplexText):
+        * platform/graphics/wx/FontWx.cpp: Ditto.
+        (WebCore::Font::drawComplexText):
+        (WebCore::Font::drawEmphasisMarksForComplexText):
+        * rendering/InlineTextBox.cpp: Call setCharactersLength on the processed TextRun.
+        (WebCore::InlineTextBox::constructTextRun):
+        * rendering/RenderBlockLineLayout.cpp: Ditto.
+        (WebCore::textWidth):
+        (WebCore::tryHyphenating):
+        * rendering/RenderText.cpp: Ditto.
+        (WebCore::RenderText::widthFromCache):
+        (WebCore::RenderText::computePreferredLogicalWidths):
+        (WebCore::RenderText::width):
+        * rendering/svg/SVGInlineTextBox.cpp: Ditto.
+        (WebCore::SVGInlineTextBox::constructTextRun):
+
 2011-06-12  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/platform/graphics/Font.h

@@ -164 +164 @@
     void drawEmphasisMarksForSimpleText(GraphicsContext*, const TextRun&, const AtomicString& mark, const FloatPoint&, int from, int to) const;
     void drawGlyphs(GraphicsContext*, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const;
-    void drawGlyphBuffer(GraphicsContext*, const GlyphBuffer&, const FloatPoint&) const;
-    void drawEmphasisMarks(GraphicsContext* context, const GlyphBuffer&, const AtomicString&, const FloatPoint&) const;
+    void drawGlyphBuffer(GraphicsContext*, const TextRun&, const GlyphBuffer&, const FloatPoint&) const;
+    void drawEmphasisMarks(GraphicsContext*, const TextRun&, const GlyphBuffer&, const AtomicString&, const FloatPoint&) const;
     float floatWidthForSimpleText(const TextRun&, GlyphBuffer*, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
     int offsetForPositionForSimpleText(const TextRun&, float position, bool includePartialGlyphs) const;

trunk/Source/WebCore/platform/graphics/FontFastPath.cpp

@@ -363 +363 @@
 
     FloatPoint startPoint(startX, point.y());
-    drawGlyphBuffer(context, glyphBuffer, startPoint);
+    drawGlyphBuffer(context, run, glyphBuffer, startPoint);
 }
 
@@ -374 +374 @@
         return;
 
-    drawEmphasisMarks(context, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
-}
-
-void Font::drawGlyphBuffer(GraphicsContext* context, const GlyphBuffer& glyphBuffer, const FloatPoint& point) const
+    drawEmphasisMarks(context, run, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
+}
+
+void Font::drawGlyphBuffer(GraphicsContext* context, const TextRun&, const GlyphBuffer& glyphBuffer, const FloatPoint& point) const
 {   
     // Draw each contiguous run of glyphs that use the same font data.
@@ -419 +419 @@
 }
 
-void Font::drawEmphasisMarks(GraphicsContext* context, const GlyphBuffer& glyphBuffer, const AtomicString& mark, const FloatPoint& point) const
+void Font::drawEmphasisMarks(GraphicsContext* context, const TextRun& run, const GlyphBuffer& glyphBuffer, const AtomicString& mark, const FloatPoint& point) const
 {
     GlyphData markGlyphData;
@@ -445 +445 @@
     markBuffer.add(glyphBuffer.glyphAt(glyphBuffer.size() - 1) ? markGlyph : spaceGlyph, markFontData, 0);
 
-    drawGlyphBuffer(context, markBuffer, startPoint);
+    drawGlyphBuffer(context, run, markBuffer, startPoint);
 }
 

trunk/Source/WebCore/platform/graphics/TextRun.h

@@ -49 +49 @@
     TextRun(const UChar* c, int len, bool allowTabs = false, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false)
         : m_characters(c)
+        , m_charactersLength(len)
         , m_len(len)
         , m_xpos(xpos)
@@ -65 +66 @@
     TextRun(const String& s, bool allowTabs = false, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false)
         : m_characters(s.characters())
+        , m_charactersLength(s.length())
         , m_len(s.length())
         , m_xpos(xpos)
@@ -84 +86 @@
     const UChar* characters() const { return m_characters; }
     int length() const { return m_len; }
+    int charactersLength() const { return m_charactersLength; }
 
     void setText(const UChar* c, int len) { m_characters = c; m_len = len; }
+    void setCharactersLength(int charactersLength) { m_charactersLength = charactersLength; }
 
 #if ENABLE(SVG)
@@ -128 +132 @@
 private:
     const UChar* m_characters;
+    int m_charactersLength; // Marks the end of the m_characters buffer. Default equals to m_len.
     int m_len;
 

trunk/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp

@@ -94 +94 @@
     // Draw the glyph buffer now at the starting point returned in startX.
     FloatPoint startPoint(startX, point.y());
-    drawGlyphBuffer(context, glyphBuffer, startPoint);
+    drawGlyphBuffer(context, run, glyphBuffer, startPoint);
 }
 
@@ -105 +105 @@
         return;
 
-    drawEmphasisMarks(context, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
+    drawEmphasisMarks(context, run, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
 }
 

trunk/Source/WebCore/platform/graphics/win/FontWin.cpp

@@ -109 +109 @@
     // Draw the glyph buffer now at the starting point returned in startX.
     FloatPoint startPoint(startX, point.y());
-    drawGlyphBuffer(context, glyphBuffer, startPoint);
+    drawGlyphBuffer(context, run, glyphBuffer, startPoint);
 }
 
@@ -120 +120 @@
         return;
 
-    drawEmphasisMarks(context, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
+    drawEmphasisMarks(context, run, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
 }
 

trunk/Source/WebCore/platform/graphics/wx/FontWx.cpp

@@ -151 +151 @@
     // Draw the glyph buffer now at the starting point returned in startX.
     FloatPoint startPoint(startX, point.y());
-    drawGlyphBuffer(context, glyphBuffer, startPoint);
+    drawGlyphBuffer(context, run, glyphBuffer, startPoint);
 #else
     notImplemented();
@@ -165 +165 @@
         return;
 
-    drawEmphasisMarks(context, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
+    drawEmphasisMarks(context, run, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
 }
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -1319 +1319 @@
         run.setRenderingContext(SVGTextRunRenderingContext::create(textRenderer));
 
+    // Propagate the maximum length of the characters buffer to the TextRun, even when we're only processing a substring.
+    run.setCharactersLength(textRenderer->textLength());
     return run;
 }

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1575 +1575 @@
     if (isFixedPitch || (!from && len == text->textLength()) || text->style()->hasTextCombine())
         return text->width(from, len, font, xPos);
+
     TextRun run = RenderBlock::constructTextRun(text, font, text->characters() + from, len, text->style());
+    run.setCharactersLength(text->textLength() - from);
+    ASSERT(run.charactersLength() >= run.length());
+
     run.setAllowTabs(!collapseWhiteSpace);
     run.setXPos(xPos);
@@ -1603 +1607 @@
 
     TextRun run = RenderBlock::constructTextRun(text, font, text->characters() + lastSpace, pos - lastSpace, text->style());
+    run.setCharactersLength(text->textLength() - lastSpace);
+    ASSERT(run.charactersLength() >= run.length());
+
     run.setAllowTabs(!collapseWhiteSpace);
     run.setXPos(xPos + lastSpaceWordSpacing);

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -632 +632 @@
 
     TextRun run = RenderBlock::constructTextRun(const_cast<RenderText*>(this), f, text()->characters() + start, len, style());
+    run.setCharactersLength(textLength() - start);
+    ASSERT(run.charactersLength() >= run.length());
+
     run.setAllowTabs(allowTabs());
     run.setXPos(xPos);
@@ -919 +922 @@
             } else {
                 TextRun run = RenderBlock::constructTextRun(this, f, txt + i, 1, style());
+                run.setCharactersLength(len - i);
+                ASSERT(run.charactersLength() >= run.length());
+
                 run.setAllowTabs(allowTabs());
                 run.setXPos(leadWidth + currMaxWidth);
@@ -1298 +1304 @@
     } else {
         TextRun run = RenderBlock::constructTextRun(const_cast<RenderText*>(this), f, text()->characters() + from, len, style());
+        run.setCharactersLength(textLength() - from);
+        ASSERT(run.charactersLength() >= run.length());
+
         run.setAllowTabs(allowTabs());
         run.setXPos(xPos);

trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp

@@ -431 +431 @@
     // We handle letter & word spacing ourselves.
     run.disableSpacing();
+
+    // Propagate the maximum length of the characters buffer to the TextRun, even when we're only processing a substring.
+    run.setCharactersLength(text->textLength() - fragment.characterOffset);
+    ASSERT(run.charactersLength() >= run.length());
     return run;
 }