Changeset 189465 in webkit

Timestamp:

Sep 7, 2015, 10:42:50 AM (10 years ago)

Author:

Antti Koivisto

Message:

Remove unneeded offset and length arguments from glyph page filling functions
​https://bugs.webkit.org/show_bug.cgi?id=148929

Reviewed by Andreas Kling.

They are always passed 0/GlyphPage::size.

• platform/graphics/Font.cpp:

(WebCore::Font::~Font):
(WebCore::fillGlyphPage):
(WebCore::createAndFillGlyphPage):

• platform/graphics/Font.h:
• platform/graphics/GlyphPage.h:

(WebCore::GlyphPage::setGlyphDataForIndex):

• platform/graphics/mac/GlyphPageMac.cpp:

(WebCore::GlyphPage::mayUseMixedFontsWhenFilling):
(WebCore::GlyphPage::fill):

• platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:

(WebCore::GlyphPage::fill):

• platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp:

(WebCore::GlyphPage::fill):

• svg/SVGFontData.cpp:

(WebCore::SVGFontData::applySVGGlyphSelection):
(WebCore::SVGFontData::fillSVGGlyphPage):
(WebCore::SVGFontData::fillBMPGlyphs):
(WebCore::SVGFontData::fillNonBMPGlyphs):

• svg/SVGFontData.h:

(WebCore::SVGFontData::verticalAdvanceY):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.cpp (modified) (2 diffs)
• platform/graphics/Font.h (modified) (1 diff)
• platform/graphics/GlyphPage.h (modified) (1 diff)
• platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp (modified) (3 diffs)
• platform/graphics/mac/GlyphPageMac.cpp (modified) (3 diffs)
• platform/graphics/opentype/OpenTypeVerticalData.cpp (modified) (2 diffs)
• platform/graphics/opentype/OpenTypeVerticalData.h (modified) (1 diff)
• platform/graphics/win/GlyphPageTreeNodeCGWin.cpp (modified) (2 diffs)
• platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp (modified) (2 diffs)
• svg/SVGFontData.cpp (modified) (5 diffs)
• svg/SVGFontData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2015-09-07  Antti Koivisto  <antti@apple.com>
+
+        Remove unneeded offset and length arguments from glyph page filling functions
+        https://bugs.webkit.org/show_bug.cgi?id=148929
+
+        Reviewed by Andreas Kling.
+
+        They are always passed 0/GlyphPage::size.
+
+        * platform/graphics/Font.cpp:
+        (WebCore::Font::~Font):
+        (WebCore::fillGlyphPage):
+        (WebCore::createAndFillGlyphPage):
+        * platform/graphics/Font.h:
+        * platform/graphics/GlyphPage.h:
+        (WebCore::GlyphPage::setGlyphDataForIndex):
+        * platform/graphics/mac/GlyphPageMac.cpp:
+        (WebCore::GlyphPage::mayUseMixedFontsWhenFilling):
+        (WebCore::GlyphPage::fill):
+        * platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
+        (WebCore::GlyphPage::fill):
+        * platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp:
+        (WebCore::GlyphPage::fill):
+        * svg/SVGFontData.cpp:
+        (WebCore::SVGFontData::applySVGGlyphSelection):
+        (WebCore::SVGFontData::fillSVGGlyphPage):
+        (WebCore::SVGFontData::fillBMPGlyphs):
+        (WebCore::SVGFontData::fillNonBMPGlyphs):
+        * svg/SVGFontData.h:
+        (WebCore::SVGFontData::verticalAdvanceY):
+
 2015-09-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/Font.cpp ¶

@@ -150 +150 @@
 }
 
