Title: [236140] releases/WebKitGTK/webkit-2.22/Source/WebCore
- Revision
- 236140
- Author
- [email protected]
- Date
- 2018-09-18 08:59:24 -0700 (Tue, 18 Sep 2018)
Log Message
Merge r235621 - Attempt to fix failing tests following r235615 (https://bugs.webkit.org/show_bug.cgi?id=187925)
An inline text box that does not have combined text and contains a single character
should be considered as having text content.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::hasTextContent const):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236139 => 236140)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-18 15:59:18 UTC (rev 236139)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-18 15:59:24 UTC (rev 236140)
@@ -1,5 +1,15 @@
2018-09-04 Daniel Bates <[email protected]>
+ Attempt to fix failing tests following r235615 (https://bugs.webkit.org/show_bug.cgi?id=187925)
+
+ An inline text box that does not have combined text and contains a single character
+ should be considered as having text content.
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::hasTextContent const):
+
+2018-09-04 Daniel Bates <[email protected]>
+
Remove redundant inline text boxes for empty combined text
https://bugs.webkit.org/show_bug.cgi?id=189119
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/InlineTextBox.cpp (236139 => 236140)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/InlineTextBox.cpp 2018-09-18 15:59:18 UTC (rev 236139)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/InlineTextBox.cpp 2018-09-18 15:59:24 UTC (rev 236140)
@@ -84,7 +84,7 @@
ASSERT(m_len == 1);
return !combinedText->combinedStringForRendering().isEmpty();
}
- return false;
+ return m_len;
}
void InlineTextBox::markDirty(bool dirty)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
