Changeset 274532 in webkit

Timestamp:

Mar 16, 2021 4:39:32 PM (16 months ago)

Author:

mmaxfield@apple.com

Message:

<img> isn't able to render RTL text correctly in ALT text
​https://bugs.webkit.org/show_bug.cgi?id=221833
<rdar://problem/74530491>

Reviewed by Zalan Bujtas.

Source/WebCore:

Simply use the text drawing routine that handles bidi.

Test: fast/text/image-alt-text-bidi.html

• rendering/RenderImage.cpp:

(WebCore::RenderImage::paintReplaced):

LayoutTests:

• platform/ios/TestExpectations:
• platform/mac/TestExpectations:
• fast/text/image-alt-text-bidi-2-expected.html: Added.
• fast/text/image-alt-text-bidi-2.html: Added.
• fast/text/image-alt-text-bidi-expected.html: Added.
• fast/text/image-alt-text-bidi.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/image-alt-text-bidi-2-expected.html (added)
• LayoutTests/fast/text/image-alt-text-bidi-2.html (added)
• LayoutTests/fast/text/image-alt-text-bidi-expected.html (added)
• LayoutTests/fast/text/image-alt-text-bidi.html (added)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderImage.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-03-15  Ebrahim Byagowi <ebrahim@gnu.org> and Myles C. Maxfield  <mmaxfield@apple.com>
+
+        <img> isn't able to render RTL text correctly in ALT text
+        https://bugs.webkit.org/show_bug.cgi?id=221833
+        <rdar://problem/74530491>
+
+        Reviewed by Zalan Bujtas.
+
+        * platform/ios/TestExpectations:
+        * platform/mac/TestExpectations:
+        * fast/text/image-alt-text-bidi-2-expected.html: Added.
+        * fast/text/image-alt-text-bidi-2.html: Added.
+        * fast/text/image-alt-text-bidi-expected.html: Added.
+        * fast/text/image-alt-text-bidi.html: Added.
+
 2021-03-16  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -3507 +3507 @@
 # Not all OSes support the same set of emoji.
 fast/text/mending-heart.html [ Failure ] 
+
+webkit.org/b/221833 fast/text/image-alt-text-bidi.html [ ImageOnlyFailure ]

trunk/LayoutTests/platform/mac/TestExpectations

@@ -2322 +2322 @@
 
 webkit.org/b/223144 [ Debug arm64 ] fast/multicol/crash-when-spanner-candidate-is-out-of-flow.html [ Crash ]
+
+webkit.org/b/221833 fast/text/image-alt-text-bidi-2.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-15  Ebrahim Byagowi <ebrahim@gnu.org> and Myles C. Maxfield  <mmaxfield@apple.com>
+
+        <img> isn't able to render RTL text correctly in ALT text
+        https://bugs.webkit.org/show_bug.cgi?id=221833
+        <rdar://problem/74530491>
+
+        Reviewed by Zalan Bujtas.
+
+        Simply use the text drawing routine that handles bidi.
+
+        Test: fast/text/image-alt-text-bidi.html
+
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::paintReplaced):
+
 2021-03-15  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -5 +5 @@
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
- * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2021 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
@@ -538 +538 @@
                 if (errorPictureDrawn) {
                     if (usableSize.width() >= textWidth && fontMetrics.height() <= imageOffset.height())
-                        context.drawText(font, textRun, altTextOffset);
+                        context.drawBidiText(font, textRun, altTextOffset);
                 } else if (usableSize.width() >= textWidth && usableSize.height() >= fontMetrics.height())
-                    context.drawText(font, textRun, altTextOffset);
+                    context.drawBidiText(font, textRun, altTextOffset);
             }
         }