OLD | NEW |
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 Loading... |
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 // TODO(oilpan): Remove this once DocumentThreadableLoader is once again a R
esourceOwner. |
| 292 clearResource(); |
291 } | 293 } |
292 | 294 |
293 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds
) | 295 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds
) |
294 { | 296 { |
295 ASSERT(m_async); | 297 ASSERT(m_async); |
296 | 298 |
297 // |m_requestStartedSeconds| == 0.0 indicates loading is already finished | 299 // |m_requestStartedSeconds| == 0.0 indicates loading is already finished |
298 // and |m_timeoutTimer| is already stopped, and thus we do nothing for such | 300 // and |m_timeoutTimer| is already stopped, and thus we do nothing for such |
299 // cases. See https://crbug.com/551663 for details. | 301 // cases. See https://crbug.com/551663 for details. |
300 if (m_requestStartedSeconds <= 0.0) | 302 if (m_requestStartedSeconds <= 0.0) |
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
892 return m_securityOrigin ? m_securityOrigin.get() : document().securityOrigin
(); | 894 return m_securityOrigin ? m_securityOrigin.get() : document().securityOrigin
(); |
893 } | 895 } |
894 | 896 |
895 Document& DocumentThreadableLoader::document() const | 897 Document& DocumentThreadableLoader::document() const |
896 { | 898 { |
897 ASSERT(m_document); | 899 ASSERT(m_document); |
898 return *m_document; | 900 return *m_document; |
899 } | 901 } |
900 | 902 |
901 } // namespace blink | 903 } // namespace blink |
OLD | NEW |