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

Side by Side Diff: sky/engine/core/css/FontFaceCache.cpp

Issue 746023002: Make absolute and sort all Sky headers (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « sky/engine/core/css/FontFaceCache.h ('k') | sky/engine/core/css/FontFaceSet.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 27
28 #include "config.h" 28 #include "sky/engine/config.h"
29 #include "core/css/FontFaceCache.h" 29 #include "sky/engine/core/css/FontFaceCache.h"
30 30
31 #include "core/css/CSSFontSelector.h"
32 #include "core/css/CSSSegmentedFontFace.h"
33 #include "core/css/CSSValueList.h"
34 #include "core/css/FontFace.h"
35 #include "core/css/StyleRule.h"
36 #include "core/fetch/FontResource.h"
37 #include "core/fetch/ResourceFetcher.h"
38 #include "gen/sky/platform/FontFamilyNames.h" 31 #include "gen/sky/platform/FontFamilyNames.h"
39 #include "platform/fonts/FontDescription.h" 32 #include "sky/engine/core/css/CSSFontSelector.h"
40 #include "wtf/text/AtomicString.h" 33 #include "sky/engine/core/css/CSSSegmentedFontFace.h"
34 #include "sky/engine/core/css/CSSValueList.h"
35 #include "sky/engine/core/css/FontFace.h"
36 #include "sky/engine/core/css/StyleRule.h"
37 #include "sky/engine/core/fetch/FontResource.h"
38 #include "sky/engine/core/fetch/ResourceFetcher.h"
39 #include "sky/engine/platform/fonts/FontDescription.h"
40 #include "sky/engine/wtf/text/AtomicString.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 FontFaceCache::FontFaceCache() 44 FontFaceCache::FontFaceCache()
45 : m_version(0) 45 : m_version(0)
46 { 46 {
47 } 47 }
48 48
49 void FontFaceCache::add(CSSFontSelector* cssFontSelector, const StyleRuleFontFac e* fontFaceRule, PassRefPtr<FontFace> prpFontFace) 49 void FontFaceCache::add(CSSFontSelector* cssFontSelector, const StyleRuleFontFac e* fontFaceRule, PassRefPtr<FontFace> prpFontFace)
50 { 50 {
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 if (traits.variant() == FontVariantNormal && candidateTraits.variant () != FontVariantNormal) 220 if (traits.variant() == FontVariantNormal && candidateTraits.variant () != FontVariantNormal)
221 continue; 221 continue;
222 if (!faceResult.storedValue->value || compareFontFaces(candidate, fa ceResult.storedValue->value.get(), traits)) 222 if (!faceResult.storedValue->value || compareFontFaces(candidate, fa ceResult.storedValue->value.get(), traits))
223 faceResult.storedValue->value = candidate; 223 faceResult.storedValue->value = candidate;
224 } 224 }
225 } 225 }
226 return faceResult.storedValue->value.get(); 226 return faceResult.storedValue->value.get();
227 } 227 }
228 228
229 } 229 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/FontFaceCache.h ('k') | sky/engine/core/css/FontFaceSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698