| 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 374 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  385     ASSERT(m_sameOriginRequest || requestURL.pass().isEmpty()); |  385     ASSERT(m_sameOriginRequest || requestURL.pass().isEmpty()); | 
|  386  |  386  | 
|  387     ThreadableLoaderOptions options = m_options; |  387     ThreadableLoaderOptions options = m_options; | 
|  388     if (m_async) { |  388     if (m_async) { | 
|  389         if (m_actualRequest) { |  389         if (m_actualRequest) { | 
|  390             options.sniffContent = DoNotSniffContent; |  390             options.sniffContent = DoNotSniffContent; | 
|  391             options.dataBufferingPolicy = BufferData; |  391             options.dataBufferingPolicy = BufferData; | 
|  392         } |  392         } | 
|  393  |  393  | 
|  394         if (m_options.timeoutMilliseconds > 0) |  394         if (m_options.timeoutMilliseconds > 0) | 
|  395             m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0); |  395             m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0, 
     FROM_HERE); | 
|  396  |  396  | 
|  397         FetchRequest newRequest(request, m_options.initiator, options); |  397         FetchRequest newRequest(request, m_options.initiator, options); | 
|  398         ASSERT(!resource()); |  398         ASSERT(!resource()); | 
|  399         setResource(m_document->fetcher()->fetchRawResource(newRequest)); |  399         setResource(m_document->fetcher()->fetchRawResource(newRequest)); | 
|  400         if (resource() && resource()->loader()) { |  400         if (resource() && resource()->loader()) { | 
|  401             unsigned long identifier = resource()->identifier(); |  401             unsigned long identifier = resource()->identifier(); | 
|  402             InspectorInstrumentation::documentThreadableLoaderStartedLoadingForC
     lient(m_document, identifier, m_client); |  402             InspectorInstrumentation::documentThreadableLoaderStartedLoadingForC
     lient(m_document, identifier, m_client); | 
|  403         } |  403         } | 
|  404         return; |  404         return; | 
|  405     } |  405     } | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  455         return true; |  455         return true; | 
|  456     return m_document->contentSecurityPolicy()->allowConnectToSource(url); |  456     return m_document->contentSecurityPolicy()->allowConnectToSource(url); | 
|  457 } |  457 } | 
|  458  |  458  | 
|  459 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const |  459 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const | 
|  460 { |  460 { | 
|  461     return m_options.securityOrigin ? m_options.securityOrigin.get() : m_documen
     t->securityOrigin(); |  461     return m_options.securityOrigin ? m_options.securityOrigin.get() : m_documen
     t->securityOrigin(); | 
|  462 } |  462 } | 
|  463  |  463  | 
|  464 } // namespace WebCore |  464 } // namespace WebCore | 
| OLD | NEW |