diff options
| author | Steve Block <steveblock@google.com> | 2010-08-04 11:41:34 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-08-09 12:04:44 +0100 |
| commit | db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 (patch) | |
| tree | 9f793c5b0f5e1f2aca8247158920e2c4bf962bbf /WebKit/chromium/src/FrameLoaderClientImpl.cpp | |
| parent | bf916837aa84f1e4b00e6ed6268516c2acd27545 (diff) | |
| download | external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.zip external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.tar.gz external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.tar.bz2 | |
Merge WebKit at r64523 : Initial merge by git.
Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
Diffstat (limited to 'WebKit/chromium/src/FrameLoaderClientImpl.cpp')
| -rw-r--r-- | WebKit/chromium/src/FrameLoaderClientImpl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp index dae9348..b416e35 100644 --- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp +++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp @@ -1488,6 +1488,12 @@ PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver() { WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader( m_webFrame->frame()->loader()->activeDocumentLoader()); + if (!ds) { + // We can arrive here if a popstate event handler detaches this frame. + // FIXME: Remove this code once http://webkit.org/b/36202 is fixed. + ASSERT(!m_webFrame->frame()->page()); + return 0; + } return ds->releasePluginLoadObserver(); } |