| 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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 resourceLoaderOptions.dataBufferingPolicy = BufferData; | 419 resourceLoaderOptions.dataBufferingPolicy = BufferData; |
| 420 } | 420 } |
| 421 | 421 |
| 422 if (m_options.timeoutMilliseconds > 0) | 422 if (m_options.timeoutMilliseconds > 0) |
| 423 m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0,
FROM_HERE); | 423 m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0,
FROM_HERE); |
| 424 | 424 |
| 425 FetchRequest newRequest(request, m_options.initiator, resourceLoaderOpti
ons); | 425 FetchRequest newRequest(request, m_options.initiator, resourceLoaderOpti
ons); |
| 426 ASSERT(!resource()); | 426 ASSERT(!resource()); |
| 427 if (request.targetType() == ResourceRequest::TargetIsMedia) | 427 if (request.targetType() == ResourceRequest::TargetIsMedia) |
| 428 setResource(m_document.fetcher()->fetchMedia(newRequest)); | 428 setResource(m_document.fetcher()->fetchMedia(newRequest)); |
| 429 else if (request.targetType() == ResourceRequest::TargetIsXHR) |
| 430 setResource(m_document.fetcher()->fetchXMLHttpRequest(newRequest)); |
| 429 else | 431 else |
| 430 setResource(m_document.fetcher()->fetchRawResource(newRequest)); | 432 setResource(m_document.fetcher()->fetchRawResource(newRequest)); |
| 431 if (resource() && resource()->loader()) { | 433 if (resource() && resource()->loader()) { |
| 432 unsigned long identifier = resource()->identifier(); | 434 unsigned long identifier = resource()->identifier(); |
| 433 InspectorInstrumentation::documentThreadableLoaderStartedLoadingForC
lient(&m_document, identifier, m_client); | 435 InspectorInstrumentation::documentThreadableLoaderStartedLoadingForC
lient(&m_document, identifier, m_client); |
| 434 } | 436 } |
| 435 return; | 437 return; |
| 436 } | 438 } |
| 437 | 439 |
| 438 FetchRequest fetchRequest(request, m_options.initiator, resourceLoaderOption
s); | 440 FetchRequest fetchRequest(request, m_options.initiator, resourceLoaderOption
s); |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 return DoNotAllowStoredCredentials; | 495 return DoNotAllowStoredCredentials; |
| 494 return m_resourceLoaderOptions.allowCredentials; | 496 return m_resourceLoaderOptions.allowCredentials; |
| 495 } | 497 } |
| 496 | 498 |
| 497 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const | 499 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const |
| 498 { | 500 { |
| 499 return m_securityOrigin ? m_securityOrigin.get() : m_document.securityOrigin
(); | 501 return m_securityOrigin ? m_securityOrigin.get() : m_document.securityOrigin
(); |
| 500 } | 502 } |
| 501 | 503 |
| 502 } // namespace WebCore | 504 } // namespace WebCore |
| OLD | NEW |