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

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

Issue 2584423002: Loading: move core/fetch to platform/loader/fetch (Closed)
Patch Set: another try Created 3 years, 11 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 14 matching lines...) Expand all
25 */ 25 */
26 26
27 #include "core/css/FontFaceCache.h" 27 #include "core/css/FontFaceCache.h"
28 28
29 #include "core/css/CSSFontSelector.h" 29 #include "core/css/CSSFontSelector.h"
30 #include "core/css/CSSSegmentedFontFace.h" 30 #include "core/css/CSSSegmentedFontFace.h"
31 #include "core/css/CSSValueList.h" 31 #include "core/css/CSSValueList.h"
32 #include "core/css/FontFace.h" 32 #include "core/css/FontFace.h"
33 #include "core/css/FontStyleMatcher.h" 33 #include "core/css/FontStyleMatcher.h"
34 #include "core/css/StyleRule.h" 34 #include "core/css/StyleRule.h"
35 #include "core/fetch/ResourceFetcher.h"
36 #include "core/loader/resource/FontResource.h" 35 #include "core/loader/resource/FontResource.h"
37 #include "platform/FontFamilyNames.h" 36 #include "platform/FontFamilyNames.h"
38 #include "platform/fonts/FontDescription.h" 37 #include "platform/fonts/FontDescription.h"
38 #include "platform/loader/fetch/ResourceFetcher.h"
39 #include "wtf/text/AtomicString.h" 39 #include "wtf/text/AtomicString.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 FontFaceCache::FontFaceCache() : m_version(0) {} 43 FontFaceCache::FontFaceCache() : m_version(0) {}
44 44
45 void FontFaceCache::add(CSSFontSelector* cssFontSelector, 45 void FontFaceCache::add(CSSFontSelector* cssFontSelector,
46 const StyleRuleFontFace* fontFaceRule, 46 const StyleRuleFontFace* fontFaceRule,
47 FontFace* fontFace) { 47 FontFace* fontFace) {
48 if (!m_styleRuleToFontFace.add(fontFaceRule, fontFace).isNewEntry) 48 if (!m_styleRuleToFontFace.add(fontFaceRule, fontFace).isNewEntry)
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } 152 }
153 153
154 DEFINE_TRACE(FontFaceCache) { 154 DEFINE_TRACE(FontFaceCache) {
155 visitor->trace(m_fontFaces); 155 visitor->trace(m_fontFaces);
156 visitor->trace(m_fonts); 156 visitor->trace(m_fonts);
157 visitor->trace(m_styleRuleToFontFace); 157 visitor->trace(m_styleRuleToFontFace);
158 visitor->trace(m_cssConnectedFontFaces); 158 visitor->trace(m_cssConnectedFontFaces);
159 } 159 }
160 160
161 } // namespace blink 161 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSImageValue.cpp ('k') | third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698