| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2009, 2012 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2010 Apple Inc. All rights reserved. | 3 * Copyright (C) 2010 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2011, Code Aurora Forum. All rights reserved. | 4 * Copyright (C) 2011, Code Aurora Forum. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 (origin->canRequestNoSuborigin(m_currentURL) || m_withCredentials) | 166 (origin->canRequestNoSuborigin(m_currentURL) || m_withCredentials) |
| 167 ? AllowStoredCredentials | 167 ? AllowStoredCredentials |
| 168 : DoNotAllowStoredCredentials; | 168 : DoNotAllowStoredCredentials; |
| 169 resourceLoaderOptions.credentialsRequested = | 169 resourceLoaderOptions.credentialsRequested = |
| 170 m_withCredentials ? ClientRequestedCredentials | 170 m_withCredentials ? ClientRequestedCredentials |
| 171 : ClientDidNotRequestCredentials; | 171 : ClientDidNotRequestCredentials; |
| 172 resourceLoaderOptions.dataBufferingPolicy = DoNotBufferData; | 172 resourceLoaderOptions.dataBufferingPolicy = DoNotBufferData; |
| 173 resourceLoaderOptions.securityOrigin = origin; | 173 resourceLoaderOptions.securityOrigin = origin; |
| 174 | 174 |
| 175 InspectorInstrumentation::willSendEventSourceRequest(&executionContext, this); | 175 InspectorInstrumentation::willSendEventSourceRequest(&executionContext, this); |
| 176 // TODO(yhirano): Remove this CHECK once https://crbug.com/667254 is fixed. |
| 177 CHECK(!m_loader); |
| 176 // InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient | 178 // InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient |
| 177 // will be called synchronously. | 179 // will be called synchronously. |
| 178 m_loader = ThreadableLoader::create(executionContext, this, options, | 180 m_loader = ThreadableLoader::create(executionContext, this, options, |
| 179 resourceLoaderOptions); | 181 resourceLoaderOptions); |
| 180 m_loader->start(request); | 182 m_loader->start(request); |
| 181 } | 183 } |
| 182 | 184 |
| 183 void EventSource::networkRequestEnded() { | 185 void EventSource::networkRequestEnded() { |
| 184 InspectorInstrumentation::didFinishEventSourceRequest(getExecutionContext(), | 186 InspectorInstrumentation::didFinishEventSourceRequest(getExecutionContext(), |
| 185 this); | 187 this); |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 | 378 |
| 377 DEFINE_TRACE(EventSource) { | 379 DEFINE_TRACE(EventSource) { |
| 378 visitor->trace(m_parser); | 380 visitor->trace(m_parser); |
| 379 visitor->trace(m_loader); | 381 visitor->trace(m_loader); |
| 380 EventTargetWithInlineData::trace(visitor); | 382 EventTargetWithInlineData::trace(visitor); |
| 381 ContextLifecycleObserver::trace(visitor); | 383 ContextLifecycleObserver::trace(visitor); |
| 382 EventSourceParser::Client::trace(visitor); | 384 EventSourceParser::Client::trace(visitor); |
| 383 } | 385 } |
| 384 | 386 |
| 385 } // namespace blink | 387 } // namespace blink |
| OLD | NEW |