-static bool fillGlyphPage(GlyphPage& pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* font)
+static bool fillGlyphPage(GlyphPage& pageToFill, UChar* buffer, unsigned bufferLength, const Font* font)
 {
 #if ENABLE(SVG_FONTS)
     if (auto* svgData = font->svgData())
-        return svgData->fillSVGGlyphPage(&pageToFill, offset, length, buffer, bufferLength, font);
-#endif
-    bool hasGlyphs = pageToFill.fill(offset, length, buffer, bufferLength, font);
+        return svgData->fillSVGGlyphPage(&pageToFill, buffer, bufferLength, font);
+#endif
+    bool hasGlyphs = pageToFill.fill(buffer, bufferLength, font);
 #if ENABLE(OPENTYPE_VERTICAL)
     if (hasGlyphs && font->verticalData())
-        font->verticalData()->substituteWithVerticalGlyphs(font, &pageToFill, offset, length);
+        font->verticalData()->substituteWithVerticalGlyphs(font, &pageToFill);
 #endif
     return hasGlyphs;
@@ -233 +233 @@
         glyphPage = GlyphPage::createForSingleFont(font);
 
-    bool haveGlyphs = fillGlyphPage(*glyphPage, 0, GlyphPage::size, buffer, bufferLength, font);
+    bool haveGlyphs = fillGlyphPage(*glyphPage, buffer, bufferLength, font);
     if (!haveGlyphs)
         return nullptr;

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

@@ -77 +77 @@
         virtual void initializeFont(Font*, float fontSize) = 0;
         virtual float widthForSVGGlyph(Glyph, float fontSize) const = 0;
-        virtual bool fillSVGGlyphPage(GlyphPage*, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font*) const = 0;
+        virtual bool fillSVGGlyphPage(GlyphPage*, UChar* buffer, unsigned bufferLength, const Font*) const = 0;
     };
 

trunk/Source/WebCore/platform/graphics/GlyphPage.h ¶

@@ -157 +157 @@
 
     // Implemented by the platform.
-    bool fill(unsigned offset, unsigned length, UChar* characterBuffer, unsigned bufferLength, const Font*);
+    bool fill(UChar* characterBuffer, unsigned bufferLength, const Font*);
 #if PLATFORM(COCOA)
     static bool mayUseMixedFontsWhenFilling(const UChar* characterBuffer, unsigned bufferLength, const Font*);

trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp ¶

