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

Side by Side Diff: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013, Intel Corporation 3 * Copyright (C) 2013, Intel Corporation
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // returns allowCredentials value of m_resourceLoaderOptions. 146 // returns allowCredentials value of m_resourceLoaderOptions.
147 StoredCredentials effectiveAllowCredentials() const; 147 StoredCredentials effectiveAllowCredentials() const;
148 148
149 // TODO(oilpan): DocumentThreadableLoader used to be a ResourceOwner, 149 // TODO(oilpan): DocumentThreadableLoader used to be a ResourceOwner,
150 // but ResourceOwner was moved onto the oilpan heap before 150 // but ResourceOwner was moved onto the oilpan heap before
151 // DocumentThreadableLoader was ready. When DocumentThreadableLoader 151 // DocumentThreadableLoader was ready. When DocumentThreadableLoader
152 // moves onto the oilpan heap, make it a ResourceOwner again and remove 152 // moves onto the oilpan heap, make it a ResourceOwner again and remove
153 // this re-implementation of ResourceOwner. 153 // this re-implementation of ResourceOwner.
154 RawResource* resource() const { return m_resource.get(); } 154 RawResource* resource() const { return m_resource.get(); }
155 void clearResource() { setResource(nullptr); } 155 void clearResource() { setResource(nullptr); }
156 void setResource(const PassRefPtrWillBeRawPtr<RawResource>& newResource) 156 void setResource(const RawPtr<RawResource>& newResource)
157 { 157 {
158 if (newResource == m_resource) 158 if (newResource == m_resource)
159 return; 159 return;
160 160
161 if (PassRefPtrWillBeRawPtr<RawResource> oldResource = m_resource.rel ease()) 161 if (RawPtr<RawResource> oldResource = m_resource.release())
162 oldResource->removeClient(this); 162 oldResource->removeClient(this);
163 163
164 if (newResource) { 164 if (newResource) {
165 m_resource = newResource; 165 m_resource = newResource;
166 m_resource->addClient(this); 166 m_resource->addClient(this);
167 } 167 }
168 } 168 }
169 RefPtrWillBePersistent<RawResource> m_resource; 169 Persistent<RawResource> m_resource;
170 // End of ResourceOwner re-implementation, see above. 170 // End of ResourceOwner re-implementation, see above.
171 171
172 SecurityOrigin* securityOrigin() const; 172 SecurityOrigin* securityOrigin() const;
173 Document& document() const; 173 Document& document() const;
174 174
175 ThreadableLoaderClient* m_client; 175 ThreadableLoaderClient* m_client;
176 RawPtrWillBeWeakPersistent<Document> m_document; 176 WeakPersistent<Document> m_document;
177 177
178 const ThreadableLoaderOptions m_options; 178 const ThreadableLoaderOptions m_options;
179 // Some items may be overridden by m_forceDoNotAllowStoredCredentials 179 // Some items may be overridden by m_forceDoNotAllowStoredCredentials
180 // and m_securityOrigin. In such a case, build a ResourceLoaderOptions 180 // and m_securityOrigin. In such a case, build a ResourceLoaderOptions
181 // with up-to-date values from them and this variable, and use it. 181 // with up-to-date values from them and this variable, and use it.
182 const ResourceLoaderOptions m_resourceLoaderOptions; 182 const ResourceLoaderOptions m_resourceLoaderOptions;
183 183
184 bool m_forceDoNotAllowStoredCredentials; 184 bool m_forceDoNotAllowStoredCredentials;
185 RefPtr<SecurityOrigin> m_securityOrigin; 185 RefPtr<SecurityOrigin> m_securityOrigin;
186 186
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // But this value is not the max number of total redirects allowed, 219 // But this value is not the max number of total redirects allowed,
220 // because same-origin redirects are not counted here. 220 // because same-origin redirects are not counted here.
221 int m_corsRedirectLimit; 221 int m_corsRedirectLimit;
222 222
223 const WebURLRequest::FetchRedirectMode m_redirectMode; 223 const WebURLRequest::FetchRedirectMode m_redirectMode;
224 }; 224 };
225 225
226 } // namespace blink 226 } // namespace blink
227 227
228 #endif // DocumentThreadableLoader_h 228 #endif // DocumentThreadableLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698