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

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: 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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 // Create a ResourceLoaderOptions for preflight. 281 // Create a ResourceLoaderOptions for preflight.
282 ResourceLoaderOptions preflightOptions = m_actualOptions; 282 ResourceLoaderOptions preflightOptions = m_actualOptions;
283 preflightOptions.allowCredentials = DoNotAllowStoredCredentials; 283 preflightOptions.allowCredentials = DoNotAllowStoredCredentials;
284 loadRequest(preflightRequest, preflightOptions); 284 loadRequest(preflightRequest, preflightOptions);
285 } 285 }
286 } 286 }
287 } 287 }
288 288
289 DocumentThreadableLoader::~DocumentThreadableLoader() 289 DocumentThreadableLoader::~DocumentThreadableLoader()
290 { 290 {
291 clearResource();
haraken 2016/01/12 00:22:52 Add a TODO to remove this once DocumentThreadableL
Nate Chapin 2016/01/13 20:36:33 Done.
291 } 292 }
292 293
293 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds ) 294 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds )
294 { 295 {
295 ASSERT(m_async); 296 ASSERT(m_async);
296 297
297 // |m_requestStartedSeconds| == 0.0 indicates loading is already finished 298 // |m_requestStartedSeconds| == 0.0 indicates loading is already finished
298 // and |m_timeoutTimer| is already stopped, and thus we do nothing for such 299 // and |m_timeoutTimer| is already stopped, and thus we do nothing for such
299 // cases. See https://crbug.com/551663 for details. 300 // cases. See https://crbug.com/551663 for details.
300 if (m_requestStartedSeconds <= 0.0) 301 if (m_requestStartedSeconds <= 0.0)
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 return m_securityOrigin ? m_securityOrigin.get() : document().securityOrigin (); 891 return m_securityOrigin ? m_securityOrigin.get() : document().securityOrigin ();
891 } 892 }
892 893
893 Document& DocumentThreadableLoader::document() const 894 Document& DocumentThreadableLoader::document() const
894 { 895 {
895 ASSERT(m_document); 896 ASSERT(m_document);
896 return *m_document; 897 return *m_document;
897 } 898 }
898 899
899 } // namespace blink 900 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698