diff options
| author | Victoria Lease <violets@google.com> | 2012-05-17 08:46:36 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2012-05-18 09:46:38 -0700 |
| commit | 05c44efdceb09e0a5066c1f2ae06a5f19fd7fc6c (patch) | |
| tree | 8395d57a2e783b3de40fe03f26badad289e3eb45 /Source/WebCore/rendering/RenderRuby.cpp | |
| parent | 7b17ee7dc951f404d93a458a61884d5c1bf6e40f (diff) | |
| download | external_webkit-05c44efdceb09e0a5066c1f2ae06a5f19fd7fc6c.zip external_webkit-05c44efdceb09e0a5066c1f2ae06a5f19fd7fc6c.tar.gz external_webkit-05c44efdceb09e0a5066c1f2ae06a5f19fd7fc6c.tar.bz2 | |
Cherrypick WebKit r94543.
http://trac.webkit.org/changeset/94543
isBeforeOrAfterContent() was already pulled in from r94543 as a part
of I02da7a9f891a6eec394398529f64b0992cbfce70, but we needed the rest
of the patch to address our ruby text alignment issues.
Bug: 6105670
Change-Id: Iad4d6308ab053488abd118eee83058cfc81e22e8
Diffstat (limited to 'Source/WebCore/rendering/RenderRuby.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderRuby.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderRuby.cpp b/Source/WebCore/rendering/RenderRuby.cpp index e0137de..41604d6 100644 --- a/Source/WebCore/rendering/RenderRuby.cpp +++ b/Source/WebCore/rendering/RenderRuby.cpp @@ -119,6 +119,12 @@ RenderRubyAsInline::~RenderRubyAsInline() { } +void RenderRubyAsInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) +{ + RenderInline::styleDidChange(diff, oldStyle); + propagateStyleToAnonymousChildren(); +} + void RenderRubyAsInline::addChild(RenderObject* child, RenderObject* beforeChild) { // Insert :before and :after content before/after the RenderRubyRun(s) @@ -220,6 +226,12 @@ RenderRubyAsBlock::~RenderRubyAsBlock() { } +void RenderRubyAsBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) +{ + RenderBlock::styleDidChange(diff, oldStyle); + propagateStyleToAnonymousChildren(); +} + void RenderRubyAsBlock::addChild(RenderObject* child, RenderObject* beforeChild) { // Insert :before and :after content before/after the RenderRubyRun(s) |