| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
| 9 * Copyright (C) 2012 Intel Corporation. All rights reserved. | 9 * Copyright (C) 2012 Intel Corporation. All rights reserved. |
| 10 * | 10 * |
| (...skipping 4438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4449 FontStyle fontStyle = FontStyleNormal; | 4449 FontStyle fontStyle = FontStyleNormal; |
| 4450 FontWeight fontWeight = FontWeightNormal; | 4450 FontWeight fontWeight = FontWeightNormal; |
| 4451 float fontSize = 0; | 4451 float fontSize = 0; |
| 4452 AtomicString fontFamily; | 4452 AtomicString fontFamily; |
| 4453 RenderTheme::theme().systemFont(systemFontID, fontStyle, fontWeight, fontSiz
e, fontFamily); | 4453 RenderTheme::theme().systemFont(systemFontID, fontStyle, fontWeight, fontSiz
e, fontFamily); |
| 4454 | 4454 |
| 4455 ShorthandScope scope(this, CSSPropertyFont); | 4455 ShorthandScope scope(this, CSSPropertyFont); |
| 4456 addProperty(CSSPropertyFontStyle, cssValuePool().createIdentifierValue(fontS
tyle == FontStyleItalic ? CSSValueItalic : CSSValueNormal), important); | 4456 addProperty(CSSPropertyFontStyle, cssValuePool().createIdentifierValue(fontS
tyle == FontStyleItalic ? CSSValueItalic : CSSValueNormal), important); |
| 4457 addProperty(CSSPropertyFontWeight, cssValuePool().createValue(fontWeight), i
mportant); | 4457 addProperty(CSSPropertyFontWeight, cssValuePool().createValue(fontWeight), i
mportant); |
| 4458 addProperty(CSSPropertyFontSize, cssValuePool().createValue(fontSize, CSSPri
mitiveValue::CSS_PX), important); | 4458 addProperty(CSSPropertyFontSize, cssValuePool().createValue(fontSize, CSSPri
mitiveValue::CSS_PX), important); |
| 4459 RefPtr<CSSValueList> fontFamilyList = CSSValueList::createCommaSeparated(); | 4459 RefPtrWillBeRawPtr<CSSValueList> fontFamilyList = CSSValueList::createCommaS
eparated(); |
| 4460 fontFamilyList->append(cssValuePool().createFontFamilyValue(fontFamily)); | 4460 fontFamilyList->append(cssValuePool().createFontFamilyValue(fontFamily)); |
| 4461 addProperty(CSSPropertyFontFamily, fontFamilyList.release(), important); | 4461 addProperty(CSSPropertyFontFamily, fontFamilyList.release(), important); |
| 4462 addProperty(CSSPropertyFontVariant, cssValuePool().createIdentifierValue(CSS
ValueNormal), important); | 4462 addProperty(CSSPropertyFontVariant, cssValuePool().createIdentifierValue(CSS
ValueNormal), important); |
| 4463 addProperty(CSSPropertyLineHeight, cssValuePool().createIdentifierValue(CSSV
alueNormal), important); | 4463 addProperty(CSSPropertyLineHeight, cssValuePool().createIdentifierValue(CSSV
alueNormal), important); |
| 4464 } | 4464 } |
| 4465 | 4465 |
| 4466 class FontFamilyValueBuilder { | 4466 class FontFamilyValueBuilder { |
| 4467 DISALLOW_ALLOCATION(); | 4467 DISALLOW_ALLOCATION(); |
| 4468 public: | 4468 public: |
| 4469 FontFamilyValueBuilder(CSSValueList* list) | 4469 FontFamilyValueBuilder(CSSValueList* list) |
| (...skipping 3891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8361 return nullptr; | 8361 return nullptr; |
| 8362 a = args->next(); | 8362 a = args->next(); |
| 8363 | 8363 |
| 8364 argNumber++; | 8364 argNumber++; |
| 8365 } | 8365 } |
| 8366 | 8366 |
| 8367 return transformValue.release(); | 8367 return transformValue.release(); |
| 8368 } | 8368 } |
| 8369 | 8369 |
| 8370 } // namespace blink | 8370 } // namespace blink |
| OLD | NEW |