2011-02-22 Anders Carlsson <andersca@apple.com>
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Feb 2011 00:42:06 +0000 (00:42 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Feb 2011 00:42:06 +0000 (00:42 +0000)
        Reviewed by Dan Bernstein.

        Rename WebProcess::shutdownIfPossible to WebProcess::terminateIfPossible
        https://bugs.webkit.org/show_bug.cgi?id=55008

        * WebProcess/Downloads/DownloadManager.cpp:
        (WebKit::DownloadManager::downloadFinished):
        * WebProcess/WebProcess.cpp:
        (WebKit::WebProcess::removeWebPage):
        (WebKit::WebProcess::terminateIfPossible):
        (WebKit::WebProcess::getSitesWithPluginData):
        * WebProcess/WebProcess.h:
        * WebProcess/gtk/WebProcessGtk.cpp:
        (WebKit::WebProcess::platformTerminate):
        * WebProcess/mac/WebProcessMac.mm:
        (WebKit::WebProcess::platformTerminate):
        * WebProcess/qt/WebProcessQt.cpp:
        (WebKit::WebProcess::platformTerminate):
        * WebProcess/win/WebProcessWin.cpp:
        (WebKit::WebProcess::platformTerminate):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79372 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/Downloads/DownloadManager.cpp
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/WebProcess.h
Source/WebKit2/WebProcess/gtk/WebProcessGtk.cpp
Source/WebKit2/WebProcess/mac/WebProcessMac.mm
Source/WebKit2/WebProcess/qt/WebProcessQt.cpp
Source/WebKit2/WebProcess/win/WebProcessWin.cpp

index 4396084..bb68f2f 100644 (file)
@@ -1,3 +1,26 @@
+2011-02-22  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Rename WebProcess::shutdownIfPossible to WebProcess::terminateIfPossible
+        https://bugs.webkit.org/show_bug.cgi?id=55008
+
+        * WebProcess/Downloads/DownloadManager.cpp:
+        (WebKit::DownloadManager::downloadFinished):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::removeWebPage):
+        (WebKit::WebProcess::terminateIfPossible):
+        (WebKit::WebProcess::getSitesWithPluginData):
+        * WebProcess/WebProcess.h:
+        * WebProcess/gtk/WebProcessGtk.cpp:
+        (WebKit::WebProcess::platformTerminate):
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::WebProcess::platformTerminate):
+        * WebProcess/qt/WebProcessQt.cpp:
+        (WebKit::WebProcess::platformTerminate):
+        * WebProcess/win/WebProcessWin.cpp:
+        (WebKit::WebProcess::platformTerminate):
+
 2011-02-22  Brady Eidson  <beidson@apple.com>
 
         Windows build-fix attempt.
index 1cb288e..4a96b11 100644 (file)
@@ -78,7 +78,7 @@ void DownloadManager::downloadFinished(Download* download)
 
     delete download;
 
-    WebProcess::shared().shutdownIfPossible();
+    WebProcess::shared().terminateIfPossible();
 }
 
 } // namespace WebKit
index e315555..fb179df 100644 (file)
@@ -460,8 +460,7 @@ void WebProcess::createWebPage(uint64_t pageID, const WebPageCreationParameters&
 void WebProcess::removeWebPage(uint64_t pageID)
 {
     m_pageMap.remove(pageID);
-
-    shutdownIfPossible();
+    terminateIfPossible();
 }
 
 bool WebProcess::isSeparateProcess() const
@@ -470,7 +469,7 @@ bool WebProcess::isSeparateProcess() const
     return m_runLoop == RunLoop::main();
 }
  
-void WebProcess::shutdownIfPossible()
+void WebProcess::terminateIfPossible()
 {
     if (!m_pageMap.isEmpty())
         return;
@@ -496,8 +495,7 @@ void WebProcess::shutdownIfPossible()
     m_connection->invalidate();
     m_connection = nullptr;
 
-    platformShutdown();
-
+    platformTerminate();
     m_runLoop->stop();
 }
 
@@ -683,7 +681,7 @@ void WebProcess::getSitesWithPluginData(const Vector<String>& pluginPaths, uint6
     copyToVector(sitesSet, sites);
 
     m_connection->send(Messages::WebContext::DidGetSitesWithPluginData(sites, callbackID), 0);
-    shutdownIfPossible();
+    terminateIfPossible();
 }
 
 void WebProcess::clearPluginSiteData(const Vector<String>& pluginPaths, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
index d830871..772d77f 100644 (file)
@@ -103,8 +103,8 @@ public:
     QNetworkAccessManager* networkAccessManager() { return m_networkAccessManager; }
 #endif
 
-    // Will shut down the web process if there are no live pages or downloads.
-    void shutdownIfPossible();
+    // Will terminate the web process if there are no live pages or downloads.
+    void terminateIfPossible();
 
     bool shouldUseCustomRepresentationForMIMEType(const String& mimeType) const { return m_mimeTypesWithCustomRepresentations.contains(mimeType); }
 
@@ -121,7 +121,7 @@ private:
 
     void initializeWebProcess(const WebProcessCreationParameters&, CoreIPC::ArgumentDecoder*);
     void platformInitializeWebProcess(const WebProcessCreationParameters&, CoreIPC::ArgumentDecoder*);
-    void platformShutdown();
+    void platformTerminate();
     void setShouldTrackVisitedLinks(bool);
     void registerURLSchemeAsEmptyDocument(const String&);
     void registerURLSchemeAsSecure(const String&) const;
index 804a34c..0deed68 100644 (file)
@@ -47,7 +47,7 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
     notImplemented();
 }
 
-void WebProcess::platformShutdown()
+void WebProcess::platformTerminate()
 {
 }
 
index fc06d2c..abd5d7f 100644 (file)
@@ -187,7 +187,7 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
     m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
 }
 
-void WebProcess::platformShutdown()
+void WebProcess::platformTerminate()
 {
 }
 
index c45ea32..459274c 100644 (file)
@@ -55,7 +55,7 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
 #endif
 }
 
-void WebProcess::platformShutdown()
+void WebProcess::platformTerminate()
 {
     delete m_networkAccessManager;
     m_networkAccessManager = 0;
index 44d4b13..58230d3 100644 (file)
@@ -121,7 +121,7 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
 #endif
 }
 
-void WebProcess::platformShutdown()
+void WebProcess::platformTerminate()
 {
 }