Changeset 125575 in webkit

Timestamp:

Aug 14, 2012 10:16:19 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Fix LayoutTests/canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html
​https://bugs.webkit.org/show_bug.cgi?id=92974

Patch by Christophe Dumez <Christophe Dumez> on 2012-08-14
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Replace space characters by U+0020 SPACE characters in
CanvasRenderingContext2D::drawTextInternal() in order to
comply with the HTML Canvas 2D Context specification:

• ​http://www.w3.org/TR/2dcontext/#drawing-text-to-the-canvas

No new tests, already tested by canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html.

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::replaceCharacterInString):
(WebCore):
(WebCore::CanvasRenderingContext2D::drawTextInternal):

LayoutTests:

Unskip canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html for
all the ports now that space characters are correctly replaced in
the text passed to fillText() and strokeText().

• platform/chromium/TestExpectations:
• platform/efl/Skipped:
• platform/gtk/TestExpectations:
• platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.nonspace-expected.txt: Removed.
• platform/qt/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.nonspace-expected.txt (deleted)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-14  Christophe Dumez  <christophe.dumez@intel.com>
+
+        Fix  LayoutTests/canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html
+        https://bugs.webkit.org/show_bug.cgi?id=92974
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Unskip canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html for
+        all the ports now that space characters are correctly replaced in
+        the text passed to fillText() and strokeText().
+
+        * platform/chromium/TestExpectations:
+        * platform/efl/Skipped:
+        * platform/gtk/TestExpectations:
+        * platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.nonspace-expected.txt: Removed.
+        * platform/qt/Skipped:
+
 2012-08-14  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -1889 +1889 @@
 
 BUGWK45991 : canvas/philip/tests/2d.text.draw.space.collapse.end.html = TEXT
-BUGWK45991 : canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html = TEXT
 BUGWK45991 : canvas/philip/tests/2d.text.draw.space.collapse.other.html = TEXT
 BUGWK45991 : canvas/philip/tests/2d.text.draw.space.collapse.space.html = TEXT
 BUGWK45991 : canvas/philip/tests/2d.text.draw.space.collapse.start.html = TEXT
 BUGWK45991 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.space.collapse.end.html = TEXT
-BUGWK45991 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html = TEXT
 BUGWK45991 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.space.collapse.other.html = TEXT
 BUGWK45991 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.space.collapse.space.html = TEXT

trunk/LayoutTests/platform/efl/Skipped

@@ -322 +322 @@
 canvas/philip/tests/2d.text.draw.baseline.top.html
 canvas/philip/tests/2d.text.draw.space.collapse.end.html
-canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html
 canvas/philip/tests/2d.text.draw.space.collapse.other.html
 canvas/philip/tests/2d.text.draw.space.collapse.space.html

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -903 +903 @@
 BUGWKGTK : canvas/philip/tests/2d.text.draw.baseline.top.html = TEXT
 BUGWKGTK : canvas/philip/tests/2d.text.draw.space.collapse.end.html = TEXT
-BUGWKGTK : canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html = TEXT
 BUGWKGTK : canvas/philip/tests/2d.text.draw.space.collapse.other.html = TEXT
 BUGWKGTK : canvas/philip/tests/2d.text.draw.space.collapse.space.html = TEXT

trunk/LayoutTests/platform/qt/Skipped

@@ -2108 +2108 @@
 canvas/philip/tests/2d.text.draw.fontface.notinpage.html
 canvas/philip/tests/2d.text.draw.space.collapse.end.html
-canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html
 canvas/philip/tests/2d.text.draw.space.collapse.other.html
 canvas/philip/tests/2d.text.draw.space.collapse.space.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-14  Christophe Dumez  <christophe.dumez@intel.com>
+
+        Fix  LayoutTests/canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html
+        https://bugs.webkit.org/show_bug.cgi?id=92974
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Replace space characters by U+0020 SPACE characters in
+        CanvasRenderingContext2D::drawTextInternal() in order to
+        comply with the HTML Canvas 2D Context specification:
+        - http://www.w3.org/TR/2dcontext/#drawing-text-to-the-canvas
+
+        No new tests, already tested by canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::replaceCharacterInString):
+        (WebCore):
+        (WebCore::CanvasRenderingContext2D::drawTextInternal):
+
 2012-08-14  George Staikos  <staikos@webkit.org>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -2133 +2133 @@
 }
 
+static void replaceCharacterInString(String& text, WTF::CharacterMatchFunctionPtr matchFunction, const String& replacement)
+{
+    const size_t replacementLength = replacement.length();
+    size_t index = 0;
+    while ((index = text.find(matchFunction, index)) != notFound) {
+        text.replace(index, 1, replacement);
+        index += replacementLength;
+    }
+}
+
 void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth, bool useMaxWidth)
 {
@@ -2149 +2159 @@
     const Font& font = accessFont();
     const FontMetrics& fontMetrics = font.fontMetrics();
+    // According to spec, all the space characters must be replaced with U+0020 SPACE characters.
+    String normalizedText = text;
+    replaceCharacterInString(normalizedText, isSpaceOrNewline, " ");
 
     // FIXME: Need to turn off font smoothing.
@@ -2157 +2170 @@
     bool override = computedStyle ? isOverride(computedStyle->unicodeBidi()) : false;
 
-    TextRun textRun(text, 0, 0, TextRun::AllowTrailingExpansion, direction, override, true, TextRun::NoRounding);
+    TextRun textRun(normalizedText, 0, 0, TextRun::AllowTrailingExpansion, direction, override, true, TextRun::NoRounding);
     // Draw the item text at the correct point.
     FloatPoint location(x, y);
@@ -2178 +2191 @@
     }
 
-    float fontWidth = font.width(TextRun(text, 0, 0, TextRun::AllowTrailingExpansion, direction, override));
+    float fontWidth = font.width(TextRun(normalizedText, 0, 0, TextRun::AllowTrailingExpansion, direction, override));
 
     useMaxWidth = (useMaxWidth && maxWidth < fontWidth);