From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 May 2012 14:03:11 +0200 Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot --- Source/WebCore/rendering/RenderObject.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/rendering/RenderObject.cpp') diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp index 13f62f431..8a3094443 100755 --- a/Source/WebCore/rendering/RenderObject.cpp +++ b/Source/WebCore/rendering/RenderObject.cpp @@ -56,6 +56,7 @@ #include "RenderRegion.h" #include "RenderRuby.h" #include "RenderRubyText.h" +#include "RenderScrollbarPart.h" #include "RenderTableCaption.h" #include "RenderTableCell.h" #include "RenderTableCol.h" @@ -189,8 +190,8 @@ RenderObject* RenderObject::createObject(Node* node, RenderStyle* style) case BOX: case INLINE_BOX: return new (arena) RenderDeprecatedFlexibleBox(node); - case FLEXBOX: - case INLINE_FLEXBOX: + case FLEX: + case INLINE_FLEX: return new (arena) RenderFlexibleBox(node); } @@ -698,6 +699,8 @@ void RenderObject::setLayerNeedsFullRepaintForPositionedMovementLayout() RenderBlock* RenderObject::containingBlock() const { RenderObject* o = parent(); + if (!o && isRenderScrollbarPart()) + o = toRenderScrollbarPart(this)->rendererOwningScrollbar(); if (!isText() && m_style->position() == FixedPosition) { while (o && !o->isRenderView() && !(o->hasTransform() && o->isRenderBlock())) o = o->parent(); -- cgit v1.2.1