Diff
Modified: trunk/LayoutTests/ChangeLog (222217 => 222218)
--- trunk/LayoutTests/ChangeLog 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/LayoutTests/ChangeLog 2017-09-19 20:09:09 UTC (rev 222218)
@@ -1,3 +1,13 @@
+2017-09-19 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r222217 and r222214.
+ This change introduced two LayoutTest failures.
+ https://bugs.webkit.org/show_bug.cgi?id=177026
+
+ * fast/text/international/dynamic-text-combine-crash-expected.txt: Removed.
+ * fast/text/international/dynamic-text-combine-crash.html: Removed.
+ * fast/text/text-combine-crash-expected.txt:
+
2017-09-19 Zalan Bujtas <[email protected]>
Do not mutate RenderText content during layout.
Deleted: trunk/LayoutTests/fast/text/international/dynamic-text-combine-crash-expected.txt (222217 => 222218)
--- trunk/LayoutTests/fast/text/international/dynamic-text-combine-crash-expected.txt 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/LayoutTests/fast/text/international/dynamic-text-combine-crash-expected.txt 2017-09-19 20:09:09 UTC (rev 222218)
@@ -1,6 +0,0 @@
-Pass if no crash.
-
-
-
-
-
Deleted: trunk/LayoutTests/fast/text/international/dynamic-text-combine-crash.html (222217 => 222218)
--- trunk/LayoutTests/fast/text/international/dynamic-text-combine-crash.html 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/LayoutTests/fast/text/international/dynamic-text-combine-crash.html 2017-09-19 20:09:09 UTC (rev 222218)
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-h3 {
- max-height: 0;
- -webkit-text-combine: horizontal;
- -webkit-writing-mode: vertical-rl;
-}
-</style>
-</head>
-<body><listing>Pass if no crash.<dd contenteditable="true"><h3 id="h">foobar</h3></body>
-<script>
- if (window.testRunner)
- testRunner.dumpAsText();
- window.getSelection().setPosition(h, 1);
- document.execCommand("delete", false);
- document.execCommand("delete", false);
-</script>
-</html>
\ No newline at end of file
Modified: trunk/LayoutTests/fast/text/text-combine-crash-expected.txt (222217 => 222218)
--- trunk/LayoutTests/fast/text/text-combine-crash-expected.txt 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/LayoutTests/fast/text/text-combine-crash-expected.txt 2017-09-19 20:09:09 UTC (rev 222218)
@@ -4,14 +4,14 @@

