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 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
570 if (m_actualRequest) | 570 if (m_actualRequest) |
571 resourceLoaderOptions.dataBufferingPolicy = BufferData; | 571 resourceLoaderOptions.dataBufferingPolicy = BufferData; |
572 | 572 |
573 if (m_options.timeoutMilliseconds > 0) | 573 if (m_options.timeoutMilliseconds > 0) |
574 m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0,
FROM_HERE); | 574 m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0,
FROM_HERE); |
575 | 575 |
576 FetchRequest newRequest(request, m_options.initiator, resourceLoaderOpti
ons); | 576 FetchRequest newRequest(request, m_options.initiator, resourceLoaderOpti
ons); |
577 if (m_options.crossOriginRequestPolicy == AllowCrossOriginRequests) | 577 if (m_options.crossOriginRequestPolicy == AllowCrossOriginRequests) |
578 newRequest.setOriginRestriction(FetchRequest::NoOriginRestriction); | 578 newRequest.setOriginRestriction(FetchRequest::NoOriginRestriction); |
579 ASSERT(!resource()); | 579 ASSERT(!resource()); |
580 if (request.requestContext() == blink::WebURLRequest::RequestContextVide
o || request.requestContext() == blink::WebURLRequest::RequestContextAudio) | 580 if (request.requestContext() == WebURLRequest::RequestContextVideo || re
quest.requestContext() == WebURLRequest::RequestContextAudio) |
581 setResource(m_document.fetcher()->fetchMedia(newRequest)); | 581 setResource(m_document.fetcher()->fetchMedia(newRequest)); |
582 else | 582 else |
583 setResource(m_document.fetcher()->fetchRawResource(newRequest)); | 583 setResource(m_document.fetcher()->fetchRawResource(newRequest)); |
584 if (resource() && resource()->loader()) { | 584 if (resource() && resource()->loader()) { |
585 unsigned long identifier = resource()->identifier(); | 585 unsigned long identifier = resource()->identifier(); |
586 InspectorInstrumentation::documentThreadableLoaderStartedLoadingForC
lient(&m_document, identifier, m_client); | 586 InspectorInstrumentation::documentThreadableLoaderStartedLoadingForC
lient(&m_document, identifier, m_client); |
587 } | 587 } |
588 return; | 588 return; |
589 } | 589 } |
590 | 590 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 return DoNotAllowStoredCredentials; | 648 return DoNotAllowStoredCredentials; |
649 return m_resourceLoaderOptions.allowCredentials; | 649 return m_resourceLoaderOptions.allowCredentials; |
650 } | 650 } |
651 | 651 |
652 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const | 652 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const |
653 { | 653 { |
654 return m_securityOrigin ? m_securityOrigin.get() : m_document.securityOrigin
(); | 654 return m_securityOrigin ? m_securityOrigin.get() : m_document.securityOrigin
(); |
655 } | 655 } |
656 | 656 |
657 } // namespace blink | 657 } // namespace blink |
OLD | NEW |