Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: third_party/WebKit/Source/core/css/CSSFontFace.cpp

Issue 2700123003: DO NOT COMMIT: Results of running old (current) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "core/css/CSSFontFace.h" 26 #include "core/css/CSSFontFace.h"
27 27
28 #include <algorithm>
28 #include "core/css/CSSFontFaceSource.h" 29 #include "core/css/CSSFontFaceSource.h"
29 #include "core/css/CSSFontSelector.h" 30 #include "core/css/CSSFontSelector.h"
30 #include "core/css/CSSSegmentedFontFace.h" 31 #include "core/css/CSSSegmentedFontFace.h"
31 #include "core/css/FontFaceSet.h" 32 #include "core/css/FontFaceSet.h"
32 #include "core/css/RemoteFontFaceSource.h" 33 #include "core/css/RemoteFontFaceSource.h"
33 #include "core/frame/UseCounter.h" 34 #include "core/frame/UseCounter.h"
34 #include "platform/fonts/FontDescription.h" 35 #include "platform/fonts/FontDescription.h"
35 #include "platform/fonts/SimpleFontData.h" 36 #include "platform/fonts/SimpleFontData.h"
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.append(source);
43 } 43 }
44 44
45 void CSSFontFace::setSegmentedFontFace( 45 void CSSFontFace::setSegmentedFontFace(
46 CSSSegmentedFontFace* segmentedFontFace) { 46 CSSSegmentedFontFace* segmentedFontFace) {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp ('k') | third_party/WebKit/Source/core/css/CSSGradientValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698