Log Message
[GTK] Invalidate the ProcessLauncher when the process is terminated before it has finished launching https://bugs.webkit.org/show_bug.cgi?id=117412
Reviewed by Anders Carlsson. * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp: (WebKit::ProcessLauncher::terminateProcess): If process is still launching just invalidate the launcher. Reset the process identifier after killing the process.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (151507 => 151508)
--- trunk/Source/WebKit2/ChangeLog 2013-06-12 17:11:41 UTC (rev 151507)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-12 17:17:42 UTC (rev 151508)
@@ -1,3 +1,15 @@
+2013-06-12 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Invalidate the ProcessLauncher when the process is terminated before it has finished launching
+ https://bugs.webkit.org/show_bug.cgi?id=117412
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+ (WebKit::ProcessLauncher::terminateProcess): If process is still
+ launching just invalidate the launcher. Reset the process
+ identifier after killing the process.
+
2013-06-12 Jae Hyun Park <[email protected]>
[Coordinated Graphics] Remove unused headers in CoordinatedLayerTreeHostProxy
Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (151507 => 151508)
--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2013-06-12 17:11:41 UTC (rev 151507)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2013-06-12 17:17:42 UTC (rev 151508)
@@ -105,11 +105,17 @@
}
void ProcessLauncher::terminateProcess()
-{
+{
+ if (m_isLaunching) {
+ invalidate();
+ return;
+ }
+
if (!m_processIdentifier)
return;
kill(m_processIdentifier, SIGKILL);
+ m_processIdentifier = 0;
}
void ProcessLauncher::platformInvalidate()
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
