| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 FontFace::FontFace() | 128 FontFace::FontFace() |
| 129 : m_status(Unloaded) | 129 : m_status(Unloaded) |
| 130 { | 130 { |
| 131 ScriptWrappable::init(this); | 131 ScriptWrappable::init(this); |
| 132 } | 132 } |
| 133 | 133 |
| 134 FontFace::FontFace(ExecutionContext* context, const AtomicString& family, const
Dictionary& descriptors) | 134 FontFace::FontFace(ExecutionContext* context, const AtomicString& family, const
Dictionary& descriptors) |
| 135 : m_family(family) | 135 : m_family(family) |
| 136 , m_status(Unloaded) | 136 , m_status(Unloaded) |
| 137 { | 137 { |
| 138 ScriptWrappable::init(this); |
| 139 |
| 138 Document* document = toDocument(context); | 140 Document* document = toDocument(context); |
| 139 String value; | 141 String value; |
| 140 if (DictionaryHelper::get(descriptors, "style", value)) | 142 if (DictionaryHelper::get(descriptors, "style", value)) |
| 141 setPropertyFromString(document, value, CSSPropertyFontStyle); | 143 setPropertyFromString(document, value, CSSPropertyFontStyle); |
| 142 if (DictionaryHelper::get(descriptors, "weight", value)) | 144 if (DictionaryHelper::get(descriptors, "weight", value)) |
| 143 setPropertyFromString(document, value, CSSPropertyFontWeight); | 145 setPropertyFromString(document, value, CSSPropertyFontWeight); |
| 144 if (DictionaryHelper::get(descriptors, "stretch", value)) | 146 if (DictionaryHelper::get(descriptors, "stretch", value)) |
| 145 setPropertyFromString(document, value, CSSPropertyFontStretch); | 147 setPropertyFromString(document, value, CSSPropertyFontStretch); |
| 146 if (DictionaryHelper::get(descriptors, "unicodeRange", value)) | 148 if (DictionaryHelper::get(descriptors, "unicodeRange", value)) |
| 147 setPropertyFromString(document, value, CSSPropertyUnicodeRange); | 149 setPropertyFromString(document, value, CSSPropertyUnicodeRange); |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 visitor->trace(m_cssFontFace); | 590 visitor->trace(m_cssFontFace); |
| 589 visitor->trace(m_callbacks); | 591 visitor->trace(m_callbacks); |
| 590 } | 592 } |
| 591 | 593 |
| 592 bool FontFace::hadBlankText() const | 594 bool FontFace::hadBlankText() const |
| 593 { | 595 { |
| 594 return m_cssFontFace->hadBlankText(); | 596 return m_cssFontFace->hadBlankText(); |
| 595 } | 597 } |
| 596 | 598 |
| 597 } // namespace blink | 599 } // namespace blink |
| OLD | NEW |