[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:24:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit def5007bdbf9173883e825c8be2552e76f1d7c51
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 7 18:16:31 2003 +0000
*** empty log message ***
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3596 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index aecc4eb..76bc211 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1000,8 +1000,16 @@ RenderObject *RenderObject::container() const
{
EPosition pos = m_style->position();
RenderObject *o = 0;
- if( pos == FIXED )
- o = root();
+ if( pos == FIXED ) {
+ // container() can be called on an object that is not in the
+ // tree yet. We don't call root() since it will assert if it
+ // can't get back to the root. Instead we just walk as high up
+ // as we can. If we're in the tree, we'll get the root. If we
+ // aren't we'll get the root of our little subtree (most likely
+ // we'll just return 0).
+ o = parent();
+ while ( o && o->parent() ) o = o->parent();
+ }
else if ( pos == ABSOLUTE )
o = containingBlock();
else
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list