diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 02:44:29 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 02:44:29 +0000 |
| commit | 0be9a8a8c2a92ef44712e540d063877919abfa93 (patch) | |
| tree | 26c33b44984727d880e8cf3e572ba8803404115e | |
| parent | 1fab845897104bac4d4791834290882ccf4ea44d (diff) | |
| download | chromium_src-0be9a8a8c2a92ef44712e540d063877919abfa93.zip chromium_src-0be9a8a8c2a92ef44712e540d063877919abfa93.tar.gz chromium_src-0be9a8a8c2a92ef44712e540d063877919abfa93.tar.bz2 | |
Roll WebKit revision 48001.
* Use the new UnloadEventPolicy when calling FrameLoader::stopLoading(...)
TBR=darin,victorw
BUG=none
TEST= none
Review URL: http://codereview.chromium.org/194006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25294 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "47997", + "webkit_revision": "48001", } diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 1324e34..a1cafc6 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -809,7 +809,7 @@ void WebFrameImpl::stopLoading() { // TODO(darin): Figure out what we should really do here. It seems like a // bug that FrameLoader::stopLoading doesn't call stopAllLoaders. frame_->loader()->stopAllLoaders(); - frame_->loader()->stopLoading(false); + frame_->loader()->stopLoading(WebCore::UnloadEventPolicyNone); } WebDataSource* WebFrameImpl::provisionalDataSource() const { |