Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1027)

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 342883004: Using Enum in place of bool for better code readability (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Comment fixes Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 if (!style) 1191 if (!style)
1192 return nullptr; 1192 return nullptr;
1193 1193
1194 if (int keywordSize = style->fontDescription().keywordSize()) 1194 if (int keywordSize = style->fontDescription().keywordSize())
1195 return cssValuePool().createIdentifierValue(cssIdentifierForFontSizeKeyw ord(keywordSize)); 1195 return cssValuePool().createIdentifierValue(cssIdentifierForFontSizeKeyw ord(keywordSize));
1196 1196
1197 1197
1198 return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), *style); 1198 return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), *style);
1199 } 1199 }
1200 1200
1201 bool CSSComputedStyleDeclaration::useFixedFontDefaultSize() const 1201 FixedPitchFontType CSSComputedStyleDeclaration::fixedPitchFont() const
Inactive 2014/06/27 12:57:53 nit: fixedPitchFontType()
h.joshi 2014/06/30 14:04:14 Done.
1202 { 1202 {
1203 if (!m_node) 1203 if (!m_node)
1204 return false; 1204 return NonFixedPitchFont;
1205 1205
1206 RefPtr<RenderStyle> style = m_node->computedStyle(m_pseudoElementSpecifier); 1206 RefPtr<RenderStyle> style = m_node->computedStyle(m_pseudoElementSpecifier);
1207 if (!style) 1207 if (!style)
1208 return false; 1208 return NonFixedPitchFont;
1209 1209
1210 return style->fontDescription().useFixedDefaultSize(); 1210 return style->fontDescription().fixedPitchFont();
1211 } 1211 }
1212 1212
1213 PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::valueForShadowData (const ShadowData& shadow, const RenderStyle& style, bool useSpread) const 1213 PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::valueForShadowData (const ShadowData& shadow, const RenderStyle& style, bool useSpread) const
1214 { 1214 {
1215 RefPtrWillBeRawPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(shadow.x(), style); 1215 RefPtrWillBeRawPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(shadow.x(), style);
1216 RefPtrWillBeRawPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(shadow.y(), style); 1216 RefPtrWillBeRawPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(shadow.y(), style);
1217 RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(shadow.b lur(), style); 1217 RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(shadow.b lur(), style);
1218 RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = useSpread ? zoomAdjustedPixel Value(shadow.spread(), style) : PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullpt r); 1218 RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = useSpread ? zoomAdjustedPixel Value(shadow.spread(), style) : PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullpt r);
1219 RefPtrWillBeRawPtr<CSSPrimitiveValue> shadowStyle = shadow.style() == Normal ? PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullptr) : cssValuePool().createIde ntifierValue(CSSValueInset); 1219 RefPtrWillBeRawPtr<CSSPrimitiveValue> shadowStyle = shadow.style() == Normal ? PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullptr) : cssValuePool().createIde ntifierValue(CSSValueInset);
1220 RefPtrWillBeRawPtr<CSSPrimitiveValue> color = currentColorOrValidColor(style , shadow.color()); 1220 RefPtrWillBeRawPtr<CSSPrimitiveValue> color = currentColorOrValidColor(style , shadow.color());
(...skipping 1839 matching lines...) Expand 10 before | Expand all | Expand 10 after
3060 return list.release(); 3060 return list.release();
3061 } 3061 }
3062 3062
3063 void CSSComputedStyleDeclaration::trace(Visitor* visitor) 3063 void CSSComputedStyleDeclaration::trace(Visitor* visitor)
3064 { 3064 {
3065 visitor->trace(m_node); 3065 visitor->trace(m_node);
3066 CSSStyleDeclaration::trace(visitor); 3066 CSSStyleDeclaration::trace(visitor);
3067 } 3067 }
3068 3068
3069 } // namespace WebCore 3069 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698