| 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 * 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 23 matching lines...) Expand all Loading... |
| 34 #include "core/css/CSSFontSelector.h" | 34 #include "core/css/CSSFontSelector.h" |
| 35 #include "core/css/CSSSegmentedFontFace.h" | 35 #include "core/css/CSSSegmentedFontFace.h" |
| 36 #include "core/css/CSSValueList.h" | 36 #include "core/css/CSSValueList.h" |
| 37 #include "core/css/StyleRule.h" | 37 #include "core/css/StyleRule.h" |
| 38 #include "core/dom/Document.h" | 38 #include "core/dom/Document.h" |
| 39 #include "core/fetch/FontResource.h" | 39 #include "core/fetch/FontResource.h" |
| 40 #include "core/fetch/ResourceFetcher.h" | 40 #include "core/fetch/ResourceFetcher.h" |
| 41 #include "core/frame/Frame.h" | 41 #include "core/frame/Frame.h" |
| 42 #include "core/page/Settings.h" | 42 #include "core/page/Settings.h" |
| 43 #include "core/platform/graphics/FontCache.h" | 43 #include "core/platform/graphics/FontCache.h" |
| 44 #include "core/platform/graphics/FontDescription.h" | |
| 45 #include "core/platform/graphics/SimpleFontData.h" | 44 #include "core/platform/graphics/SimpleFontData.h" |
| 45 #include "platform/fonts/FontDescription.h" |
| 46 #include "wtf/text/AtomicString.h" | 46 #include "wtf/text/AtomicString.h" |
| 47 | 47 |
| 48 namespace WebCore { | 48 namespace WebCore { |
| 49 | 49 |
| 50 CSSSegmentedFontFaceCache::CSSSegmentedFontFaceCache() | 50 CSSSegmentedFontFaceCache::CSSSegmentedFontFaceCache() |
| 51 : m_version(0) | 51 : m_version(0) |
| 52 { | 52 { |
| 53 } | 53 } |
| 54 | 54 |
| 55 void CSSSegmentedFontFaceCache::addFontFaceRule(CSSFontSelector* cssFontSelector
, const StyleRuleFontFace* fontFaceRule) | 55 void CSSSegmentedFontFaceCache::addFontFaceRule(CSSFontSelector* cssFontSelector
, const StyleRuleFontFace* fontFaceRule) |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 continue; | 274 continue; |
| 275 if (!face || compareFontFaces(candidate, face.get(), traitsMask)
) | 275 if (!face || compareFontFaces(candidate, face.get(), traitsMask)
) |
| 276 face = candidate; | 276 face = candidate; |
| 277 } | 277 } |
| 278 } | 278 } |
| 279 } | 279 } |
| 280 return face.get(); | 280 return face.get(); |
| 281 } | 281 } |
| 282 | 282 |
| 283 } | 283 } |
| OLD | NEW |