Title: [190957] releases/WebKitGTK/webkit-2.10
- Revision
- 190957
- Author
- [email protected]
- Date
- 2015-10-13 03:49:47 -0700 (Tue, 13 Oct 2015)
Log Message
Merge r190570 - Mark the line dirty when RenderQuote's text changes.
https://bugs.webkit.org/show_bug.cgi?id=149784
rdar://problem/22558169
Reviewed by Antti Koivisto.
When quotation mark changes ( " -> ' or empty string), we
need to mark the line dirty to ensure its content gets laid out properly.
Source/WebCore:
Test: fast/inline/quotation-text-changes-dynamically.html
* rendering/RenderQuote.cpp:
(WebCore::quoteTextRenderer):
(WebCore::RenderQuote::updateText):
(WebCore::fragmentChild): Deleted.
LayoutTests:
* fast/inline/quotation-text-changes-dynamically-expected.txt: Added.
* fast/inline/quotation-text-changes-dynamically.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (190956 => 190957)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-13 10:47:08 UTC (rev 190956)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-13 10:49:47 UTC (rev 190957)
@@ -1,3 +1,17 @@
+2015-10-05 Zalan Bujtas <[email protected]>
+
+ Mark the line dirty when RenderQuote's text changes.
+ https://bugs.webkit.org/show_bug.cgi?id=149784
+ rdar://problem/22558169
+
+ Reviewed by Antti Koivisto.
+
+ When quotation mark changes ( " -> ' or empty string), we
+ need to mark the line dirty to ensure its content gets laid out properly.
+
+ * fast/inline/quotation-text-changes-dynamically-expected.txt: Added.
+ * fast/inline/quotation-text-changes-dynamically.html: Added.
+
2015-10-02 Antoine Quint <[email protected]>
popstate is fired at the wrong time on load
Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt (0 => 190957)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt 2015-10-13 10:49:47 UTC (rev 190957)
@@ -0,0 +1 @@
+PASS if no crash or assert in debug
Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically.html (0 => 190957)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/inline/quotation-text-changes-dynamically.html 2015-10-13 10:49:47 UTC (rev 190957)
@@ -0,0 +1,23 @@
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+
+<style>
+q:before {
+ position: fixed;
+ -webkit-animation-name: name1;
+ -webkit-animation-duration: 1s;
+}
+
+@-webkit-keyframes name1 {
+ from {
+ column-width: 10px;
+ }
+ to {
+ column-width: 20px;
+ }
+}
+</style>
+
+<q>PASS if no crash or assert in debug</q>
\ No newline at end of file
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190956 => 190957)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:47:08 UTC (rev 190956)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:49:47 UTC (rev 190957)
@@ -1,3 +1,21 @@
+2015-10-05 Zalan Bujtas <[email protected]>
+
+ Mark the line dirty when RenderQuote's text changes.
+ https://bugs.webkit.org/show_bug.cgi?id=149784
+ rdar://problem/22558169
+
+ Reviewed by Antti Koivisto.
+
+ When quotation mark changes ( " -> ' or empty string), we
+ need to mark the line dirty to ensure its content gets laid out properly.
+
+ Test: fast/inline/quotation-text-changes-dynamically.html
+
+ * rendering/RenderQuote.cpp:
+ (WebCore::quoteTextRenderer):
+ (WebCore::RenderQuote::updateText):
+ (WebCore::fragmentChild): Deleted.
+
2015-10-05 Zan Dobersek <[email protected]>
GLContext should control ownership of context-related objects
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderQuote.cpp (190956 => 190957)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderQuote.cpp 2015-10-13 10:47:08 UTC (rev 190956)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderQuote.cpp 2015-10-13 10:49:47 UTC (rev 190957)
@@ -330,7 +330,7 @@
return apostropheString;
}
-static RenderTextFragment* fragmentChild(RenderObject* lastChild)
+static RenderTextFragment* quoteTextRenderer(RenderObject* lastChild)
{
if (!lastChild)
return nullptr;
@@ -349,8 +349,9 @@
m_text = text;
// Start from the end of the child list because, if we've had a first-letter
// renderer inserted then the remaining text will be at the end.
- if (auto* fragment = fragmentChild(lastChild())) {
- fragment->setContentString(m_text);
+ if (auto* renderText = quoteTextRenderer(lastChild())) {
+ renderText->setContentString(m_text);
+ renderText->dirtyLineBoxes(false);
return;
}
addChild(new RenderTextFragment(document(), m_text));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
