Prepare to add more initiator info to CachedResource(Request)

Source/core/loader/cache/CachedResourceRequest.cpp

Index: Source/core/loader/cache/CachedResourceRequest.cpp
diff --git a/Source/core/loader/cache/CachedResourceRequest.cpp b/Source/core/loader/cache/CachedResourceRequest.cpp
index e08ece1f42cd8ddaf792ddaf1739effe555676ea..28bcda68e59e76b734b98c6c94bb039645365752 100644
--- a/Source/core/loader/cache/CachedResourceRequest.cpp
+++ b/Source/core/loader/cache/CachedResourceRequest.cpp
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequest, const String& charset, ResourceLoadPriority priority)
+CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequest, const AtomicString& initiator, const String& charset, ResourceLoadPriority priority)
     : m_resourceRequest(resourceRequest)
     , m_charset(charset)
     , m_options(CachedResourceLoader::defaultCachedResourceOptions())
@@ -40,56 +40,31 @@ CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequ
     , m_forPreload(false)
     , m_defer(NoDefer)
 {
+    m_initiatorInfo.name = initiator;
 }
 
-CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequest, const ResourceLoaderOptions& options)
+CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequest, const AtomicString& initiator, const ResourceLoaderOptions& options)
     : m_resourceRequest(resourceRequest)
     , m_options(options)
     , m_priority(ResourceLoadPriorityUnresolved)
     , m_forPreload(false)
     , m_defer(NoDefer)
 {
+    m_initiatorInfo.name = initiator;
 }
 
-CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequest, ResourceLoadPriority priority)
+CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequest, const AtomicString& initiator, ResourceLoadPriority priority)
     : m_resourceRequest(resourceRequest)
     , m_options(CachedResourceLoader::defaultCachedResourceOptions())
     , m_priority(priority)
     , m_forPreload(false)
     , m_defer(NoDefer)
 {
+    m_initiatorInfo.name = initiator;
 }
 
 CachedResourceRequest::~CachedResourceRequest()
 {
 }
 
-void CachedResourceRequest::setInitiator(PassRefPtr<Element> element)
-{
-    ASSERT(!m_initiatorElement && m_initiatorName.isEmpty());
-    m_initiatorElement = element;
-}
-
-void CachedResourceRequest::setInitiator(const AtomicString& name)
-{
-    ASSERT(!m_initiatorElement && m_initiatorName.isEmpty());
-    m_initiatorName = name;
-}
-
-const AtomicString& CachedResourceRequest::initiatorName() const
-{
-    if (m_initiatorElement)
-        return m_initiatorElement->localName();
-    if (!m_initiatorName.isEmpty())
-        return m_initiatorName;
-
-    DEFINE_STATIC_LOCAL(AtomicString, defaultName, ("resource", AtomicString::ConstructFromLiteral));
-    return defaultName;
-}
-
-PassRefPtr<Element> CachedResourceRequest::initiatorElement()
-{
-    return m_initiatorElement;
-}
-
 } // namespace WebCore