| OLD | NEW |
| 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 oldResource->removeClient(this); | 167 oldResource->removeClient(this); |
| 168 | 168 |
| 169 if (newResource) { | 169 if (newResource) { |
| 170 m_resource = newResource; | 170 m_resource = newResource; |
| 171 m_resource->addClient(this); | 171 m_resource->addClient(this); |
| 172 } | 172 } |
| 173 } | 173 } |
| 174 Member<RawResource> m_resource; | 174 Member<RawResource> m_resource; |
| 175 // End of ResourceOwner re-implementation, see above. | 175 // End of ResourceOwner re-implementation, see above. |
| 176 | 176 |
| 177 SecurityOrigin* getSecurityOrigin() const; | 177 const SecurityOrigin* getSecurityOrigin() const; |
| 178 Document& document() const; | 178 Document& document() const; |
| 179 | 179 |
| 180 ThreadableLoaderClient* m_client; | 180 ThreadableLoaderClient* m_client; |
| 181 Member<Document> m_document; | 181 Member<Document> m_document; |
| 182 | 182 |
| 183 const ThreadableLoaderOptions m_options; | 183 const ThreadableLoaderOptions m_options; |
| 184 // Some items may be overridden by m_forceDoNotAllowStoredCredentials | 184 // Some items may be overridden by m_forceDoNotAllowStoredCredentials |
| 185 // and m_securityOrigin. In such a case, build a ResourceLoaderOptions | 185 // and m_securityOrigin. In such a case, build a ResourceLoaderOptions |
| 186 // with up-to-date values from them and this variable, and use it. | 186 // with up-to-date values from them and this variable, and use it. |
| 187 const ResourceLoaderOptions m_resourceLoaderOptions; | 187 const ResourceLoaderOptions m_resourceLoaderOptions; |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 // header when following the redirect. | 232 // header when following the redirect. |
| 233 bool m_didRedirect; | 233 bool m_didRedirect; |
| 234 Referrer m_referrerAfterRedirect; | 234 Referrer m_referrerAfterRedirect; |
| 235 | 235 |
| 236 WeakPtrFactory<DocumentThreadableLoader> m_weakFactory; | 236 WeakPtrFactory<DocumentThreadableLoader> m_weakFactory; |
| 237 }; | 237 }; |
| 238 | 238 |
| 239 } // namespace blink | 239 } // namespace blink |
| 240 | 240 |
| 241 #endif // DocumentThreadableLoader_h | 241 #endif // DocumentThreadableLoader_h |
| OLD | NEW |