Diff
Modified: trunk/Source/WebCore/ChangeLog (135451 => 135452)
--- trunk/Source/WebCore/ChangeLog 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/ChangeLog 2012-11-22 00:18:35 UTC (rev 135452)
@@ -1,3 +1,38 @@
+2012-11-21 James Simonsen <[email protected]>
+
+ Remove the concept of initiatorDocument from CachedResourceRequest
+ https://bugs.webkit.org/show_bug.cgi?id=102855
+
+ Reviewed by Sam Weinig.
+
+ It turns out this isn't necessary for the new implementation of Resource Timing. Instead,
+ we can get at it from the CachedResourceLoader. I don't think anyone else needed it either.
+
+ No new tests. This was never used.
+
+ * css/CSSFontFaceSrcValue.cpp:
+ (WebCore::CSSFontFaceSrcValue::cachedFont):
+ * css/CSSImageSetValue.cpp:
+ (WebCore::CSSImageSetValue::cachedImageSet):
+ * css/CSSImageValue.cpp:
+ (WebCore::CSSImageValue::cachedImage):
+ * css/StyleRuleImport.cpp:
+ (WebCore::StyleRuleImport::requestStyleSheet):
+ * css/WebKitCSSSVGDocumentValue.cpp:
+ (WebCore::WebKitCSSSVGDocumentValue::load):
+ * css/WebKitCSSShaderValue.cpp:
+ (WebCore::WebKitCSSShaderValue::cachedShader):
+ * html/parser/CSSPreloadScanner.cpp:
+ (WebCore::CSSPreloadScanner::emitRule):
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::PreloadTask::preload):
+ * loader/cache/CachedResourceRequest.cpp:
+ (WebCore::CachedResourceRequest::setInitiator):
+ * loader/cache/CachedResourceRequest.h:
+ (CachedResourceRequest):
+ * loader/icon/IconLoader.cpp:
+ (WebCore::IconLoader::startLoading):
+
2012-11-21 Sheriff Bot <[email protected]>
Unreviewed, rolling out r135437.
Modified: trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp (135451 => 135452)
--- trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -98,7 +98,7 @@
{
if (!m_cachedFont) {
CachedResourceRequest request(ResourceRequest(document->completeURL(m_resource)));
- request.setInitiator(cachedResourceRequestInitiators().css, document);
+ request.setInitiator(cachedResourceRequestInitiators().css);
m_cachedFont = document->cachedResourceLoader()->requestFont(request);
}
return m_cachedFont.get();
Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (135451 => 135452)
--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -110,8 +110,8 @@
// All forms of scale should be included: Page::pageScaleFactor(), Frame::pageZoomFactor(),
// and any CSS transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
ImageWithScale image = bestImageForScaleFactor();
- CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(image.imageURL)));
- request.setInitiator(cachedResourceRequestInitiators().css, document);
+ CachedResourceRequest request(ResourceRequest(document->completeURL(image.imageURL)));
+ request.setInitiator(cachedResourceRequestInitiators().css);
if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request)) {
m_imageSet = StyleCachedImageSet::create(cachedImage.get(), image.scaleFactor, this);
m_accessedBestFitImage = true;
Modified: trunk/Source/WebCore/css/CSSImageValue.cpp (135451 => 135452)
--- trunk/Source/WebCore/css/CSSImageValue.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/css/CSSImageValue.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -89,7 +89,7 @@
if (initiatorElement)
request.setInitiator(initiatorElement);
else
- request.setInitiator(cachedResourceRequestInitiators().css, loader->document());
+ request.setInitiator(cachedResourceRequestInitiators().css);
if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request))
m_image = StyleCachedImage::create(cachedImage.get());
}
Modified: trunk/Source/WebCore/css/StyleRuleImport.cpp (135451 => 135452)
--- trunk/Source/WebCore/css/StyleRuleImport.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/css/StyleRuleImport.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -118,7 +118,7 @@
}
CachedResourceRequest request(ResourceRequest(absURL), m_parentStyleSheet->charset());
- request.setInitiator(cachedResourceRequestInitiators().css, document);
+ request.setInitiator(cachedResourceRequestInitiators().css);
if (m_parentStyleSheet->isUserStyleSheet())
m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(request);
else
Modified: trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp (135451 => 135452)
--- trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -55,7 +55,7 @@
m_loadRequested = true;
CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url)));
- request.setInitiator(cachedResourceRequestInitiators().css, loader->document());
+ request.setInitiator(cachedResourceRequestInitiators().css);
m_document = loader->requestSVGDocument(request);
}
Modified: trunk/Source/WebCore/css/WebKitCSSShaderValue.cpp (135451 => 135452)
--- trunk/Source/WebCore/css/WebKitCSSShaderValue.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/css/WebKitCSSShaderValue.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -62,7 +62,7 @@
m_accessedShader = true;
CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url)));
- request.setInitiator(cachedResourceRequestInitiators().css, loader->document());
+ request.setInitiator(cachedResourceRequestInitiators().css);
if (CachedResourceHandle<CachedShader> cachedShader = loader->requestShader(request))
m_shader = StyleCachedShader::create(cachedShader.get());
}
Modified: trunk/Source/WebCore/html/parser/CSSPreloadScanner.cpp (135451 => 135452)
--- trunk/Source/WebCore/html/parser/CSSPreloadScanner.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/html/parser/CSSPreloadScanner.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -199,7 +199,7 @@
String value = parseCSSStringOrURL(m_ruleValue.characters(), m_ruleValue.length());
if (!value.isEmpty()) {
CachedResourceRequest request(ResourceRequest(m_document->completeURL(value)));
- request.setInitiator(cachedResourceRequestInitiators().css, m_document);
+ request.setInitiator(cachedResourceRequestInitiators().css);
m_document->cachedResourceLoader()->preload(CachedResource::CSSStyleSheet, request, String(), m_scanningBody);
}
m_state = Initial;
Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (135451 => 135452)
--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -130,7 +130,7 @@
CachedResourceLoader* cachedResourceLoader = document->cachedResourceLoader();
CachedResourceRequest request(ResourceRequest(document->completeURL(m_urlToLoad, baseURL)));
- request.setInitiator(tagName(), document);
+ request.setInitiator(tagName());
if (m_tagName == scriptTag) {
request.mutableResourceRequest().setAllowCookies(crossOriginModeAllowsCookies());
cachedResourceLoader->preload(CachedResource::Script, request, m_charset, scanningBody);
Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (135451 => 135452)
--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -66,15 +66,14 @@
void CachedResourceRequest::setInitiator(PassRefPtr<Element> element)
{
- ASSERT(!m_initiatorElement && !m_initiatorDocument);
+ ASSERT(!m_initiatorElement && m_initiatorName.isEmpty());
m_initiatorElement = element;
}
-void CachedResourceRequest::setInitiator(const AtomicString& name, PassRefPtr<Document> document)
+void CachedResourceRequest::setInitiator(const AtomicString& name)
{
- ASSERT(!m_initiatorElement && !m_initiatorDocument);
+ ASSERT(!m_initiatorElement && m_initiatorName.isEmpty());
m_initiatorName = name;
- m_initiatorDocument = document;
}
const AtomicString& CachedResourceRequest::initiatorName() const
@@ -88,13 +87,6 @@
return defaultName;
}
-PassRefPtr<Document> CachedResourceRequest::initiatorDocument()
-{
- if (m_initiatorElement)
- return m_initiatorElement->document();
- return m_initiatorDocument;
-}
-
PassRefPtr<Element> CachedResourceRequest::initiatorElement()
{
return m_initiatorElement;
Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (135451 => 135452)
--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2012-11-22 00:18:35 UTC (rev 135452)
@@ -57,9 +57,8 @@
DeferOption defer() const { return m_defer; }
void setDefer(DeferOption defer) { m_defer = defer; }
void setInitiator(PassRefPtr<Element>);
- void setInitiator(const AtomicString& name, PassRefPtr<Document>);
+ void setInitiator(const AtomicString& name);
const AtomicString& initiatorName() const;
- PassRefPtr<Document> initiatorDocument();
PassRefPtr<Element> initiatorElement();
private:
@@ -70,7 +69,6 @@
bool m_forPreload;
DeferOption m_defer;
RefPtr<Element> m_initiatorElement;
- RefPtr<Document> m_initiatorDocument;
AtomicString m_initiatorName;
};
Modified: trunk/Source/WebCore/loader/icon/IconLoader.cpp (135451 => 135452)
--- trunk/Source/WebCore/loader/icon/IconLoader.cpp 2012-11-22 00:16:09 UTC (rev 135451)
+++ trunk/Source/WebCore/loader/icon/IconLoader.cpp 2012-11-22 00:18:35 UTC (rev 135452)
@@ -67,7 +67,7 @@
request.mutableResourceRequest().setTargetType(ResourceRequest::TargetIsFavicon);
#endif
request.mutableResourceRequest().setPriority(ResourceLoadPriorityLow);
- request.setInitiator(cachedResourceRequestInitiators().icon, m_frame->document());
+ request.setInitiator(cachedResourceRequestInitiators().icon);
m_resource = m_frame->document()->cachedResourceLoader()->requestRawResource(request);
if (m_resource)