-
+
Errlog webtest_fn_1: TypeError: undefined is not an object (evaluating 'document.applets[0].addEventListener')
Errlog webtest_fn_2: TypeError: Argument 1 ('node') to Range.setStartBefore must be an instance of Node
Errlog webtest_fn_3: TypeError: undefined is not an object (evaluating 'document.images[2].contentEditable="true"')
Errlog webtest_fn_8: TypeError: null is not an object (evaluating 'lis.length')
-Errlog webtest_fn_9: TypeError: undefined is not an object (evaluating 'document.anchors[4].setAttribute')
+Errlog webtest_fn_9: TypeError: undefined is not an object (evaluating 'document.anchors[4].setAttribute')
Errlog webtest_fn_10: TypeError: Argument 1 ('node') to Range.setStartAfter must be an instance of Node
-Errlog webtest_fn_15: TypeError: Argument 1 ('node') to Range.setStart must be an instance of Node
+Errlog webtest_fn_15: TypeError: Argument 1 ('node') to Range.setStart must be an instance of Node
Errlog webtest_fn_16: TypeError: undefined is not an object (evaluating 'elem.parentNode')
Errlog webtest_fn_18: TypeError: undefined is not an object (evaluating 'document.applets[0].contentEditable="true"')
Errlog webtest_fn_21: TypeError: undefined is not an object (evaluating 'document.anchors[4].appendChild')
Modified: trunk/Source/WebCore/ChangeLog (222217 => 222218)
--- trunk/Source/WebCore/ChangeLog 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/Source/WebCore/ChangeLog 2017-09-19 20:09:09 UTC (rev 222218)
@@ -1,3 +1,24 @@
+2017-09-19 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r222217 and r222214.
+ This change introduced two LayoutTest failures.
+ https://bugs.webkit.org/show_bug.cgi?id=177026
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):
+ * rendering/RenderCombineText.cpp:
+ (WebCore::RenderCombineText::styleDidChange):
+ (WebCore::RenderCombineText::setRenderedText):
+ (WebCore::RenderCombineText::combineText):
+ (WebCore::RenderCombineText::combineTextIfNeeded): Deleted.
+ * rendering/RenderCombineText.h:
+ * rendering/RenderText.cpp:
+ * rendering/RenderText.h:
+ * rendering/line/BreakingContext.h:
+ (WebCore::BreakingContext::handleText):
+ * rendering/line/LineBreaker.cpp:
+ (WebCore::LineBreaker::skipLeadingWhitespace):
+
2017-09-19 Zalan Bujtas <[email protected]>
Attempt to fix Linux build.
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (222217 => 222218)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-09-19 20:09:09 UTC (rev 222218)
@@ -4353,7 +4353,7 @@
RenderText& renderText = downcast<RenderText>(*child);
if (renderText.style().hasTextCombine() && renderText.isCombineText())
- downcast<RenderCombineText>(renderText).combineTextIfNeeded();
+ downcast<RenderCombineText>(renderText).combineText();
// Determine if we have a breakable character. Pass in
// whether or not we should ignore any spaces at the front
Modified: trunk/Source/WebCore/rendering/RenderCombineText.cpp (222217 => 222218)
--- trunk/Source/WebCore/rendering/RenderCombineText.cpp 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/Source/WebCore/rendering/RenderCombineText.cpp 2017-09-19 20:09:09 UTC (rev 222218)
@@ -54,7 +54,6 @@
}
m_needsFontUpdate = true;
- combineTextIfNeeded();
}
void RenderCombineText::setRenderedText(const String& text)
@@ -62,7 +61,6 @@
RenderText::setRenderedText(text);
m_needsFontUpdate = true;
- combineTextIfNeeded();
}
float RenderCombineText::width(unsigned from, unsigned length, const FontCascade& font, float xPosition, HashSet<const Font*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
@@ -97,7 +95,7 @@
return { };
}
-void RenderCombineText::combineTextIfNeeded()
+void RenderCombineText::combineText()
{
if (!m_needsFontUpdate)
return;
@@ -194,7 +192,6 @@
m_combinedTextWidth = combinedTextWidth;
m_combinedTextAscent = glyphOverflow.top;
m_combinedTextDescent = glyphOverflow.bottom;
- m_lineBoxes.dirtyRange(*this, 0, originalText().length(), originalText().length());
}
}
Modified: trunk/Source/WebCore/rendering/RenderCombineText.h (222217 => 222218)
--- trunk/Source/WebCore/rendering/RenderCombineText.h 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/Source/WebCore/rendering/RenderCombineText.h 2017-09-19 20:09:09 UTC (rev 222218)
@@ -32,7 +32,7 @@
Text& textNode() const { return downcast<Text>(nodeForNonAnonymous()); }
- void combineTextIfNeeded();
+ void combineText();
std::optional<FloatPoint> computeTextOrigin(const FloatRect& boxRect) const;
String combinedStringForRendering() const;
bool isCombined() const { return m_isCombined; }
Modified: trunk/Source/WebCore/rendering/RenderText.cpp (222217 => 222218)
--- trunk/Source/WebCore/rendering/RenderText.cpp 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2017-09-19 20:09:09 UTC (rev 222218)
@@ -69,7 +69,6 @@
namespace WebCore {
struct SameSizeAsRenderText : public RenderObject {
- void* pointers[2];
uint32_t bitfields : 16;
#if ENABLE(TEXT_AUTOSIZING)
float candidateTextSize;
@@ -76,6 +75,7 @@
#endif
float widths[4];
String text;
+ void* pointers[2];
};
COMPILE_ASSERT(sizeof(RenderText) == sizeof(SameSizeAsRenderText), RenderText_should_stay_small);
Modified: trunk/Source/WebCore/rendering/RenderText.h (222217 => 222218)
--- trunk/Source/WebCore/rendering/RenderText.h 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/Source/WebCore/rendering/RenderText.h 2017-09-19 20:09:09 UTC (rev 222218)
@@ -186,8 +186,6 @@
virtual void setRenderedText(const String&);
virtual UChar previousCharacter() const;
- RenderTextLineBoxes m_lineBoxes;
-
private:
RenderText(Node&, const String&);
@@ -245,6 +243,8 @@
float m_endMinWidth;
String m_text;
+
+ RenderTextLineBoxes m_lineBoxes;
};
inline UChar RenderText::uncheckedCharacterAt(unsigned i) const
Modified: trunk/Source/WebCore/rendering/line/BreakingContext.h (222217 => 222218)
--- trunk/Source/WebCore/rendering/line/BreakingContext.h 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/Source/WebCore/rendering/line/BreakingContext.h 2017-09-19 20:09:09 UTC (rev 222218)
@@ -755,7 +755,7 @@
if (renderText.style().hasTextCombine() && is<RenderCombineText>(*m_current.renderer())) {
auto& combineRenderer = downcast<RenderCombineText>(*m_current.renderer());
- combineRenderer.combineTextIfNeeded();
+ combineRenderer.combineText();
// The length of the renderer's text may have changed. Increment stale iterator positions
if (iteratorIsBeyondEndOfRenderCombineText(m_lineBreakHistory.current(), combineRenderer)) {
ASSERT(iteratorIsBeyondEndOfRenderCombineText(m_resolver.position(), combineRenderer));
Modified: trunk/Source/WebCore/rendering/line/LineBreaker.cpp (222217 => 222218)
--- trunk/Source/WebCore/rendering/line/LineBreaker.cpp 2017-09-19 19:32:01 UTC (rev 222217)
+++ trunk/Source/WebCore/rendering/line/LineBreaker.cpp 2017-09-19 20:09:09 UTC (rev 222218)
@@ -68,7 +68,7 @@
} else if (object.isFloating())
m_block.positionNewFloatOnLine(*m_block.insertFloatingObject(downcast<RenderBox>(object)), lastFloatFromPreviousLine, lineInfo, width);
else if (object.style().hasTextCombine() && is<RenderCombineText>(object)) {
- downcast<RenderCombineText>(object).combineTextIfNeeded();
+ downcast<RenderCombineText>(object).combineText();
if (downcast<RenderCombineText>(object).isCombined())
continue;
}
