[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
apavlov at chromium.org
apavlov at chromium.org
Wed Dec 22 15:54:21 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f4a85514879ff9e322810f8721af9cc405cbba48
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 13:06:28 2010 +0000
2010-11-16 Alexander Pavlov <apavlov at chromium.org>
Unreviewed SnowLeopard build fix.
* css/CSSPrimitiveValue.cpp:
(WebCore::unitCategory):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72087 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3fc4fe..74cc629 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-16 Alexander Pavlov <apavlov at chromium.org>
+
+ Unreviewed SnowLeopard build fix.
+
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::unitCategory):
+
2010-11-16 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebCore/css/CSSPrimitiveValue.cpp b/WebCore/css/CSSPrimitiveValue.cpp
index 569b459..6d05fca 100644
--- a/WebCore/css/CSSPrimitiveValue.cpp
+++ b/WebCore/css/CSSPrimitiveValue.cpp
@@ -48,7 +48,7 @@ using namespace WTF;
namespace WebCore {
-CSSPrimitiveValue::UnitCategory unitCategory(CSSPrimitiveValue::UnitTypes type)
+static CSSPrimitiveValue::UnitCategory unitCategory(CSSPrimitiveValue::UnitTypes type)
{
// Here we violate the spec (http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSPrimitiveValue) and allow conversions
// between CSS_PX and relative lengths (see cssPixelsPerInch comment in CSSHelper.h for the topic treatment).
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list