Title: [134285] branches/safari-536.28-branch
- Revision
- 134285
- Author
- [email protected]
- Date
- 2012-11-12 12:41:30 -0800 (Mon, 12 Nov 2012)
Log Message
Merged r131077. <rdar://problem/12589197>
Modified Paths
Added Paths
Diff
Modified: branches/safari-536.28-branch/LayoutTests/ChangeLog (134284 => 134285)
--- branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-11-12 20:38:10 UTC (rev 134284)
+++ branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-11-12 20:41:30 UTC (rev 134285)
@@ -1,5 +1,19 @@
2012-11-12 Lucas Forschler <[email protected]>
+ Merge r131077
+
+ 2012-10-11 Dan Bernstein <[email protected]>
+
+ <rdar://problem/12477191> Combined text reverts to full-width font after a style change
+ https://bugs.webkit.org/show_bug.cgi?id=99009
+
+ Reviewed by John Sullivan.
+
+ * fast/text/text-combine-width-after-style-change-expected.html: Added.
+ * fast/text/text-combine-width-after-style-change.html: Added.
+
+2012-11-12 Lucas Forschler <[email protected]>
+
Merge r129796
2012-09-27 Philip Rogers <[email protected]>
@@ -11342,3 +11356,4 @@
.
.
.
+.
Copied: branches/safari-536.28-branch/LayoutTests/fast/text/text-combine-width-after-style-change-expected.html (from rev 131077, trunk/LayoutTests/fast/text/text-combine-width-after-style-change-expected.html) (0 => 134285)
--- branches/safari-536.28-branch/LayoutTests/fast/text/text-combine-width-after-style-change-expected.html (rev 0)
+++ branches/safari-536.28-branch/LayoutTests/fast/text/text-combine-width-after-style-change-expected.html 2012-11-12 20:41:30 UTC (rev 134285)
@@ -0,0 +1,8 @@
+<div style="
+ height: 200px;
+ -webkit-writing-mode: vertical-lr;
+ font-family: HiraMinProN-W3;
+ font-size: 36px;
+">
+ <span id="target" style="-webkit-text-combine: horizontal;">1234</span>
+</div>
Copied: branches/safari-536.28-branch/LayoutTests/fast/text/text-combine-width-after-style-change.html (from rev 131077, trunk/LayoutTests/fast/text/text-combine-width-after-style-change.html) (0 => 134285)
--- branches/safari-536.28-branch/LayoutTests/fast/text/text-combine-width-after-style-change.html (rev 0)
+++ branches/safari-536.28-branch/LayoutTests/fast/text/text-combine-width-after-style-change.html 2012-11-12 20:41:30 UTC (rev 134285)
@@ -0,0 +1,12 @@
+<div style="
+ height: 200px;
+ -webkit-writing-mode: vertical-lr;
+ font-family: HiraMinProN-W3;
+ font-size: 36px;
+">
+ <span id="target" style="-webkit-text-combine: horizontal;">1234</span>
+</div>
+<script>
+ document.body.offsetTop;
+ document.getElementById("target").style.marginBottom = "5px";
+</script>
Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (134284 => 134285)
--- branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-12 20:38:10 UTC (rev 134284)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-12 20:41:30 UTC (rev 134285)
@@ -1,5 +1,22 @@
2012-11-12 Lucas Forschler <[email protected]>
+ Merge r131077
+
+ 2012-10-11 Dan Bernstein <[email protected]>
+
+ <rdar://problem/12477191> Combined text reverts to full-width font after a style change
+ https://bugs.webkit.org/show_bug.cgi?id=99009
+
+ Reviewed by John Sullivan.
+
+ Test: fast/text/text-combine-width-after-style-change.html
+
+ * rendering/RenderCombineText.cpp:
+ (WebCore::RenderCombineText::styleDidChange): Changed to reset m_isCombined to false, to
+ ensure that combineText() is called on the next layout.
+
+2012-11-12 Lucas Forschler <[email protected]>
+
Merge r131018
2012-10-10 Jer Noble <[email protected]>
@@ -207353,3 +207370,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebCore/rendering/RenderCombineText.cpp (134284 => 134285)
--- branches/safari-536.28-branch/Source/WebCore/rendering/RenderCombineText.cpp 2012-11-12 20:38:10 UTC (rev 134284)
+++ branches/safari-536.28-branch/Source/WebCore/rendering/RenderCombineText.cpp 2012-11-12 20:41:30 UTC (rev 134285)
@@ -40,8 +40,10 @@
setStyleInternal(RenderStyle::clone(style()));
RenderText::styleDidChange(diff, oldStyle);
- if (m_isCombined)
+ if (m_isCombined) {
RenderText::setTextInternal(originalText()); // This RenderCombineText has been combined once. Restore the original text for the next combineText().
+ m_isCombined = false;
+ }
m_needsFontUpdate = true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
