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

Side by Side Diff: Source/core/loader/FrameLoadRequest.h

Issue 1071893003: WebURLRequest: Track the requesting document's URL through navigations. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Ugh. Created 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/page/CreateWindow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 28 matching lines...) Expand all
39 struct FrameLoadRequest { 39 struct FrameLoadRequest {
40 STACK_ALLOCATED(); 40 STACK_ALLOCATED();
41 public: 41 public:
42 explicit FrameLoadRequest(Document* originDocument) 42 explicit FrameLoadRequest(Document* originDocument)
43 : m_originDocument(originDocument) 43 : m_originDocument(originDocument)
44 , m_lockBackForwardList(false) 44 , m_lockBackForwardList(false)
45 , m_clientRedirect(NotClientRedirect) 45 , m_clientRedirect(NotClientRedirect)
46 , m_shouldSendReferrer(MaybeSendReferrer) 46 , m_shouldSendReferrer(MaybeSendReferrer)
47 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) 47 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy )
48 { 48 {
49 if (originDocument)
50 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
49 } 51 }
50 52
51 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest) 53 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest)
52 : m_originDocument(originDocument) 54 : m_originDocument(originDocument)
53 , m_resourceRequest(resourceRequest) 55 , m_resourceRequest(resourceRequest)
54 , m_lockBackForwardList(false) 56 , m_lockBackForwardList(false)
55 , m_clientRedirect(NotClientRedirect) 57 , m_clientRedirect(NotClientRedirect)
56 , m_shouldSendReferrer(MaybeSendReferrer) 58 , m_shouldSendReferrer(MaybeSendReferrer)
57 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) 59 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy )
58 { 60 {
61 if (originDocument)
62 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
59 } 63 }
60 64
61 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName) 65 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName)
62 : m_originDocument(originDocument) 66 : m_originDocument(originDocument)
63 , m_resourceRequest(resourceRequest) 67 , m_resourceRequest(resourceRequest)
64 , m_frameName(frameName) 68 , m_frameName(frameName)
65 , m_lockBackForwardList(false) 69 , m_lockBackForwardList(false)
66 , m_clientRedirect(NotClientRedirect) 70 , m_clientRedirect(NotClientRedirect)
67 , m_shouldSendReferrer(MaybeSendReferrer) 71 , m_shouldSendReferrer(MaybeSendReferrer)
68 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) 72 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy )
69 { 73 {
74 if (originDocument)
75 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
70 } 76 }
71 77
72 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName, ContentSecurityPolicyDisposition shouldChe ckMainWorldContentSecurityPolicy) 78 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName, ContentSecurityPolicyDisposition shouldChe ckMainWorldContentSecurityPolicy)
73 : m_originDocument(originDocument) 79 : m_originDocument(originDocument)
74 , m_resourceRequest(resourceRequest) 80 , m_resourceRequest(resourceRequest)
75 , m_frameName(frameName) 81 , m_frameName(frameName)
76 , m_lockBackForwardList(false) 82 , m_lockBackForwardList(false)
77 , m_clientRedirect(NotClientRedirect) 83 , m_clientRedirect(NotClientRedirect)
78 , m_shouldSendReferrer(MaybeSendReferrer) 84 , m_shouldSendReferrer(MaybeSendReferrer)
79 , m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldConten tSecurityPolicy) 85 , m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldConten tSecurityPolicy)
80 { 86 {
87 if (originDocument)
88 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
81 } 89 }
82 90
83 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const SubstituteData& substituteData) 91 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const SubstituteData& substituteData)
84 : m_originDocument(originDocument) 92 : m_originDocument(originDocument)
85 , m_resourceRequest(resourceRequest) 93 , m_resourceRequest(resourceRequest)
86 , m_substituteData(substituteData) 94 , m_substituteData(substituteData)
87 , m_lockBackForwardList(false) 95 , m_lockBackForwardList(false)
88 , m_clientRedirect(NotClientRedirect) 96 , m_clientRedirect(NotClientRedirect)
89 , m_shouldSendReferrer(MaybeSendReferrer) 97 , m_shouldSendReferrer(MaybeSendReferrer)
90 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) 98 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy )
91 { 99 {
100 if (originDocument)
101 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
92 } 102 }
93 103
94 Document* originDocument() const { return m_originDocument.get(); } 104 Document* originDocument() const { return m_originDocument.get(); }
95 105
96 ResourceRequest& resourceRequest() { return m_resourceRequest; } 106 ResourceRequest& resourceRequest() { return m_resourceRequest; }
97 const ResourceRequest& resourceRequest() const { return m_resourceRequest; } 107 const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
98 108
99 const AtomicString& frameName() const { return m_frameName; } 109 const AtomicString& frameName() const { return m_frameName; }
100 void setFrameName(const AtomicString& frameName) { m_frameName = frameName; } 110 void setFrameName(const AtomicString& frameName) { m_frameName = frameName; }
101 111
(...skipping 25 matching lines...) Expand all
127 ClientRedirectPolicy m_clientRedirect; 137 ClientRedirectPolicy m_clientRedirect;
128 RefPtrWillBeMember<Event> m_triggeringEvent; 138 RefPtrWillBeMember<Event> m_triggeringEvent;
129 RefPtrWillBeMember<FormState> m_formState; 139 RefPtrWillBeMember<FormState> m_formState;
130 ShouldSendReferrer m_shouldSendReferrer; 140 ShouldSendReferrer m_shouldSendReferrer;
131 ContentSecurityPolicyDisposition m_shouldCheckMainWorldContentSecurityPolicy ; 141 ContentSecurityPolicyDisposition m_shouldCheckMainWorldContentSecurityPolicy ;
132 }; 142 };
133 143
134 } 144 }
135 145
136 #endif // FrameLoadRequest_h 146 #endif // FrameLoadRequest_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/page/CreateWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698