Changeset 173476 in webkit

Timestamp:

Sep 10, 2014 11:58:05 AM (10 years ago)

Author:

mmaxfield@apple.com

Message:

Laying out a TextRun using an SVG font is O(n^{2)
​https://bugs.webkit.org/show_bug.cgi?id=136584}

Reviewed by Darin Adler.

Addressing post-commit review from Darin.

No new tests.

• platform/graphics/Font.h:

(WebCore::Font::treatAsSpace): Un-inline.
(WebCore::Font::treatAsZeroWidthSpace): Ditto.
(WebCore::Font::treatAsZeroWidthSpaceInComplexScript): Ditto.

• svg/SVGFontData.cpp:

(WebCore::computeNormalizedSpaces): Avoid unnecessary copy.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.h (modified) (1 diff)
• svg/SVGFontData.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-10  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Laying out a TextRun using an SVG font is O(n^2)
+        https://bugs.webkit.org/show_bug.cgi?id=136584
+
+        Reviewed by Darin Adler.
+
+        Addressing post-commit review from Darin.
+
+        No new tests.
+
+        * platform/graphics/Font.h:
+        (WebCore::Font::treatAsSpace): Un-inline.
+        (WebCore::Font::treatAsZeroWidthSpace): Ditto.
+        (WebCore::Font::treatAsZeroWidthSpaceInComplexScript): Ditto.
+        * svg/SVGFontData.cpp:
+        (WebCore::computeNormalizedSpaces): Avoid unnecessary copy.
+
 2014-09-10  peavo@outlook.com  <peavo@outlook.com>
 

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

@@ -269 +269 @@
 
     FontSelector* fontSelector() const;
-    static inline bool treatAsSpace(UChar c) { return c == ' ' || c == '\t' || c == '\n' || c == noBreakSpace; }
-    static inline bool treatAsZeroWidthSpace(UChar c) { return treatAsZeroWidthSpaceInComplexScript(c) || c == 0x200c || c == 0x200d; }
-    static inline bool treatAsZeroWidthSpaceInComplexScript(UChar c) { return c < 0x20 || (c >= 0x7F && c < 0xA0) || c == softHyphen || c == zeroWidthSpace || (c >= 0x200e && c <= 0x200f) || (c >= 0x202a && c <= 0x202e) || c == zeroWidthNoBreakSpace || c == objectReplacementCharacter; }
+    static bool treatAsSpace(UChar c) { return c == ' ' || c == '\t' || c == '\n' || c == noBreakSpace; }
+    static bool treatAsZeroWidthSpace(UChar c) { return treatAsZeroWidthSpaceInComplexScript(c) || c == 0x200c || c == 0x200d; }
+    static bool treatAsZeroWidthSpaceInComplexScript(UChar c) { return c < 0x20 || (c >= 0x7F && c < 0xA0) || c == softHyphen || c == zeroWidthSpace || (c >= 0x200e && c <= 0x200f) || (c >= 0x202a && c <= 0x202e) || c == zeroWidthNoBreakSpace || c == objectReplacementCharacter; }
     static bool canReceiveTextEmphasis(UChar32 c);
 

trunk/Source/WebCore/svg/SVGFontData.cpp

@@ -287 +287 @@
     if (normalizedSpacesStringCache.length() == static_cast<unsigned>(run.charactersLength()))
         return;
-    if (run.is8Bit()) {
-        normalizedSpacesStringCache = String(run.data8(0), run.charactersLength());
-        normalizedSpacesStringCache = Font::normalizeSpaces(normalizedSpacesStringCache.characters8(), normalizedSpacesStringCache.length());
-    } else {
-        normalizedSpacesStringCache = String(run.data16(0), run.charactersLength());
-        normalizedSpacesStringCache = Font::normalizeSpaces(normalizedSpacesStringCache.characters16(), normalizedSpacesStringCache.length());
-    }
+    if (run.is8Bit())
+        normalizedSpacesStringCache = Font::normalizeSpaces(run.characters8(), run.charactersLength());
+    else
+        normalizedSpacesStringCache = Font::normalizeSpaces(run.characters16(), run.charactersLength());
     if (mirror)
         normalizedSpacesStringCache = createStringWithMirroredCharacters(normalizedSpacesStringCache);