Title: [191095] branches/safari-601.1.46-branch
- Revision
- 191095
- Author
- matthew_han...@apple.com
- Date
- 2015-10-14 23:46:38 -0700 (Wed, 14 Oct 2015)
Log Message
Merge r190570. rdar://problem/23075838
Modified Paths
Added Paths
Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (191094 => 191095)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-15 06:46:35 UTC (rev 191094)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-15 06:46:38 UTC (rev 191095)
@@ -1,5 +1,23 @@
2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190570. rdar://problem/23075838
+
+ 2015-10-05 Zalan Bujtas <za...@apple.com>
+
+ 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-14 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190339. rdar://problem/23075839
2015-09-29 Jon Honeycutt <jhoneyc...@apple.com>
Added: branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt (0 => 191095)
--- branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt 2015-10-15 06:46:38 UTC (rev 191095)
@@ -0,0 +1 @@
+PASS if no crash or assert in debug
Added: branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically.html (0 => 191095)
--- branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically.html 2015-10-15 06:46:38 UTC (rev 191095)
@@ -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: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191094 => 191095)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-15 06:46:35 UTC (rev 191094)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-15 06:46:38 UTC (rev 191095)
@@ -1,5 +1,27 @@
2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190570. rdar://problem/23075838
+
+ 2015-10-05 Zalan Bujtas <za...@apple.com>
+
+ 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-14 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190382. rdar://problem/22934241
2015-09-30 Dean Jackson <d...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderQuote.cpp (191094 => 191095)
--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderQuote.cpp 2015-10-15 06:46:35 UTC (rev 191094)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderQuote.cpp 2015-10-15 06:46:38 UTC (rev 191095)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
