[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 08:38:55 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 17d066226c6ef2c17590c3215f5cfb58c9719edb
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon May 10 23:42:12 2004 +0000
Back out the optimization since it will break the ibench cheat.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index f2f4007..1547ea7 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1354,10 +1354,13 @@ void DocumentImpl::setParsing(bool b)
{
if (m_bParsing != b) {
m_bParsing = b;
+#if 0
+ // Remove optimization until we figure out a way to avoid breaking our ibench cheat.
if (!b && haveStylesheetsLoaded() &&
(!ownerElement() || (ownerElement()->renderer() && !ownerElement()->renderer()->needsLayout())) &&
renderer() && renderer()->needsLayout())
updateLayout();
+#endif
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list