Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.

See http://trac.webkit.org/changeset/48001

Change-Id: I11d6bae61de1f528ed8ee117c0260c78dccbd502

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 015f9a0..109863d 100644 (file)
--- 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