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

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

Issue 995783002: Gracefully handle mixed content checking on detached resource fetches. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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 15 matching lines...) Expand all
26 #include "config.h" 26 #include "config.h"
27 #include "core/css/CSSFontFaceSrcValue.h" 27 #include "core/css/CSSFontFaceSrcValue.h"
28 28
29 #include "core/FetchInitiatorTypeNames.h" 29 #include "core/FetchInitiatorTypeNames.h"
30 #include "core/css/StyleSheetContents.h" 30 #include "core/css/StyleSheetContents.h"
31 #include "core/dom/Document.h" 31 #include "core/dom/Document.h"
32 #include "core/dom/Node.h" 32 #include "core/dom/Node.h"
33 #include "core/fetch/FetchRequest.h" 33 #include "core/fetch/FetchRequest.h"
34 #include "core/fetch/FontResource.h" 34 #include "core/fetch/FontResource.h"
35 #include "core/fetch/ResourceFetcher.h" 35 #include "core/fetch/ResourceFetcher.h"
36 #include "core/loader/MixedContentChecker.h"
36 #include "platform/fonts/FontCache.h" 37 #include "platform/fonts/FontCache.h"
37 #include "platform/fonts/FontCustomPlatformData.h" 38 #include "platform/fonts/FontCustomPlatformData.h"
38 #include "platform/weborigin/SecurityPolicy.h" 39 #include "platform/weborigin/SecurityPolicy.h"
39 #include "wtf/text/StringBuilder.h" 40 #include "wtf/text/StringBuilder.h"
40 41
41 namespace blink { 42 namespace blink {
42 43
43 bool CSSFontFaceSrcValue::isSupportedFormat() const 44 bool CSSFontFaceSrcValue::isSupportedFormat() const
44 { 45 {
45 // Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face, 46 // Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 m_fetched->lastResourceRequest().url(), MixedContentChecker::SendReport) ; 114 m_fetched->lastResourceRequest().url(), MixedContentChecker::SendReport) ;
114 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe tcher::ResourceLoadingFromCache); 115 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe tcher::ResourceLoadingFromCache);
115 } 116 }
116 117
117 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const 118 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const
118 { 119 {
119 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou rce == other.m_resource; 120 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou rce == other.m_resource;
120 } 121 }
121 122
122 } 123 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698