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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSImageValue.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

OLD	NEW
1 /*	1 /*

2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)	2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)

3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.	3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.

4 *	4 *

5 * This library is free software; you can redistribute it and/or	5 * This library is free software; you can redistribute it and/or

6 * modify it under the terms of the GNU Library General Public	6 * modify it under the terms of the GNU Library General Public

7 * License as published by the Free Software Foundation; either	7 * License as published by the Free Software Foundation; either

8 * version 2 of the License, or (at your option) any later version.	8 * version 2 of the License, or (at your option) any later version.

9 *	9 *

10 * This library is distributed in the hope that it will be useful,	10 * This library is distributed in the hope that it will be useful,

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)) )	85 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)) )

86 return;	86 return;

87	87

88 ImageResource* resource = m_cachedImage->cachedImage();	88 ImageResource* resource = m_cachedImage->cachedImage();

89 if (!resource)	89 if (!resource)

90 return;	90 return;

91	91

92 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty () ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options());	92 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty () ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options());

93 MixedContentChecker::shouldBlockFetch(document.frame(), resource->lastResour ceRequest(),	93 MixedContentChecker::shouldBlockFetch(document.frame(), resource->lastResour ceRequest(),

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

95 document.fetcher()->requestLoadStarted(resource, request, ResourceFetcher::R esourceLoadingFromCache);	95 document.fetcher()->requestLoadStarted(resource->identifier(), resource, req uest, ResourceFetcher::ResourceLoadingFromCache);

96 }	96 }

97	97

98 bool CSSImageValue::hasFailedOrCanceledSubresources() const	98 bool CSSImageValue::hasFailedOrCanceledSubresources() const

99 {	99 {

100 if (!m_cachedImage)	100 if (!m_cachedImage)

101 return false;	101 return false;

102 if (Resource* cachedResource = m_cachedImage->cachedImage())	102 if (Resource* cachedResource = m_cachedImage->cachedImage())

103 return cachedResource->loadFailedOrCanceled();	103 return cachedResource->loadFailedOrCanceled();

104 return true;	104 return true;

105 }	105 }

(...skipping 24 matching lines...) Expand all Loading...
130 KURL url = document.completeURL(m_relativeURL);	130 KURL url = document.completeURL(m_relativeURL);

131 AtomicString urlString(url.getString());	131 AtomicString urlString(url.getString());

132 if (urlString == m_absoluteURL)	132 if (urlString == m_absoluteURL)

133 return;	133 return;

134 m_absoluteURL = urlString;	134 m_absoluteURL = urlString;

135 m_isCachePending = true;	135 m_isCachePending = true;

136 m_cachedImage.clear();	136 m_cachedImage.clear();

137 }	137 }

138	138

139 } // namespace blink	139 } // namespace blink

OLD	NEW