| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2011 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "core/css/RemoteFontFaceSource.h" | 32 #include "core/css/RemoteFontFaceSource.h" |
| 33 #include "core/frame/UseCounter.h" | 33 #include "core/frame/UseCounter.h" |
| 34 #include "platform/fonts/FontDescription.h" | 34 #include "platform/fonts/FontDescription.h" |
| 35 #include "platform/fonts/SimpleFontData.h" | 35 #include "platform/fonts/SimpleFontData.h" |
| 36 #include <algorithm> | 36 #include <algorithm> |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 void CSSFontFace::addSource(CSSFontFaceSource* source) { | 40 void CSSFontFace::addSource(CSSFontFaceSource* source) { |
| 41 source->setFontFace(this); | 41 source->setFontFace(this); |
| 42 m_sources.append(source); | 42 m_sources.push_back(source); |
| 43 } | 43 } |
| 44 | 44 |
| 45 void CSSFontFace::setSegmentedFontFace( | 45 void CSSFontFace::setSegmentedFontFace( |
| 46 CSSSegmentedFontFace* segmentedFontFace) { | 46 CSSSegmentedFontFace* segmentedFontFace) { |
| 47 ASSERT(!m_segmentedFontFace); | 47 ASSERT(!m_segmentedFontFace); |
| 48 m_segmentedFontFace = segmentedFontFace; | 48 m_segmentedFontFace = segmentedFontFace; |
| 49 } | 49 } |
| 50 | 50 |
| 51 void CSSFontFace::didBeginLoad() { | 51 void CSSFontFace::didBeginLoad() { |
| 52 if (loadStatus() == FontFace::Unloaded) | 52 if (loadStatus() == FontFace::Unloaded) |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 FontFaceSet::from(*document)->beginFontLoading(m_fontFace); | 188 FontFaceSet::from(*document)->beginFontLoading(m_fontFace); |
| 189 } | 189 } |
| 190 | 190 |
| 191 DEFINE_TRACE(CSSFontFace) { | 191 DEFINE_TRACE(CSSFontFace) { |
| 192 visitor->trace(m_segmentedFontFace); | 192 visitor->trace(m_segmentedFontFace); |
| 193 visitor->trace(m_sources); | 193 visitor->trace(m_sources); |
| 194 visitor->trace(m_fontFace); | 194 visitor->trace(m_fontFace); |
| 195 } | 195 } |
| 196 | 196 |
| 197 } // namespace blink | 197 } // namespace blink |
| OLD | NEW |