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

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

Issue 1232223002: Rename LockBackForwardList to ReplaceCurrentItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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
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 23 matching lines...) Expand all
34 #include "core/loader/FrameLoaderTypes.h" 34 #include "core/loader/FrameLoaderTypes.h"
35 #include "platform/network/ResourceRequest.h" 35 #include "platform/network/ResourceRequest.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
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_replacesCurrentItem(false)
Charlie Reis 2015/07/10 22:51:14 I went with "replaces" on the request object itsel
Nate Chapin 2015/07/13 23:24:15 It's sufficiently pedantic that I'm not confident
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) 49 if (originDocument)
50 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url())); 50 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
51 } 51 }
52 52
53 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest) 53 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest)
54 : m_originDocument(originDocument) 54 : m_originDocument(originDocument)
55 , m_resourceRequest(resourceRequest) 55 , m_resourceRequest(resourceRequest)
56 , m_lockBackForwardList(false) 56 , m_replacesCurrentItem(false)
57 , m_clientRedirect(NotClientRedirect) 57 , m_clientRedirect(NotClientRedirect)
58 , m_shouldSendReferrer(MaybeSendReferrer) 58 , m_shouldSendReferrer(MaybeSendReferrer)
59 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) 59 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy )
60 { 60 {
61 if (originDocument) 61 if (originDocument)
62 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url())); 62 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
63 } 63 }
64 64
65 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName) 65 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName)
66 : m_originDocument(originDocument) 66 : m_originDocument(originDocument)
67 , m_resourceRequest(resourceRequest) 67 , m_resourceRequest(resourceRequest)
68 , m_frameName(frameName) 68 , m_frameName(frameName)
69 , m_lockBackForwardList(false) 69 , m_replacesCurrentItem(false)
70 , m_clientRedirect(NotClientRedirect) 70 , m_clientRedirect(NotClientRedirect)
71 , m_shouldSendReferrer(MaybeSendReferrer) 71 , m_shouldSendReferrer(MaybeSendReferrer)
72 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) 72 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy )
73 { 73 {
74 if (originDocument) 74 if (originDocument)
75 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url())); 75 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
76 } 76 }
77 77
78 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)
79 : m_originDocument(originDocument) 79 : m_originDocument(originDocument)
80 , m_resourceRequest(resourceRequest) 80 , m_resourceRequest(resourceRequest)
81 , m_frameName(frameName) 81 , m_frameName(frameName)
82 , m_lockBackForwardList(false) 82 , m_replacesCurrentItem(false)
83 , m_clientRedirect(NotClientRedirect) 83 , m_clientRedirect(NotClientRedirect)
84 , m_shouldSendReferrer(MaybeSendReferrer) 84 , m_shouldSendReferrer(MaybeSendReferrer)
85 , m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldConten tSecurityPolicy) 85 , m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldConten tSecurityPolicy)
86 { 86 {
87 if (originDocument) 87 if (originDocument)
88 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url())); 88 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
89 } 89 }
90 90
91 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const SubstituteData& substituteData) 91 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const SubstituteData& substituteData)
92 : m_originDocument(originDocument) 92 : m_originDocument(originDocument)
93 , m_resourceRequest(resourceRequest) 93 , m_resourceRequest(resourceRequest)
94 , m_substituteData(substituteData) 94 , m_substituteData(substituteData)
95 , m_lockBackForwardList(false) 95 , m_replacesCurrentItem(false)
96 , m_clientRedirect(NotClientRedirect) 96 , m_clientRedirect(NotClientRedirect)
97 , m_shouldSendReferrer(MaybeSendReferrer) 97 , m_shouldSendReferrer(MaybeSendReferrer)
98 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) 98 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy )
99 { 99 {
100 if (originDocument) 100 if (originDocument)
101 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url())); 101 m_resourceRequest.setRequestorOrigin(SecurityOrigin::create(originDo cument->url()));
102 } 102 }
103 103
104 Document* originDocument() const { return m_originDocument.get(); } 104 Document* originDocument() const { return m_originDocument.get(); }
105 105
106 ResourceRequest& resourceRequest() { return m_resourceRequest; } 106 ResourceRequest& resourceRequest() { return m_resourceRequest; }
107 const ResourceRequest& resourceRequest() const { return m_resourceRequest; } 107 const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
108 108
109 const AtomicString& frameName() const { return m_frameName; } 109 const AtomicString& frameName() const { return m_frameName; }
110 void setFrameName(const AtomicString& frameName) { m_frameName = frameName; } 110 void setFrameName(const AtomicString& frameName) { m_frameName = frameName; }
111 111
112 const SubstituteData& substituteData() const { return m_substituteData; } 112 const SubstituteData& substituteData() const { return m_substituteData; }
113 113
114 bool lockBackForwardList() const { return m_lockBackForwardList; } 114 bool replacesCurrentItem() const { return m_replacesCurrentItem; }
115 void setLockBackForwardList(bool lockBackForwardList) { m_lockBackForwardLis t = lockBackForwardList; } 115 void setReplacesCurrentItem(bool replacesCurrentItem) { m_replacesCurrentIte m = replacesCurrentItem; }
116 116
117 ClientRedirectPolicy clientRedirect() const { return m_clientRedirect; } 117 ClientRedirectPolicy clientRedirect() const { return m_clientRedirect; }
118 void setClientRedirect(ClientRedirectPolicy clientRedirect) { m_clientRedire ct = clientRedirect; } 118 void setClientRedirect(ClientRedirectPolicy clientRedirect) { m_clientRedire ct = clientRedirect; }
119 119
120 Event* triggeringEvent() const { return m_triggeringEvent.get(); } 120 Event* triggeringEvent() const { return m_triggeringEvent.get(); }
121 void setTriggeringEvent(PassRefPtrWillBeRawPtr<Event> triggeringEvent) { m_t riggeringEvent = triggeringEvent; } 121 void setTriggeringEvent(PassRefPtrWillBeRawPtr<Event> triggeringEvent) { m_t riggeringEvent = triggeringEvent; }
122 122
123 HTMLFormElement* form() const { return m_form.get(); } 123 HTMLFormElement* form() const { return m_form.get(); }
124 void setForm(PassRefPtrWillBeRawPtr<HTMLFormElement> form) { m_form = form; } 124 void setForm(PassRefPtrWillBeRawPtr<HTMLFormElement> form) { m_form = form; }
125 125
126 ShouldSendReferrer shouldSendReferrer() const { return m_shouldSendReferrer; } 126 ShouldSendReferrer shouldSendReferrer() const { return m_shouldSendReferrer; }
127 void setShouldSendReferrer(ShouldSendReferrer shouldSendReferrer) { m_should SendReferrer = shouldSendReferrer; } 127 void setShouldSendReferrer(ShouldSendReferrer shouldSendReferrer) { m_should SendReferrer = shouldSendReferrer; }
128 128
129 ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy() const { return m_shouldCheckMainWorldContentSecurityPolicy; } 129 ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy() const { return m_shouldCheckMainWorldContentSecurityPolicy; }
130 130
131 private: 131 private:
132 RefPtrWillBeMember<Document> m_originDocument; 132 RefPtrWillBeMember<Document> m_originDocument;
133 ResourceRequest m_resourceRequest; 133 ResourceRequest m_resourceRequest;
134 AtomicString m_frameName; 134 AtomicString m_frameName;
135 SubstituteData m_substituteData; 135 SubstituteData m_substituteData;
136 bool m_lockBackForwardList; 136 bool m_replacesCurrentItem;
137 ClientRedirectPolicy m_clientRedirect; 137 ClientRedirectPolicy m_clientRedirect;
138 RefPtrWillBeMember<Event> m_triggeringEvent; 138 RefPtrWillBeMember<Event> m_triggeringEvent;
139 RefPtrWillBeMember<HTMLFormElement> m_form; 139 RefPtrWillBeMember<HTMLFormElement> m_form;
140 ShouldSendReferrer m_shouldSendReferrer; 140 ShouldSendReferrer m_shouldSendReferrer;
141 ContentSecurityPolicyDisposition m_shouldCheckMainWorldContentSecurityPolicy ; 141 ContentSecurityPolicyDisposition m_shouldCheckMainWorldContentSecurityPolicy ;
142 }; 142 };
143 143
144 } 144 }
145 145
146 #endif // FrameLoadRequest_h 146 #endif // FrameLoadRequest_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698