[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 13:25:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 22ce6df39192356a88aa967304988e354407dcdf
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 15 00:36:39 2010 +0000
2010-09-14 Adam Barth <abarth at webkit.org>
Attempted Chromium build fix. The compiler can't tell that
ASSERT_NOT_REACHED is not reached and so it demands an initialization
of this variable.
* html/HTMLFontElement.cpp:
(WebCore::HTMLFontElement::parseMappedAttribute):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67520 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index be591f0..fc48901 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-14 Adam Barth <abarth at webkit.org>
+
+ Attempted Chromium build fix. The compiler can't tell that
+ ASSERT_NOT_REACHED is not reached and so it demands an initialization
+ of this variable.
+
+ * html/HTMLFontElement.cpp:
+ (WebCore::HTMLFontElement::parseMappedAttribute):
+
2010-09-14 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Ariya Hidayat.
diff --git a/WebCore/html/HTMLFontElement.cpp b/WebCore/html/HTMLFontElement.cpp
index f0993dd..5239834 100644
--- a/WebCore/html/HTMLFontElement.cpp
+++ b/WebCore/html/HTMLFontElement.cpp
@@ -171,7 +171,7 @@ bool HTMLFontElement::cssValueFromFontSizeNumber(const String& s, int& size)
void HTMLFontElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == sizeAttr) {
- int size;
+ int size = 0;
if (cssValueFromFontSizeNumber(attr->value(), size))
addCSSProperty(attr, CSSPropertyFontSize, size);
} else if (attr->name() == colorAttr) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list