Title: [240846] trunk
- Revision
- 240846
- Author
- [email protected]
- Date
- 2019-02-01 06:33:15 -0800 (Fri, 01 Feb 2019)
Log Message
ComplexText: Test fast/text/word-space-nbsp.html fails when using complex text path
https://bugs.webkit.org/show_bug.cgi?id=193279
Reviewed by Michael Catanzaro.
Source/WebCore:
The fix applied in r135884 to WidthIterator should also be applied to ComplexTextController.
* platform/graphics/ComplexTextController.cpp:
(WebCore::ComplexTextController::adjustGlyphsAndAdvances):
LayoutTests:
Remove test expectation.
* platform/gtk/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (240845 => 240846)
--- trunk/LayoutTests/ChangeLog 2019-02-01 14:31:04 UTC (rev 240845)
+++ trunk/LayoutTests/ChangeLog 2019-02-01 14:33:15 UTC (rev 240846)
@@ -1,5 +1,16 @@
2019-02-01 Carlos Garcia Campos <[email protected]>
+ ComplexText: Test fast/text/word-space-nbsp.html fails when using complex text path
+ https://bugs.webkit.org/show_bug.cgi?id=193279
+
+ Reviewed by Michael Catanzaro.
+
+ Remove test expectation.
+
+ * platform/gtk/TestExpectations:
+
+2019-02-01 Carlos Garcia Campos <[email protected]>
+
Unreviewed WPE gardening. Remove duplicated expectations.
Remove the platform specific expectations that match the generic ones.
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (240845 => 240846)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2019-02-01 14:31:04 UTC (rev 240845)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2019-02-01 14:33:15 UTC (rev 240846)
@@ -3681,7 +3681,6 @@
webkit.org/b/193628 fast/css/content-counter-010.htm [ ImageOnlyFailure ]
webkit.org/b/193628 fast/text/kerning-with-TextLayout.html [ ImageOnlyFailure ]
-webkit.org/b/193628 fast/text/word-space-nbsp.html [ ImageOnlyFailure ]
webkit.org/b/193628 imported/blink/fast/text/international/text-shaping-arabic.html [ ImageOnlyFailure ]
webkit.org/b/193628 imported/blink/fast/text/wide-preformatted.html [ ImageOnlyFailure ]
webkit.org/b/193628 imported/blink/fast/text/word-spacing-nbsp.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (240845 => 240846)
--- trunk/Source/WebCore/ChangeLog 2019-02-01 14:31:04 UTC (rev 240845)
+++ trunk/Source/WebCore/ChangeLog 2019-02-01 14:33:15 UTC (rev 240846)
@@ -1,3 +1,15 @@
+2019-02-01 Carlos Garcia Campos <[email protected]>
+
+ ComplexText: Test fast/text/word-space-nbsp.html fails when using complex text path
+ https://bugs.webkit.org/show_bug.cgi?id=193279
+
+ Reviewed by Michael Catanzaro.
+
+ The fix applied in r135884 to WidthIterator should also be applied to ComplexTextController.
+
+ * platform/graphics/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
+
2019-02-01 Zalan Bujtas <[email protected]>
[LFC] Adjust replaced element's intrinsic ratio
Modified: trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp (240845 => 240846)
--- trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2019-02-01 14:31:04 UTC (rev 240845)
+++ trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2019-02-01 14:33:15 UTC (rev 240846)
@@ -810,7 +810,7 @@
afterExpansion = false;
// Account for word-spacing.
- if (treatAsSpace && (ch != '\t' || !m_run.allowTabs()) && (characterIndex > 0 || runIndex > 0) && m_font.wordSpacing())
+ if (treatAsSpace && (ch != '\t' || !m_run.allowTabs()) && (characterIndex > 0 || runIndex > 0 || ch == noBreakSpace) && m_font.wordSpacing())
advance.expand(m_font.wordSpacing(), 0);
} else
afterExpansion = false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
