[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
kevino at webkit.org
kevino at webkit.org
Thu Apr 8 01:17:46 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit d2eace4bac5227187cecb0aba74e83971590ee75
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 20 20:21:08 2010 +0000
Build fix for !ENABLE(SVG).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53560 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 35f3f58..fbcc932 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20 Kevin Ollivier <kevino at theolliviers.com>
+
+ Build fix for !ENABLE(SVG).
+
+ * rendering/TrailingFloatsRootInlineBox.h:
+ (WebCore::TrailingFloatsRootInlineBox::TrailingFloatsRootInlineBox):
+
2010-01-20 David Levin <levin at chromium.org>
No review, rolling out r53552.
diff --git a/WebCore/rendering/TrailingFloatsRootInlineBox.h b/WebCore/rendering/TrailingFloatsRootInlineBox.h
index 0cba7fc..68bf637 100644
--- a/WebCore/rendering/TrailingFloatsRootInlineBox.h
+++ b/WebCore/rendering/TrailingFloatsRootInlineBox.h
@@ -34,7 +34,9 @@ class TrailingFloatsRootInlineBox : public RootInlineBox {
public:
TrailingFloatsRootInlineBox(RenderObject* object) : RootInlineBox(object)
{
+#if ENABLE(SVG)
setHasVirtualHeight();
+#endif
}
private:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list