[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 06:30:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7bf6b4956fb0883c5a18336f5cdf78a5dea7be39
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 8 01:19:15 2002 +0000
Fix build bustage.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index e1cf492..05728f4 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2267,19 +2267,19 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
} else if(primitiveValue->getIdent()) {
// keywords are being used. Pick the correct default
// based off the font family.
- QValueList<int>* fontSizes = (fontDef.genericFamily == FontDef::eMonospace) ?
- &m_fixedFontSizes : &m_fontSizes;
+ QValueList<int>& fontSizes = (fontDef.genericFamily == FontDef::eMonospace) ?
+ m_fixedFontSizes : m_fontSizes;
switch(primitiveValue->getIdent())
{
- case CSS_VAL_XX_SMALL: size = m_fontSizes[0]; break;
- case CSS_VAL_X_SMALL: size = m_fontSizes[1]; break;
- case CSS_VAL_SMALL: size = m_fontSizes[2]; break;
- case CSS_VAL_MEDIUM: size = m_fontSizes[3]; break;
- case CSS_VAL_LARGE: size = m_fontSizes[4]; break;
- case CSS_VAL_X_LARGE: size = m_fontSizes[5]; break;
- case CSS_VAL_XX_LARGE: size = m_fontSizes[6]; break;
- case CSS_VAL__KONQ_XXX_LARGE: size = ( m_fontSizes[6]*5 )/3; break;
+ case CSS_VAL_XX_SMALL: size = fontSizes[0]; break;
+ case CSS_VAL_X_SMALL: size = fontSizes[1]; break;
+ case CSS_VAL_SMALL: size = fontSizes[2]; break;
+ case CSS_VAL_MEDIUM: size = fontSizes[3]; break;
+ case CSS_VAL_LARGE: size = fontSizes[4]; break;
+ case CSS_VAL_X_LARGE: size = fontSizes[5]; break;
+ case CSS_VAL_XX_LARGE: size = fontSizes[6]; break;
+ case CSS_VAL__KONQ_XXX_LARGE: size = ( fontSizes[6]*5 )/3; break;
case CSS_VAL_LARGER:
// ### use the next bigger standardSize!!!
size = oldSize * 1.2;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list