diff options
Diffstat (limited to 'webkit/glue')
| -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 |