diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderInline.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderInline.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Source/WebCore/rendering/RenderInline.cpp b/Source/WebCore/rendering/RenderInline.cpp index 234d63c..3a27307 100644 --- a/Source/WebCore/rendering/RenderInline.cpp +++ b/Source/WebCore/rendering/RenderInline.cpp @@ -201,8 +201,7 @@ void RenderInline::addChildIgnoringContinuation(RenderObject* newChild, RenderOb // inline into continuations. This involves creating an anonymous block box to hold // |newChild|. We then make that block box a continuation of this inline. We take all of // the children after |beforeChild| and put them in a clone of this object. - RefPtr<RenderStyle> newStyle = RenderStyle::create(); - newStyle->inheritFrom(style()); + RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(style()); newStyle->setDisplay(BLOCK); RenderBlock* newBox = new (renderArena()) RenderBlock(document() /* anonymous box */); @@ -485,29 +484,21 @@ static int computeMargin(const RenderInline* renderer, const Length& margin) int RenderInline::marginLeft() const { - if (!style()->isHorizontalWritingMode()) - return 0; return computeMargin(this, style()->marginLeft()); } int RenderInline::marginRight() const { - if (!style()->isHorizontalWritingMode()) - return 0; return computeMargin(this, style()->marginRight()); } int RenderInline::marginTop() const { - if (style()->isHorizontalWritingMode()) - return 0; return computeMargin(this, style()->marginTop()); } int RenderInline::marginBottom() const { - if (style()->isHorizontalWritingMode()) - return 0; return computeMargin(this, style()->marginBottom()); } @@ -521,6 +512,16 @@ int RenderInline::marginEnd() const return computeMargin(this, style()->marginEnd()); } +int RenderInline::marginBefore() const +{ + return computeMargin(this, style()->marginBefore()); +} + +int RenderInline::marginAfter() const +{ + return computeMargin(this, style()->marginAfter()); +} + const char* RenderInline::renderName() const { if (isRelPositioned()) |