@@ -40 +40 @@
 namespace WebCore {
 
-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* fontData)
+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
 {
     cairo_scaled_font_t* scaledFont = fontData->platformData().scaledFont();
@@ -51 +51 @@
     bool haveGlyphs = false;
     UTF16UChar32Iterator iterator(buffer, bufferLength);
-    for (unsigned i = 0; i < length; i++) {
+    for (unsigned i = 0; i < GlyphPage::size; i++) {
         UChar32 character = iterator.next();
         if (character == iterator.end())
@@ -58 +58 @@
         Glyph glyph = FcFreeTypeCharIndex(face, character);
         if (!glyph)
-            setGlyphDataForIndex(offset + i, 0, 0);
+            setGlyphDataForIndex(i, 0, 0);
         else {
-            setGlyphDataForIndex(offset + i, glyph, fontData);
+            setGlyphDataForIndex(i, glyph, fontData);
             haveGlyphs = true;
         }

trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp ¶

@@ -72 +72 @@
 }
 
-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* fontData)
+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
 {
     bool haveGlyphs = false;
@@ -83 +83 @@
         // this should not happen as the only time we pass in 512 characters is when they are surrogates.
         CGFontGetGlyphsForUnichars(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
-        for (unsigned i = 0; i < length; ++i) {
+        for (unsigned i = 0; i < GlyphPage::size; ++i) {
             if (!glyphs[i])
-                setGlyphDataForIndex(offset + i, 0, 0);
+                setGlyphDataForIndex(i, 0, 0);
             else {
-                setGlyphDataForIndex(offset + i, glyphs[i], fontData);
+                setGlyphDataForIndex(i, glyphs[i], fontData);
                 haveGlyphs = true;
             }
@@ -100 +100 @@
         // When buffer consists of surrogate pairs, CTFontGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
         // place the glyphs at indices corresponding to the first character of each pair.
-        ASSERT(!(bufferLength % length) && (bufferLength / length == 1 || bufferLength / length == 2));
-        unsigned glyphStep = bufferLength / length;
-        for (unsigned i = 0; i < length; ++i) {
+        ASSERT(bufferLength == GlyphPage::size || bufferLength == 2 * GlyphPage::size);
+        unsigned glyphStep = bufferLength / GlyphPage::size;
+        for (unsigned i = 0; i < GlyphPage::size; ++i) {
             if (!glyphs[i * glyphStep])
-                setGlyphDataForIndex(offset + i, 0, 0);
+                setGlyphDataForIndex(i, 0, 0);
             else {
-                setGlyphDataForIndex(offset + i, glyphs[i * glyphStep], fontData);
+                setGlyphDataForIndex(i, glyphs[i * glyphStep], fontData);
                 haveGlyphs = true;
             }

trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp ¶

@@ -536 +536 @@
 }
 
-void OpenTypeVerticalData::substituteWithVerticalGlyphs(const Font* font, GlyphPage* glyphPage, unsigned offset, unsigned length) const
+void OpenTypeVerticalData::substituteWithVerticalGlyphs(const Font* font, GlyphPage* glyphPage) const
 {
     const HashMap<Glyph, Glyph>& map = m_verticalGlyphMap;
@@ -542 +542 @@
         return;
 
-    for (unsigned index = offset, end = offset + length; index < end; ++index) {
+    for (unsigned index = 0; index < GlyphPage::size; ++index) {
         Glyph glyph = glyphPage->glyphAt(index);
         if (glyph) {

trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h ¶

@@ -51 +51 @@
     float advanceHeight(const Font*, Glyph) const;
     void getVerticalTranslationsForGlyphs(const Font*, const Glyph*, size_t, float* outXYArray) const;
-    void substituteWithVerticalGlyphs(const Font*, GlyphPage*, unsigned offset, unsigned length) const;
+    void substituteWithVerticalGlyphs(const Font*, GlyphPage*) const;
 
 private:

trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp ¶

@@ -35 +35 @@
 namespace WebCore {
 
-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* fontData)
+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
 {
     // bufferLength will be greater than the requested number of glyphs if the buffer contains surrogate pairs.
     // We won't support this for now.
-    if (bufferLength > length)
+    if (bufferLength > GlyphPage::size)
         return false;
 
@@ -45 +45 @@
     CGGlyph localGlyphBuffer[GlyphPage::size];
     wkGetGlyphs(fontData->platformData().cgFont(), buffer, localGlyphBuffer, bufferLength);
-    for (unsigned i = 0; i < length; i++) {
+    for (unsigned i = 0; i < GlyphPage::size; i++) {
         Glyph glyph = localGlyphBuffer[i];
         if (!glyph)
-            setGlyphDataForIndex(offset + i, 0, 0);
+            setGlyphDataForIndex(i, 0, 0);
         else {
-            setGlyphDataForIndex(offset + i, glyph, fontData);
+            setGlyphDataForIndex(i, glyph, fontData);
             haveGlyphs = true;
         }

trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp ¶

@@ -35 +35 @@
 namespace WebCore {
 
-bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* fontData)
+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
 {
     // bufferLength will be greater than the requested number of glyphs if the buffer contains surrogate pairs.
     // We won't support this for now.
-    if (bufferLength > length)
+    if (bufferLength > GlyphPage::size)
         return false;
 
@@ -52 +52 @@
     bool success = result != GDI_ERROR && static_cast<unsigned>(result) == bufferLength;
     if (success) {
-        for (unsigned i = 0; i < length; i++) {
+        for (unsigned i = 0; i < GlyphPage::size; i++) {
             Glyph glyph = localGlyphBuffer[i];
             if (glyph == 0xffff)
-                setGlyphDataForIndex(offset + i, 0, 0);
+                setGlyphDataForIndex(i, 0, 0);
             else {
-                setGlyphDataForIndex(offset + i, glyph, fontData);
+                setGlyphDataForIndex(i, glyph, fontData);
                 haveGlyphs = true;
             }

trunk/Source/WebCore/svg/SVGFontData.cpp ¶

@@ -205 +205 @@
 }
 
-bool SVGFontData::fillSVGGlyphPage(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font* font) const
+bool SVGFontData::fillSVGGlyphPage(GlyphPage* pageToFill, UChar* buffer, unsigned bufferLength, const Font* font) const
 {
     ASSERT(font->isCustomFont());
@@ -216 +216 @@
     ASSERT(fontElement);
 
-    if (bufferLength == length)
-        return fillBMPGlyphs(fontElement, pageToFill, offset, length, buffer, font);
-
-    ASSERT(bufferLength == 2 * length);
-    return fillNonBMPGlyphs(fontElement, pageToFill, offset, length, buffer, font);
-}
-
-bool SVGFontData::fillBMPGlyphs(SVGFontElement* fontElement, GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, const Font* font) const
+    if (bufferLength == GlyphPage::size)
+        return fillBMPGlyphs(fontElement, pageToFill, buffer, font);
+
+    ASSERT(bufferLength == 2 * GlyphPage::size);
+    return fillNonBMPGlyphs(fontElement, pageToFill, buffer, font);
+}
+
+bool SVGFontData::fillBMPGlyphs(SVGFontElement* fontElement, GlyphPage* pageToFill, UChar* buffer, const Font* font) const
 {
     bool haveGlyphs = false;
     Vector<SVGGlyph> glyphs;
-    for (unsigned i = 0; i < length; ++i) {
+    for (unsigned i = 0; i < GlyphPage::size; ++i) {
         String lookupString(buffer + i, 1);
         fontElement->collectGlyphsForString(lookupString, glyphs);
         if (glyphs.isEmpty()) {
-            pageToFill->setGlyphDataForIndex(offset + i, 0, 0);
+            pageToFill->setGlyphDataForIndex(i, 0, 0);
             continue;
         }
@@ -240 +240 @@
         // only possible within the context of a string (eg. arabic form matching).
         haveGlyphs = true;
-        pageToFill->setGlyphDataForIndex(offset + i, glyphs.first().tableEntry, font);
+        pageToFill->setGlyphDataForIndex(i, glyphs.first().tableEntry, font);
         glyphs.clear();
     }
@@ -247 +247 @@
 }
 
-bool SVGFontData::fillNonBMPGlyphs(SVGFontElement* fontElement, GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, const Font* font) const
+bool SVGFontData::fillNonBMPGlyphs(SVGFontElement* fontElement, GlyphPage* pageToFill, UChar* buffer, const Font* font) const
 {
     bool haveGlyphs = false;
     Vector<SVGGlyph> glyphs;
-    for (unsigned i = 0; i < length; ++i) {
+    for (unsigned i = 0; i < GlyphPage::size; ++i) {
         // Each character here consists of a surrogate pair
         String lookupString(buffer + i * 2, 2);
         fontElement->collectGlyphsForString(lookupString, glyphs);
         if (glyphs.isEmpty()) {
-            pageToFill->setGlyphDataForIndex(offset + i, 0, 0);
+            pageToFill->setGlyphDataForIndex(i, 0, 0);
             continue;
         }
@@ -265 +265 @@
         // only possible within the context of a string (eg. arabic form matching).
         haveGlyphs = true;
-        pageToFill->setGlyphDataForIndex(offset + i, glyphs.first().tableEntry, font);
+        pageToFill->setGlyphDataForIndex(i, glyphs.first().tableEntry, font);
         glyphs.clear();
     }

trunk/Source/WebCore/svg/SVGFontData.h ¶

@@ -36 +36 @@
     virtual void initializeFont(Font*, float fontSize) override;
     virtual float widthForSVGGlyph(Glyph, float fontSize) const override;
-    virtual bool fillSVGGlyphPage(GlyphPage*, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const Font*) const override;
+    virtual bool fillSVGGlyphPage(GlyphPage*, UChar* buffer, unsigned bufferLength, const Font*) const override;
 
     bool applySVGGlyphSelection(WidthIterator&, GlyphData&, bool mirror, int currentCharacter, unsigned& advanceLength, String& normalizedSpacesStringCache) const;
@@ -51 +51 @@
 
 private:
-    bool fillBMPGlyphs(SVGFontElement*, GlyphPage* , unsigned offset, unsigned length, UChar* buffer, const Font*) const;
-    bool fillNonBMPGlyphs(SVGFontElement*, GlyphPage* , unsigned offset, unsigned length, UChar* buffer, const Font*) const;
+    bool fillBMPGlyphs(SVGFontElement*, GlyphPage*, UChar* buffer, const Font*) const;
+    bool fillNonBMPGlyphs(SVGFontElement*, GlyphPage*, UChar* buffer, const Font*) const;
 
     bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t, TypesettingFeatures) const = delete;