diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/page/EventSource.cpp | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/page/EventSource.cpp')
| -rw-r--r-- | WebCore/page/EventSource.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/page/EventSource.cpp b/WebCore/page/EventSource.cpp index 5e3141d..a7c715a 100644 --- a/WebCore/page/EventSource.cpp +++ b/WebCore/page/EventSource.cpp @@ -116,9 +116,6 @@ void EventSource::connect() m_loader = ThreadableLoader::create(scriptExecutionContext(), this, request, options); m_requestInFlight = true; - - if (!scriptExecutionContext()->isWorkerContext()) - cache()->loader()->nonCacheRequestInFlight(m_url); } void EventSource::endRequest() @@ -128,9 +125,6 @@ void EventSource::endRequest() if (!m_failSilently) dispatchEvent(Event::create(eventNames().errorEvent, false, false)); - if (!scriptExecutionContext()->isWorkerContext()) - cache()->loader()->nonCacheRequestComplete(m_url); - if (m_state != CLOSED) scheduleReconnect(); else |