| 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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 if (m_actualRequest) { | 417 if (m_actualRequest) { |
| 418 resourceLoaderOptions.sniffContent = DoNotSniffContent; | 418 resourceLoaderOptions.sniffContent = DoNotSniffContent; |
| 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.requestContext() == ResourceRequest::VideoContext || request
.requestContext() == ResourceRequest::AudioContext) |
| 428 setResource(m_document.fetcher()->fetchMedia(newRequest)); | 428 setResource(m_document.fetcher()->fetchMedia(newRequest)); |
| 429 else | 429 else |
| 430 setResource(m_document.fetcher()->fetchRawResource(newRequest)); | 430 setResource(m_document.fetcher()->fetchRawResource(newRequest)); |
| 431 if (resource() && resource()->loader()) { | 431 if (resource() && resource()->loader()) { |
| 432 unsigned long identifier = resource()->identifier(); | 432 unsigned long identifier = resource()->identifier(); |
| 433 InspectorInstrumentation::documentThreadableLoaderStartedLoadingForC
lient(&m_document, identifier, m_client); | 433 InspectorInstrumentation::documentThreadableLoaderStartedLoadingForC
lient(&m_document, identifier, m_client); |
| 434 } | 434 } |
| 435 return; | 435 return; |
| 436 } | 436 } |
| 437 | 437 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 return DoNotAllowStoredCredentials; | 493 return DoNotAllowStoredCredentials; |
| 494 return m_resourceLoaderOptions.allowCredentials; | 494 return m_resourceLoaderOptions.allowCredentials; |
| 495 } | 495 } |
| 496 | 496 |
| 497 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const | 497 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const |
| 498 { | 498 { |
| 499 return m_securityOrigin ? m_securityOrigin.get() : m_document.securityOrigin
(); | 499 return m_securityOrigin ? m_securityOrigin.get() : m_document.securityOrigin
(); |
| 500 } | 500 } |
| 501 | 501 |
| 502 } // namespace WebCore | 502 } // namespace WebCore |
| OLD | NEW |