Only export a single WebKitMain function for the Web Process to call
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jul 2010 17:09:35 +0000 (17:09 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jul 2010 17:09:35 +0000 (17:09 +0000)
commitafe451ebe471a45e3e92620f1be7ea4406011140
tree92a0be511a9073a9b09ee4c944a1dc71281cee2b
parentaeae9a42afd54bf3b91cd50fd58e2a0584cba942
Only export a single WebKitMain function for the Web Process to call
https://bugs.webkit.org/show_bug.cgi?id=41702

Reviewed by Sam Weinig.

* Shared/CommandLine.h:
Add windows CommandLine::parse overload.

* Shared/win/CommandLineWin.cpp: Added.
(WebKit::CommandLine::parse):
Move parse overload from WebProcess/win/WebProcessMain.cpp.

* UIProcess/Launcher/win/ProcessLauncherWin.cpp:
(WebKit::ProcessLauncher::launchProcess):
Pass the right mode to.

* WebKit2.xcodeproj/project.pbxproj:
Update for moves.

* WebProcess/Launching/mac/WebProcessMain.mm: Removed.
* WebProcess/Launching/win/WebProcessWinMain.cpp: Removed.
* WebProcess/WebKitMain.cpp: Added.
(WebKitMain):
(enableTerminationOnHeapCorruption):
Add WebKitMain functions for Mac and Windows.

* WebProcess/WebProcessMain.h: Added.
* WebProcess/mac/WebProcessMainMac.mm: Added.
(WebKit::WebProcessMain):
Add Mac version of WebProcessMain.

* WebProcess/win/WebProcessMain.cpp: Removed.
* WebProcess/win/WebProcessMain.h: Removed.
* WebProcess/win/WebProcessMainWin.cpp: Added.
(WebKit::WebProcessMain):
Add Windows version of WebProcessMain.

* mac/MainMac.cpp: Added.
(main):
Add Mac WebProcess main function.

* mac/WebKit2.exp:
Remove functions that we don't need to export.

* win/MainWin.cpp: Added.
(wWinMain):
Add Windows WebProcess main function.

* win/WebKit2.vcproj:
* win/WebKit2WebProcess.vcproj:
Update for moves.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@62560 268f45cc-cd09-0410-ab3c-d52691b4dbfc
14 files changed:
WebKit2/ChangeLog
WebKit2/Shared/CommandLine.h
WebKit2/Shared/win/CommandLineWin.cpp [moved from WebKit2/WebProcess/win/WebProcessMain.cpp with 62% similarity]
WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
WebKit2/WebKit2.xcodeproj/project.pbxproj
WebKit2/WebProcess/WebKitMain.cpp [moved from WebKit2/WebProcess/Launching/win/WebProcessWinMain.cpp with 69% similarity]
WebKit2/WebProcess/WebProcessMain.h [moved from WebKit2/WebProcess/win/WebProcessMain.h with 79% similarity]
WebKit2/WebProcess/mac/WebProcessMainMac.mm [moved from WebKit2/WebProcess/Launching/mac/WebProcessMain.mm with 88% similarity]
WebKit2/WebProcess/win/WebProcessMainWin.cpp [new file with mode: 0644]
WebKit2/mac/MainMac.cpp [new file with mode: 0644]
WebKit2/mac/WebKit2.exp
WebKit2/win/MainWin.cpp [new file with mode: 0644]
WebKit2/win/WebKit2.vcproj
WebKit2/win/WebKit2WebProcess.vcproj