| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 4 * Copyright (C) 2013 Google Inc. All rights reserved. | 4 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 scope.fontDescription().setGenericFamily(FontDescription::NoFamily); | 172 scope.fontDescription().setGenericFamily(FontDescription::NoFamily); |
| 173 | 173 |
| 174 for (CSSValueListIterator i = value; i.hasMore(); i.advance()) { | 174 for (CSSValueListIterator i = value; i.hasMore(); i.advance()) { |
| 175 CSSValue* item = i.value(); | 175 CSSValue* item = i.value(); |
| 176 if (!item->isPrimitiveValue()) | 176 if (!item->isPrimitiveValue()) |
| 177 continue; | 177 continue; |
| 178 CSSPrimitiveValue* contentValue = toCSSPrimitiveValue(item); | 178 CSSPrimitiveValue* contentValue = toCSSPrimitiveValue(item); |
| 179 AtomicString face; | 179 AtomicString face; |
| 180 Settings* settings = m_document->settings(); | 180 Settings* settings = m_document->settings(); |
| 181 if (contentValue->isString()) { | 181 if (contentValue->isString()) { |
| 182 face = contentValue->getStringValue(); | 182 face = AtomicString(contentValue->getStringValue()); |
| 183 } else if (settings) { | 183 } else if (settings) { |
| 184 switch (contentValue->getValueID()) { | 184 switch (contentValue->getValueID()) { |
| 185 case CSSValueWebkitBody: | 185 case CSSValueWebkitBody: |
| 186 face = settings->genericFontFamilySettings().standard(); | 186 face = settings->genericFontFamilySettings().standard(); |
| 187 break; | 187 break; |
| 188 case CSSValueSerif: | 188 case CSSValueSerif: |
| 189 face = FontFamilyNames::webkit_serif; | 189 face = FontFamilyNames::webkit_serif; |
| 190 scope.fontDescription().setGenericFamily(FontDescription::SerifF
amily); | 190 scope.fontDescription().setGenericFamily(FontDescription::SerifF
amily); |
| 191 break; | 191 break; |
| 192 case CSSValueSansSerif: | 192 case CSSValueSansSerif: |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 FontOrientation fontOrientation; | 660 FontOrientation fontOrientation; |
| 661 NonCJKGlyphOrientation glyphOrientation; | 661 NonCJKGlyphOrientation glyphOrientation; |
| 662 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; | 662 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; |
| 663 fontDescription.setOrientation(fontOrientation); | 663 fontDescription.setOrientation(fontOrientation); |
| 664 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); | 664 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); |
| 665 documentStyle->setFontDescription(fontDescription); | 665 documentStyle->setFontDescription(fontDescription); |
| 666 documentStyle->font().update(fontSelector); | 666 documentStyle->font().update(fontSelector); |
| 667 } | 667 } |
| 668 | 668 |
| 669 } | 669 } |
| OLD | NEW |