Log Message
[WK2][EFL]: Invalidate the ProcessLauncher when the process is terminated before it has finished launching https://bugs.webkit.org/show_bug.cgi?id=117865
Patch by Sergio Correia <[email protected]> on 2013-06-21 Reviewed by Christophe Dumez. Original patch from Carlos Garcia Campos for the Gtk port. * UIProcess/Launcher/efl/ProcessLauncherEfl.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 (151827 => 151828)
--- trunk/Source/WebKit2/ChangeLog 2013-06-21 08:51:37 UTC (rev 151827)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-21 08:52:27 UTC (rev 151828)
@@ -1,3 +1,17 @@
+2013-06-21 Sergio Correia <[email protected]>
+
+ [WK2][EFL]: Invalidate the ProcessLauncher when the process is terminated before it has finished launching
+ https://bugs.webkit.org/show_bug.cgi?id=117865
+
+ Reviewed by Christophe Dumez.
+
+ Original patch from Carlos Garcia Campos for the Gtk port.
+
+ * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
+ (WebKit::ProcessLauncher::terminateProcess): If process is still
+ launching, just invalidate the launcher. Reset the process
+ identifier after killing the process.
+
2013-06-20 Carlos Garcia Campos <[email protected]>
[GTK] Migrate WebKitWebResource to GTask
Modified: trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp (151827 => 151828)
--- trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp 2013-06-21 08:51:37 UTC (rev 151827)
+++ trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp 2013-06-21 08:52:27 UTC (rev 151828)
@@ -114,9 +114,15 @@
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
