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

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

Issue 1250793008: Webfont fetch should be CORS-enabled even for same-origin URL (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.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 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
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 private: 70 private:
71 CSSFontFaceSrcValue(const String& resource, bool local, ContentSecurityPolic yDisposition shouldCheckContentSecurityPolicy) 71 CSSFontFaceSrcValue(const String& resource, bool local, ContentSecurityPolic yDisposition shouldCheckContentSecurityPolicy)
72 : CSSValue(FontFaceSrcClass) 72 : CSSValue(FontFaceSrcClass)
73 , m_resource(resource) 73 , m_resource(resource)
74 , m_isLocal(local) 74 , m_isLocal(local)
75 , m_shouldCheckContentSecurityPolicy(shouldCheckContentSecurityPolicy) 75 , m_shouldCheckContentSecurityPolicy(shouldCheckContentSecurityPolicy)
76 { 76 {
77 } 77 }
78 78
79 void restoreCachedResourceIfNeeded(Document*); 79 void restoreCachedResourceIfNeeded(Document*);
80 bool shouldSetCrossOriginAccessControl(const KURL& resource, SecurityOrigin* );
81 80
82 String m_resource; 81 String m_resource;
83 String m_format; 82 String m_format;
84 Referrer m_referrer; 83 Referrer m_referrer;
85 bool m_isLocal; 84 bool m_isLocal;
86 ContentSecurityPolicyDisposition m_shouldCheckContentSecurityPolicy; 85 ContentSecurityPolicyDisposition m_shouldCheckContentSecurityPolicy;
87 86
88 ResourcePtr<FontResource> m_fetched; 87 ResourcePtr<FontResource> m_fetched;
89 }; 88 };
90 89
91 DEFINE_CSS_VALUE_TYPE_CASTS(CSSFontFaceSrcValue, isFontFaceSrcValue()); 90 DEFINE_CSS_VALUE_TYPE_CASTS(CSSFontFaceSrcValue, isFontFaceSrcValue());
92 91
93 } 92 }
94 93
95 #endif 94 #endif
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/webfont/webfont-cors-expected.html ('k') | Source/core/css/CSSFontFaceSrcValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698