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

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

Issue 230383003: Webfont CORS-enabled fetching with fallback (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase & reverse the enum values 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
« no previous file with comments | « Source/core/css/CSSFontFaceSrcValue.h ('k') | Source/core/css/RemoteFontFaceSource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2010 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 return result.toString(); 81 return result.toString();
82 } 82 }
83 83
84 bool CSSFontFaceSrcValue::hasFailedOrCanceledSubresources() const 84 bool CSSFontFaceSrcValue::hasFailedOrCanceledSubresources() const
85 { 85 {
86 if (!m_fetched) 86 if (!m_fetched)
87 return false; 87 return false;
88 return m_fetched->loadFailedOrCanceled(); 88 return m_fetched->loadFailedOrCanceled();
89 } 89 }
90 90
91 bool CSSFontFaceSrcValue::shouldSetCrossOriginAccessControl(const KURL& resource , SecurityOrigin* securityOrigin)
92 {
93 if (resource.isLocalFile() || resource.protocolIsData())
94 return false;
95 if (m_fetched && m_fetched->isCORSFailed())
96 return false;
97 return !securityOrigin->canRequest(resource);
98 }
99
91 FontResource* CSSFontFaceSrcValue::fetch(Document* document) 100 FontResource* CSSFontFaceSrcValue::fetch(Document* document)
92 { 101 {
93 if (!m_fetched) { 102 if (!m_fetched || m_fetched->isCORSFailed()) {
94 FetchRequest request(ResourceRequest(document->completeURL(m_resource)), FetchInitiatorTypeNames::css); 103 FetchRequest request(ResourceRequest(document->completeURL(m_resource)), FetchInitiatorTypeNames::css);
104 SecurityOrigin* securityOrigin = document->securityOrigin();
105 if (shouldSetCrossOriginAccessControl(request.url(), securityOrigin)) {
106 request.setCrossOriginAccessControl(securityOrigin, DoNotAllowStored Credentials);
107 }
95 m_fetched = document->fetcher()->fetchFont(request); 108 m_fetched = document->fetcher()->fetchFont(request);
96 } 109 }
97 return m_fetched.get(); 110 return m_fetched.get();
98 } 111 }
99 112
100 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const 113 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const
101 { 114 {
102 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou rce == other.m_resource; 115 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou rce == other.m_resource;
103 } 116 }
104 117
105 } 118 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontFaceSrcValue.h ('k') | Source/core/css/RemoteFontFaceSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698