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 19 matching lines...) Expand all Loading... |
30 #include "core/css/CSSSegmentedFontFace.h" | 30 #include "core/css/CSSSegmentedFontFace.h" |
31 #include "core/css/FontFaceSet.h" | 31 #include "core/css/FontFaceSet.h" |
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(RawPtr<CSSFontFaceSource> source) | 40 void CSSFontFace::addSource(CSSFontFaceSource* source) |
41 { | 41 { |
42 source->setFontFace(this); | 42 source->setFontFace(this); |
43 m_sources.append(source); | 43 m_sources.append(source); |
44 } | 44 } |
45 | 45 |
46 void CSSFontFace::setSegmentedFontFace(CSSSegmentedFontFace* segmentedFontFace) | 46 void CSSFontFace::setSegmentedFontFace(CSSSegmentedFontFace* segmentedFontFace) |
47 { | 47 { |
48 ASSERT(!m_segmentedFontFace); | 48 ASSERT(!m_segmentedFontFace); |
49 m_segmentedFontFace = segmentedFontFace; | 49 m_segmentedFontFace = segmentedFontFace; |
50 } | 50 } |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 } | 196 } |
197 | 197 |
198 DEFINE_TRACE(CSSFontFace) | 198 DEFINE_TRACE(CSSFontFace) |
199 { | 199 { |
200 visitor->trace(m_segmentedFontFace); | 200 visitor->trace(m_segmentedFontFace); |
201 visitor->trace(m_sources); | 201 visitor->trace(m_sources); |
202 visitor->trace(m_fontFace); | 202 visitor->trace(m_fontFace); |
203 } | 203 } |
204 | 204 |
205 } // namespace blink | 205 } // namespace blink |
OLD | NEW |