Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1029)

Unified Diff: Source/core/loader/cache/CachedResourceRequest.h

Issue 14672042: Prepare to add more initiator info to CachedResource(Request) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/cache/CachedResourceRequest.h
diff --git a/Source/core/loader/cache/CachedResourceRequest.h b/Source/core/loader/cache/CachedResourceRequest.h
index f0bdebdb9895cdd719598204cfb92c507c6bbd38..30e7dc15dadc631a7aad1d98c3a092a55adf39d7 100644
--- a/Source/core/loader/cache/CachedResourceRequest.h
+++ b/Source/core/loader/cache/CachedResourceRequest.h
@@ -28,6 +28,7 @@
#include "core/dom/Element.h"
#include "core/loader/ResourceLoaderOptions.h"
+#include "core/loader/cache/CachedResourceInitiatorInfo.h"
#include "core/platform/network/ResourceLoadPriority.h"
#include "core/platform/network/ResourceRequest.h"
#include <wtf/RefPtr.h>
@@ -40,9 +41,9 @@ class CachedResourceRequest {
public:
enum DeferOption { NoDefer, DeferredByClient };
- explicit CachedResourceRequest(const ResourceRequest&, const String& charset = String(), ResourceLoadPriority = ResourceLoadPriorityUnresolved);
- CachedResourceRequest(const ResourceRequest&, const ResourceLoaderOptions&);
- CachedResourceRequest(const ResourceRequest&, ResourceLoadPriority);
+ explicit CachedResourceRequest(const ResourceRequest&, const AtomicString& initiator, const String& charset = String(), ResourceLoadPriority = ResourceLoadPriorityUnresolved);
+ CachedResourceRequest(const ResourceRequest&, const AtomicString& initiator, const ResourceLoaderOptions&);
+ CachedResourceRequest(const ResourceRequest&, const AtomicString& initiator, ResourceLoadPriority);
~CachedResourceRequest();
ResourceRequest& mutableResourceRequest() { return m_resourceRequest; }
@@ -57,10 +58,7 @@ public:
void setForPreload(bool forPreload) { m_forPreload = forPreload; }
DeferOption defer() const { return m_defer; }
void setDefer(DeferOption defer) { m_defer = defer; }
- void setInitiator(PassRefPtr<Element>);
- void setInitiator(const AtomicString& name);
- const AtomicString& initiatorName() const;
- PassRefPtr<Element> initiatorElement();
+ const CachedResourceInitiatorInfo& initiatorInfo() const { return m_initiatorInfo; }
void setContentSecurityCheck(ContentSecurityPolicyCheck contentSecurityPolicyOption) { m_options.contentSecurityPolicyOption = contentSecurityPolicyOption; }
private:
@@ -70,8 +68,7 @@ private:
ResourceLoadPriority m_priority;
bool m_forPreload;
DeferOption m_defer;
- RefPtr<Element> m_initiatorElement;
- AtomicString m_initiatorName;
+ CachedResourceInitiatorInfo m_initiatorInfo;
};
} // namespace WebCore
« no previous file with comments | « Source/core/loader/cache/CachedResourceLoader.cpp ('k') | Source/core/loader/cache/CachedResourceRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698