[UNIX] Reorganize and cleanup main functions of GTK and EFL ports
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 May 2014 09:57:56 +0000 (09:57 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 May 2014 09:57:56 +0000 (09:57 +0000)
commit9e1a4f6c6e108cf8ad4dace905ec1087d27e81d3
treede1d0a2be8a3c8d8af6294020c5d0b17736b1908
parentb2139155182912f6371f1479c0e6578e38dab485
[UNIX] Reorganize and cleanup main functions of GTK and EFL ports
https://bugs.webkit.org/show_bug.cgi?id=131024

Reviewed by Gustavo Noronha Silva.

Move main function implementation files to <process-dir>/EntryPoint/unix/<ProcessName>Main.cpp
files that are now shared by GTK and EFL ports. These files call a
main method that wraps a new method ChildProcessMain that contains
the common code and uses a helper class for the platform specific
code. GTK+ and EFL ports implement that helper class for every process type.

* NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp: Renamed from Source/WebKit2/efl/MainEfl.cpp.
(main):
* NetworkProcess/efl/NetworkProcessMainEfl.cpp: Renamed from Source/WebKit2/unix/NetworkMainUnix.cpp.
(WebKit::NetworkProcessMainUnix):
* NetworkProcess/gtk/NetworkProcessMainGtk.cpp: Renamed from Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp.
(WebKit::NetworkProcessMainUnix):
* NetworkProcess/unix/NetworkProcessMainUnix.h:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PluginProcess/EntryPoint/unix/PluginProcessMain.cpp: Renamed from Source/WebKit2/unix/PluginMainUnix.cpp.
(main):
* PluginProcess/unix/PluginProcessMainUnix.cpp:
(WebKit::webkitXError):
(WebKit::PluginProcessMainUnix):
* PluginProcess/unix/PluginProcessMainUnix.h:
* Shared/unix/ChildProcessMain.cpp: Copied from Source/WebKit2/WebProcess/efl/WebProcessMainEfl.h.
(WebKit::ChildProcessMainBase::parseCommandLine):
* Shared/unix/ChildProcessMain.h: Renamed from Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.h.
(WebKit::ChildProcessMainBase::platformInitialize):
(WebKit::ChildProcessMainBase::platformFinalize):
(WebKit::ChildProcessMainBase::initializationParameters):
(WebKit::ChildProcessMain):
* WebProcess/EntryPoint/unix/WebProcessMain.cpp: Renamed from Source/WebKit2/gtk/MainGtk.cpp.
(main):
* WebProcess/efl/WebProcessMainEfl.cpp:
(WebKit::WebProcessMainUnix):
(dummyExtensionErrorHandler): Deleted.
* WebProcess/gtk/WebProcessMainGtk.cpp:
(WebKit::WebProcessMainUnix):
* WebProcess/unix/WebProcessMainUnix.h: Renamed from Source/WebKit2/WebProcess/efl/WebProcessMainEfl.h.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@169255 268f45cc-cd09-0410-ab3c-d52691b4dbfc
16 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp [moved from Source/WebKit2/efl/MainEfl.cpp with 90% similarity]
Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp [moved from Source/WebKit2/unix/NetworkMainUnix.cpp with 56% similarity]
Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp [moved from Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp with 53% similarity]
Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.h
Source/WebKit2/PlatformEfl.cmake
Source/WebKit2/PlatformGTK.cmake
Source/WebKit2/PluginProcess/EntryPoint/unix/PluginProcessMain.cpp [moved from Source/WebKit2/unix/PluginMainUnix.cpp with 88% similarity]
Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp
Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h
Source/WebKit2/Shared/unix/ChildProcessMain.cpp [new file with mode: 0644]
Source/WebKit2/Shared/unix/ChildProcessMain.h [moved from Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.h with 56% similarity]
Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp [moved from Source/WebKit2/gtk/MainGtk.cpp with 86% similarity]
Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
Source/WebKit2/WebProcess/unix/WebProcessMainUnix.h [moved from Source/WebKit2/WebProcess/efl/WebProcessMainEfl.h with 84% similarity]