Title: [131773] branches/chromium/1271
- Revision
- 131773
- Author
- infe...@chromium.org
- Date
- 2012-10-18 10:31:07 -0700 (Thu, 18 Oct 2012)
Log Message
Merge 131077 - <rdar://problem/12477191> Combined text reverts to full-width font after a style change
BUG=150067
Review URL: https://codereview.chromium.org/11190053
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1271/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 => 131773)
--- branches/chromium/1271/LayoutTests/fast/text/text-combine-width-after-style-change-expected.html (rev 0)
+++ branches/chromium/1271/LayoutTests/fast/text/text-combine-width-after-style-change-expected.html 2012-10-18 17:31:07 UTC (rev 131773)
@@ -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/chromium/1271/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 => 131773)
--- branches/chromium/1271/LayoutTests/fast/text/text-combine-width-after-style-change.html (rev 0)
+++ branches/chromium/1271/LayoutTests/fast/text/text-combine-width-after-style-change.html 2012-10-18 17:31:07 UTC (rev 131773)
@@ -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/chromium/1271/Source/WebCore/rendering/RenderCombineText.cpp (131772 => 131773)
--- branches/chromium/1271/Source/WebCore/rendering/RenderCombineText.cpp 2012-10-18 17:21:26 UTC (rev 131772)
+++ branches/chromium/1271/Source/WebCore/rendering/RenderCombineText.cpp 2012-10-18 17:31:07 UTC (rev 131773)
@@ -41,8 +41,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
