diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/loader/NetscapePlugInStreamLoader.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/loader/NetscapePlugInStreamLoader.cpp')
| -rw-r--r-- | WebCore/loader/NetscapePlugInStreamLoader.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/loader/NetscapePlugInStreamLoader.cpp b/WebCore/loader/NetscapePlugInStreamLoader.cpp index e12ed07..9d0e81b 100644 --- a/WebCore/loader/NetscapePlugInStreamLoader.cpp +++ b/WebCore/loader/NetscapePlugInStreamLoader.cpp @@ -119,6 +119,11 @@ void NetscapePlugInStreamLoader::didCancel(const ResourceError& error) m_client->didFail(this, error); + // If calling didFail spins the run loop the stream loader can reach the terminal state. + // If that's the case we just return early. + if (reachedTerminalState()) + return; + // We need to remove the stream loader after the call to didFail, since didFail can // spawn a new run loop and if the loader has been removed it won't be deferred when // the document loader is asked to defer loading. |