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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 ResourceLoaderOptions preflightOptions = m_actualOptions; | 334 ResourceLoaderOptions preflightOptions = m_actualOptions; |
335 preflightOptions.allowCredentials = DoNotAllowStoredCredentials; | 335 preflightOptions.allowCredentials = DoNotAllowStoredCredentials; |
336 loadRequest(preflightRequest, preflightOptions); | 336 loadRequest(preflightRequest, preflightOptions); |
337 } | 337 } |
338 } | 338 } |
339 } | 339 } |
340 | 340 |
341 DocumentThreadableLoader::~DocumentThreadableLoader() | 341 DocumentThreadableLoader::~DocumentThreadableLoader() |
342 { | 342 { |
343 CHECK(!m_client); | 343 CHECK(!m_client); |
344 DCHECK(!resource()); | 344 DCHECK(!m_resource); |
345 } | 345 } |
346 | 346 |
347 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds
) | 347 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds
) |
348 { | 348 { |
349 ASSERT(m_async); | 349 ASSERT(m_async); |
350 | 350 |
351 // |m_requestStartedSeconds| == 0.0 indicates loading is already finished | 351 // |m_requestStartedSeconds| == 0.0 indicates loading is already finished |
352 // and |m_timeoutTimer| is already stopped, and thus we do nothing for such | 352 // and |m_timeoutTimer| is already stopped, and thus we do nothing for such |
353 // cases. See https://crbug.com/551663 for details. | 353 // cases. See https://crbug.com/551663 for details. |
354 if (m_requestStartedSeconds <= 0.0) | 354 if (m_requestStartedSeconds <= 0.0) |
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
964 } | 964 } |
965 | 965 |
966 Document& DocumentThreadableLoader::document() const | 966 Document& DocumentThreadableLoader::document() const |
967 { | 967 { |
968 ASSERT(m_document); | 968 ASSERT(m_document); |
969 return *m_document; | 969 return *m_document; |
970 } | 970 } |
971 | 971 |
972 DEFINE_TRACE(DocumentThreadableLoader) | 972 DEFINE_TRACE(DocumentThreadableLoader) |
973 { | 973 { |
| 974 visitor->trace(m_resource); |
974 visitor->trace(m_document); | 975 visitor->trace(m_document); |
975 ThreadableLoader::trace(visitor); | 976 ThreadableLoader::trace(visitor); |
976 ResourceOwner<RawResource>::trace(visitor); | |
977 } | 977 } |
978 | 978 |
979 } // namespace blink | 979 } // namespace blink |
OLD | NEW |