Changeset 136765 in webkit

Timestamp:

Dec 5, 2012, 3:07:31 PM (13 years ago)

Author:

mitz@apple.com

Message:

Text decorations are rotated when text-combine takes effect
​https://bugs.webkit.org/show_bug.cgi?id=104172

Reviewed by Dave Hyatt.

Source/WebCore:

Test: fast/text/decorations-with-text-combine.html

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paint): Applied a rotation to the graphics context when painting
the text decorations for combined text.

LayoutTests:

• fast/text/decorations-with-text-combine.html: Added.
• platform/chromium/TestExpectations: Added to tests missing platform-specific results.
• platform/mac/fast/text/decorations-with-text-combine-expected.png: Added.
• platform/mac/fast/text/decorations-with-text-combine-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/decorations-with-text-combine.html (added)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/decorations-with-text-combine-expected.png (added)
• LayoutTests/platform/mac/fast/text/decorations-with-text-combine-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/InlineTextBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2012-12-05  Dan Bernstein  <mitz@apple.com>
+
+        Text decorations are rotated when text-combine takes effect
+        https://bugs.webkit.org/show_bug.cgi?id=104172
+
+        Reviewed by Dave Hyatt.
+
+        * fast/text/decorations-with-text-combine.html: Added.
+        * platform/chromium/TestExpectations: Added to tests missing platform-specific results.
+        * platform/mac/fast/text/decorations-with-text-combine-expected.png: Added.
+        * platform/mac/fast/text/decorations-with-text-combine-expected.txt: Added.
+
 2012-12-05  Tony Chang  <tony@chromium.org>
 

trunk/LayoutTests/platform/chromium/TestExpectations ¶

@@ -4255 +4255 @@
 # Needs platform-specific results
 webkit.org/b/104035 fast/text/orientation-sideways.html [ Missing ]
+webkit.org/b/104172 fast/text/decorations-with-text-combine.html [ Missing ]
 
 # Crash since r136588.

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2012-12-05  Dan Bernstein  <mitz@apple.com>
+
+        Text decorations are rotated when text-combine takes effect
+        https://bugs.webkit.org/show_bug.cgi?id=104172
+
+        Reviewed by Dave Hyatt.
+
+        Test: fast/text/decorations-with-text-combine.html
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paint): Applied a rotation to the graphics context when painting
+        the text decorations for combined text.
+
 2012-12-05  Justin Novosad  <junov@google.com>
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp ¶

@@ -770 +770 @@
     if (textDecorations != TDNONE && paintInfo.phase != PaintPhaseSelection) {
         updateGraphicsContext(context, textFillColor, textStrokeColor, textStrokeWidth, styleToUse->colorSpace());
+        if (combinedText)
+            context->concatCTM(rotation(boxRect, Clockwise));
         paintDecoration(context, boxOrigin, textDecorations, styleToUse->textDecorationStyle(), textShadow);
+        if (combinedText)
+            context->concatCTM(rotation(boxRect, Counterclockwise));
     }