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

Side by Side Diff: Source/core/css/CSSFontFaceSrcValue.h

Issue 230383003: Webfont CORS-enabled fetching with fallback (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add invalidator, retry only CORS failure Created 6 years, 8 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 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 #ifndef CSSFontFaceSrcValue_h 26 #ifndef CSSFontFaceSrcValue_h
27 #define CSSFontFaceSrcValue_h 27 #define CSSFontFaceSrcValue_h
28 28
29 #include "core/css/CSSValue.h" 29 #include "core/css/CSSValue.h"
30 #include "core/fetch/FontResource.h"
30 #include "core/fetch/ResourcePtr.h" 31 #include "core/fetch/ResourcePtr.h"
31 #include "wtf/PassRefPtr.h" 32 #include "wtf/PassRefPtr.h"
32 #include "wtf/text/WTFString.h" 33 #include "wtf/text/WTFString.h"
33 34
34 namespace WebCore { 35 namespace WebCore {
35 36
36 class FontResource; 37 class FontResource;
37 class Document; 38 class Document;
38 class SVGFontFaceElement; 39 class SVGFontFaceElement;
39 40
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 72
72 bool equals(const CSSFontFaceSrcValue&) const; 73 bool equals(const CSSFontFaceSrcValue&) const;
73 74
74 void traceAfterDispatch(Visitor* visitor) { CSSValue::traceAfterDispatch(vis itor); } 75 void traceAfterDispatch(Visitor* visitor) { CSSValue::traceAfterDispatch(vis itor); }
75 76
76 private: 77 private:
77 CSSFontFaceSrcValue(const String& resource, bool local) 78 CSSFontFaceSrcValue(const String& resource, bool local)
78 : CSSValue(FontFaceSrcClass) 79 : CSSValue(FontFaceSrcClass)
79 , m_resource(resource) 80 , m_resource(resource)
80 , m_isLocal(local) 81 , m_isLocal(local)
82 , m_corsEnabled(IsCORSEnabled)
81 #if ENABLE(SVG_FONTS) 83 #if ENABLE(SVG_FONTS)
82 , m_svgFontFaceElement(0) 84 , m_svgFontFaceElement(0)
83 #endif 85 #endif
84 { 86 {
85 } 87 }
86 88
89 // FIXME: Remove later, http://crbug.com/286681
90 class FontResourceInvalidator : public FontResourceClient {
91 public:
92 FontResourceInvalidator(CSSFontFaceSrcValue&);
93 ~FontResourceInvalidator();
94
95 virtual void fontLoaded(FontResource*) OVERRIDE;
96 virtual void corsFailed(FontResource*) OVERRIDE;
97 private:
98 CSSFontFaceSrcValue& m_srcValue;
99 ResourcePtr<FontResource> m_resource;
100 };
101
102 friend class FontResourceInvalidator;
103
104 bool shouldSetCrossOriginAccessControl(const KURL& resource, SecurityOrigin* );
105
87 String m_resource; 106 String m_resource;
88 String m_format; 107 String m_format;
89 bool m_isLocal; 108 bool m_isLocal;
90 109
91 ResourcePtr<FontResource> m_fetched; 110 ResourcePtr<FontResource> m_fetched;
92 111
112 OwnPtr<FontResourceInvalidator> m_invalidator;
113 CORSEnabled m_corsEnabled;
114
93 #if ENABLE(SVG_FONTS) 115 #if ENABLE(SVG_FONTS)
94 SVGFontFaceElement* m_svgFontFaceElement; 116 SVGFontFaceElement* m_svgFontFaceElement;
95 #endif 117 #endif
96 }; 118 };
97 119
98 DEFINE_CSS_VALUE_TYPE_CASTS(CSSFontFaceSrcValue, isFontFaceSrcValue()); 120 DEFINE_CSS_VALUE_TYPE_CASTS(CSSFontFaceSrcValue, isFontFaceSrcValue());
99 121
100 } 122 }
101 123
102 #endif 124 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698