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

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

Issue 439223005: Resources restored from CSS cache should be able to trigger InsecureContent messages (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: adjust shouldBlockFetch call to current code Created 6 years, 2 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, 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document) 126 void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document)
127 { 127 {
128 ASSERT(m_fetched); 128 ASSERT(m_fetched);
129 ASSERT(document && document->fetcher()); 129 ASSERT(document && document->fetcher());
130 130
131 const String resourceURL = document->completeURL(m_resource); 131 const String resourceURL = document->completeURL(m_resource);
132 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL))) 132 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL)))
133 return; 133 return;
134 134
135 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css); 135 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css);
136 document->fetcher()->maybeNotifyInsecureContent(m_fetched.get());
136 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe tcher::ResourceLoadingFromCache); 137 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe tcher::ResourceLoadingFromCache);
137 } 138 }
138 139
139 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const 140 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const
140 { 141 {
141 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou rce == other.m_resource; 142 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou rce == other.m_resource;
142 } 143 }
143 144
144 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698