diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 15:30:17 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 15:30:17 +0000 |
| commit | 27b1a6024424c7d5da7c6ca13c5c01d440ea4cff (patch) | |
| tree | f595759f6501c49640a4c0e7179becbc44345fb7 /webkit/glue/webframeloaderclient_impl.cc | |
| parent | c02b7c98f49e94910d622162455293e52841089e (diff) | |
| download | chromium_src-27b1a6024424c7d5da7c6ca13c5c01d440ea4cff.zip chromium_src-27b1a6024424c7d5da7c6ca13c5c01d440ea4cff.tar.gz chromium_src-27b1a6024424c7d5da7c6ca13c5c01d440ea4cff.tar.bz2 | |
Allow Frame.cpp to be unforked.
BUG=11263
TEST=Go to any page and then click on a link to navigate to a new page.
Review URL: http://codereview.chromium.org/99263
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframeloaderclient_impl.cc')
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 0521da6..24843ba 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -154,7 +154,13 @@ void WebFrameLoaderClient::detachedFromParent2() { } void WebFrameLoaderClient::detachedFromParent3() { - // Nothing to do here. + // Close down the proxy. The purpose of this change is to make the + // call to ScriptController::clearWindowShell a no-op when called from + // Frame::pageDestroyed. Without this change, this call to clearWindowShell + // will cause a crash. If you remove/modify this, just ensure that you can + // go to a page and then navigate to a new page without getting any asserts + // or crashes. + webframe_->frame()->script()->proxy()->clearForClose(); } // This function is responsible for associating the |identifier| with a given |