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

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

Issue 1569273004: Move ResourceOwner on to the oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win_chromium_compile_dbg_ng is the worst Created 4 years, 11 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 // Create a ResourceLoaderOptions for preflight. 276 // Create a ResourceLoaderOptions for preflight.
277 ResourceLoaderOptions preflightOptions = m_actualOptions; 277 ResourceLoaderOptions preflightOptions = m_actualOptions;
278 preflightOptions.allowCredentials = DoNotAllowStoredCredentials; 278 preflightOptions.allowCredentials = DoNotAllowStoredCredentials;
279 loadRequest(preflightRequest, preflightOptions); 279 loadRequest(preflightRequest, preflightOptions);
280 } 280 }
281 } 281 }
282 } 282 }
283 283
284 DocumentThreadableLoader::~DocumentThreadableLoader() 284 DocumentThreadableLoader::~DocumentThreadableLoader()
285 { 285 {
286 // TODO(oilpan): Remove this once DocumentThreadableLoader is once again a R esourceOwner.
287 clearResource();
286 } 288 }
287 289
288 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds ) 290 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds )
289 { 291 {
290 ASSERT(m_async); 292 ASSERT(m_async);
291 293
292 // |m_requestStartedSeconds| == 0.0 indicates loading is already finished 294 // |m_requestStartedSeconds| == 0.0 indicates loading is already finished
293 // and |m_timeoutTimer| is already stopped, and thus we do nothing for such 295 // and |m_timeoutTimer| is already stopped, and thus we do nothing for such
294 // cases. See https://crbug.com/551663 for details. 296 // cases. See https://crbug.com/551663 for details.
295 if (m_requestStartedSeconds <= 0.0) 297 if (m_requestStartedSeconds <= 0.0)
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 return m_securityOrigin ? m_securityOrigin.get() : document().securityOrigin (); 889 return m_securityOrigin ? m_securityOrigin.get() : document().securityOrigin ();
888 } 890 }
889 891
890 Document& DocumentThreadableLoader::document() const 892 Document& DocumentThreadableLoader::document() const
891 { 893 {
892 ASSERT(m_document); 894 ASSERT(m_document);
893 return *m_document; 895 return *m_document;
894 } 896 }
895 897
896 } // namespace blink 898 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h ('k') | third_party/WebKit/Source/core/loader/LinkLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698