summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-27 14:06:09 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-27 14:06:09 -0400
commit64d1f380c954e4c93433fae705c6f27607f1d922 (patch)
tree7343363375db5875966e74905958fd767f2fac2b
parentc7d9090583638605a2c8a779642ad09d1a228520 (diff)
parentb24a54e5434df24b5965cd9067b6e147871f192a (diff)
downloadexternal_webkit-64d1f380c954e4c93433fae705c6f27607f1d922.zip
external_webkit-64d1f380c954e4c93433fae705c6f27607f1d922.tar.gz
external_webkit-64d1f380c954e4c93433fae705c6f27607f1d922.tar.bz2
Merge change Ib24a54e5 into eclair-mr2
* changes: Remove bad assert.
-rw-r--r--WebCore/rendering/RenderPartObject.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderPartObject.cpp b/WebCore/rendering/RenderPartObject.cpp
index 3867581..f864c00 100644
--- a/WebCore/rendering/RenderPartObject.cpp
+++ b/WebCore/rendering/RenderPartObject.cpp
@@ -386,9 +386,6 @@ void RenderPartObject::layout()
ASSERT(!c->needsLayout());
c = c->nextInPreOrder();
}
- Node* body = document()->body();
- if (body)
- ASSERT(!body->renderer()->needsLayout());
#endif
}
}