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

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

Issue 1214513003: Remove references into sky/engine/core/fetch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 * 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
(...skipping 15 matching lines...) Expand all
26 26
27 27
28 #include "sky/engine/core/css/FontFaceCache.h" 28 #include "sky/engine/core/css/FontFaceCache.h"
29 29
30 #include "gen/sky/platform/FontFamilyNames.h" 30 #include "gen/sky/platform/FontFamilyNames.h"
31 #include "sky/engine/core/css/CSSFontSelector.h" 31 #include "sky/engine/core/css/CSSFontSelector.h"
32 #include "sky/engine/core/css/CSSSegmentedFontFace.h" 32 #include "sky/engine/core/css/CSSSegmentedFontFace.h"
33 #include "sky/engine/core/css/CSSValueList.h" 33 #include "sky/engine/core/css/CSSValueList.h"
34 #include "sky/engine/core/css/FontFace.h" 34 #include "sky/engine/core/css/FontFace.h"
35 #include "sky/engine/core/css/StyleRule.h" 35 #include "sky/engine/core/css/StyleRule.h"
36 #include "sky/engine/core/fetch/ResourceFetcher.h"
37 #include "sky/engine/platform/fonts/FontDescription.h" 36 #include "sky/engine/platform/fonts/FontDescription.h"
38 #include "sky/engine/wtf/text/AtomicString.h" 37 #include "sky/engine/wtf/text/AtomicString.h"
39 38
40 namespace blink { 39 namespace blink {
41 40
42 FontFaceCache::FontFaceCache() 41 FontFaceCache::FontFaceCache()
43 : m_version(0) 42 : m_version(0)
44 { 43 {
45 } 44 }
46 45
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 if (traits.variant() == FontVariantNormal && candidateTraits.variant () != FontVariantNormal) 217 if (traits.variant() == FontVariantNormal && candidateTraits.variant () != FontVariantNormal)
219 continue; 218 continue;
220 if (!faceResult.storedValue->value || compareFontFaces(candidate, fa ceResult.storedValue->value.get(), traits)) 219 if (!faceResult.storedValue->value || compareFontFaces(candidate, fa ceResult.storedValue->value.get(), traits))
221 faceResult.storedValue->value = candidate; 220 faceResult.storedValue->value = candidate;
222 } 221 }
223 } 222 }
224 return faceResult.storedValue->value.get(); 223 return faceResult.storedValue->value.get();
225 } 224 }
226 225
227 } 226 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSImageGeneratorValue.cpp ('k') | sky/engine/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698