[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
dimich at chromium.org
dimich at chromium.org
Thu Feb 4 21:28:44 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 189172c31adc6daf415afd9cd7593dc71da12755
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 27 02:56:22 2010 +0000
Not reviewed, attempt to fix Tiger build.
* rendering/RenderTreeAsText.cpp:
(WebCore::write): Use UNUSED_PARAM macros to prevent compiler warning on targets without accelerated compositing.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0795370..9d6d665 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-26 Dmitry Titov <dimich at chromium.org>
+
+ Not reviewed, attempt to fix Tiger build.
+
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::write): Use UNUSED_PARAM macros to prevent compiler warning on targets without accelerated compositing.
+
2010-01-26 Roland Steiner <rolandsteiner at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/rendering/RenderTreeAsText.cpp b/WebCore/rendering/RenderTreeAsText.cpp
index ad6b1d3..ca4d9d1 100644
--- a/WebCore/rendering/RenderTreeAsText.cpp
+++ b/WebCore/rendering/RenderTreeAsText.cpp
@@ -45,6 +45,7 @@
#include "RenderWidget.h"
#include "SelectionController.h"
#include "TextStream.h"
+#include <wtf/UnusedParam.h>
#include <wtf/Vector.h>
#if ENABLE(SVG)
@@ -492,6 +493,8 @@ static void write(TextStream& ts, RenderLayer& l,
if (l.isComposited())
ts << " (composited, bounds " << l.backing()->compositedBounds() << ")";
}
+#else
+ UNUSED_PARAM(behavior);
#endif
ts << "\n";
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list