Prepare to add more initiator info to CachedResource(Request)

Source/core/loader/cache/CachedResourceRequest.cpp

 /*
  * Copyright (C) 2012 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #include "config.h"
 #include "core/loader/cache/CachedResourceRequest.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/loader/cache/CachedResourceLoader.h"
 
 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())
     , m_priority(priority)
     , 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