diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/rendering/RenderRubyRun.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/rendering/RenderRubyRun.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderRubyRun.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderRubyRun.cpp b/Source/WebCore/rendering/RenderRubyRun.cpp index 016c2a1..3504ccf 100644 --- a/Source/WebCore/rendering/RenderRubyRun.cpp +++ b/Source/WebCore/rendering/RenderRubyRun.cpp @@ -194,8 +194,7 @@ void RenderRubyRun::removeChild(RenderObject* child) RenderRubyBase* RenderRubyRun::createRubyBase() const { RenderRubyBase* rb = new (renderArena()) RenderRubyBase(document() /* anonymous */); - RefPtr<RenderStyle> newStyle = RenderStyle::create(); - newStyle->inheritFrom(style()); + RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(style()); newStyle->setDisplay(BLOCK); newStyle->setTextAlign(CENTER); // FIXME: use WEBKIT_CENTER? rb->setStyle(newStyle.release()); @@ -206,8 +205,7 @@ RenderRubyRun* RenderRubyRun::staticCreateRubyRun(const RenderObject* parentRuby { ASSERT(parentRuby && parentRuby->isRuby()); RenderRubyRun* rr = new (parentRuby->renderArena()) RenderRubyRun(parentRuby->document() /* anonymous */); - RefPtr<RenderStyle> newStyle = RenderStyle::create(); - newStyle->inheritFrom(parentRuby->style()); + RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(parentRuby->style()); newStyle->setDisplay(INLINE_BLOCK); rr->setStyle(newStyle.release()); return rr; |