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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@135452 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/loader/cache/CachedResourceRequest.cpp b/Source/WebCore/loader/cache/CachedResourceRequest.cpp
index 7be7349..c92e3a7 100644
--- a/Source/WebCore/loader/cache/CachedResourceRequest.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceRequest.cpp
@@ -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;
diff --git a/Source/WebCore/loader/cache/CachedResourceRequest.h b/Source/WebCore/loader/cache/CachedResourceRequest.h
index 4aa30d4..9d408e6 100644
--- a/Source/WebCore/loader/cache/CachedResourceRequest.h
+++ b/Source/WebCore/loader/cache/CachedResourceRequest.h
@@ -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;
};
diff --git a/Source/WebCore/loader/icon/IconLoader.cpp b/Source/WebCore/loader/icon/IconLoader.cpp
index e07108e..5714513 100644
--- a/Source/WebCore/loader/icon/IconLoader.cpp
+++ b/Source/WebCore/loader/icon/IconLoader.cpp
@@ -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)
