third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp - Issue 1889973002: Refactoring starting a resource load

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

Issue 1889973002: Refactoring starting a resource load (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix a browser_test Created 4 years, 6 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 | « third_party/WebKit/LayoutTests/inspector/elements/styles-1/css-outline-expected.txt ('k') | third_party/WebKit/Source/core/css/CSSImageValue.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 100 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 ASSERT(document && document->fetcher());	111 ASSERT(document && document->fetcher());

112	112

113 const String resourceURL = document->completeURL(m_absoluteResource);	113 const String resourceURL = document->completeURL(m_absoluteResource);

114 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL)))	114 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL)))

115 return;	115 return;

116	116

117 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css);	117 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css);

118 request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);	118 request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);

119 MixedContentChecker::shouldBlockFetch(document->frame(), m_fetched->resource ()->lastResourceRequest(),	119 MixedContentChecker::shouldBlockFetch(document->frame(), m_fetched->resource ()->lastResourceRequest(),

120 m_fetched->resource()->lastResourceRequest().url(), MixedContentChecker: :SendReport);	120 m_fetched->resource()->lastResourceRequest().url(), MixedContentChecker: :SendReport);

121 document->fetcher()->requestLoadStarted(m_fetched->resource(), request, Reso urceFetcher::ResourceLoadingFromCache);	121 document->fetcher()->requestLoadStarted(m_fetched->resource()->identifier(), m_fetched->resource(), request, ResourceFetcher::ResourceLoadingFromCache);

122 }	122 }

123	123

124 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const	124 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const

125 {	125 {

126 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_speci fiedResource == other.m_specifiedResource && m_absoluteResource == other.m_absol uteResource;	126 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_speci fiedResource == other.m_specifiedResource && m_absoluteResource == other.m_absol uteResource;

127 }	127 }

128	128

129 } // namespace blink	129 } // namespace blink

OLD	NEW