From d867a0e9b483e848580a3a98f73a8352884eac2b Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 12 Oct 2009 11:21:24 +0100 Subject: [PATCH] Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum. See http://trac.webkit.org/changeset/48001 Change-Id: I11d6bae61de1f528ed8ee117c0260c78dccbd502 --- WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index 015f9a0a2..109863dff 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 -- 2.11.0