Commit c73808f2 authored by kseo@webkit.org's avatar kseo@webkit.org

[WK2][Soup] Add entry point for network process

https://bugs.webkit.org/show_bug.cgi?id=110136

Reviewed by Gustavo Noronha Silva.

Original patch by Balazs Kelemen <kbalazs@webkit.org>.

Added a common entry point for non-Mac Unix ports.

* NetworkProcess/unix/NetworkProcessMainUnix.cpp: Added.
(WebKit::NetworkProcessMain):
* NetworkProcess/unix/NetworkProcessMainUnix.h: Added.
* unix/NetworkMainUnix.cpp: Added.
(main):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153106 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2677ced8
2013-07-24 Kwang Yul Seo <skyul@company100.net>
[WK2][Soup] Add entry point for network process
https://bugs.webkit.org/show_bug.cgi?id=110136
Reviewed by Gustavo Noronha Silva.
Original patch by Balazs Kelemen <kbalazs@webkit.org>.
Added a common entry point for non-Mac Unix ports.
* NetworkProcess/unix/NetworkProcessMainUnix.cpp: Added.
(WebKit::NetworkProcessMain):
* NetworkProcess/unix/NetworkProcessMainUnix.h: Added.
* unix/NetworkMainUnix.cpp: Added.
(main):
2013-07-24 Jessie Berlin <jberlin@apple.com>
Remove WKPageGetPlugInInformation - it is not used anymore
......
/*
* Copyright (C) 2013 Apple Inc. All rights reserved.
* Copyright (C) 2013 Company 100 Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "NetworkProcessMainUnix.h"
#if ENABLE(NETWORK_PROCESS)
#include "WKBase.h"
#include "WebKit2Initialize.h"
#include <WebCore/RunLoop.h>
#include <WebKit2/NetworkProcess.h>
#include <error.h>
#include <runtime/InitializeThreading.h>
#include <stdlib.h>
#include <wtf/MainThread.h>
#if PLATFORM(EFL)
#include <Ecore.h>
#endif
using namespace WebCore;
namespace WebKit {
WK_EXPORT int NetworkProcessMain(int argc, char* argv[])
{
if (argc != 2)
return 1;
#if PLATFORM(EFL)
if (!ecore_init())
return 1;
if (!ecore_main_loop_glib_integrate())
return 1;
#endif
InitializeWebKit2();
// FIXME: handle proxy settings.
int socket = atoi(argv[1]);
WebKit::ChildProcessInitializationParameters parameters;
parameters.connectionIdentifier = int(socket);
NetworkProcess::shared().initialize(parameters);
RunLoop::run();
return 0;
}
} // namespace WebKit
#endif // ENABLE(NETWORK_PROCESS)
/*
* Copyright (C) 2013 University of Szeged. All rights reserved.
* Copyright (C) 2013 Company 100 Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef NetworkProcessMainUnix_h
#define NetworkProcessMainUnix_h
#include <WebKit2/WKBase.h>
namespace WebKit {
#ifdef __cplusplus
extern "C" {
WK_EXPORT int NetworkProcessMain(int argc, char* argv[]);
} // extern "C"
#endif // __cplusplus
} // namespace WebKit
#endif // NetworkProcessMainUnix_h
/*
* Copyright (C) 2013 University of Szeged. All rights reserved.
* Copyright (C) 2013 Company 100 Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#if ENABLE(NETWORK_PROCESS)
#include "NetworkProcessMainUnix.h"
int main(int argc, char** argv)
{
return WebKit::NetworkProcessMain(argc, argv);
}
#endif // ENABLE(NETWORK_PROCESS)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment