diff options
| author | Steve Block <steveblock@google.com> | 2009-10-12 11:21:24 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:06 +0100 |
| commit | d867a0e9b483e848580a3a98f73a8352884eac2b (patch) | |
| tree | 3c4567f51ac74b9fb5c6d95ba21ea7c40378c5ab /WebKit/android/WebCoreSupport | |
| parent | 035acba057f2c7a0f9dbdf27af5c67f80f1614f2 (diff) | |
| download | external_webkit-d867a0e9b483e848580a3a98f73a8352884eac2b.zip external_webkit-d867a0e9b483e848580a3a98f73a8352884eac2b.tar.gz external_webkit-d867a0e9b483e848580a3a98f73a8352884eac2b.tar.bz2 | |
Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.
See http://trac.webkit.org/changeset/48001
Change-Id: I11d6bae61de1f528ed8ee117c0260c78dccbd502
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index 015f9a0..109863d 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -185,7 +185,7 @@ void ChromeClientAndroid::closeWindowSoon() // This will prevent javascript cross-scripting during unload page->setGroupName(String()); // Stop loading but do not send the unload event - mainFrame->loader()->stopLoading(false); + mainFrame->loader()->stopLoading(UnloadEventPolicyNone); // Cancel all pending loaders mainFrame->loader()->stopAllLoaders(); // Remove all event listeners so that no javascript can execute as a result |