From dc6262b587c71c14e30d93e57ed812e36a79a33e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 24 Sep 2012 13:09:44 +0200 Subject: Imported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (http://svn.webkit.org/repository/webkit/trunk@129343) New snapshot with build fixes for latest qtbase --- .../WebProcess/mac/WebProcessServiceEntryPoints.h | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 Source/WebKit2/WebProcess/mac/WebProcessServiceEntryPoints.h (limited to 'Source/WebKit2/WebProcess/mac/WebProcessServiceEntryPoints.h') diff --git a/Source/WebKit2/WebProcess/mac/WebProcessServiceEntryPoints.h b/Source/WebKit2/WebProcess/mac/WebProcessServiceEntryPoints.h new file mode 100644 index 000000000..949154a57 --- /dev/null +++ b/Source/WebKit2/WebProcess/mac/WebProcessServiceEntryPoints.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2012 Apple Inc. All rights reserved. + * + * 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 WebProcessServiceEntryPoints_h +#define WebProcessServiceEntryPoints_h + +#if HAVE(XPC) + +#include "WKBase.h" + +#ifdef __cplusplus +extern "C" { +#endif + +// This entry point is used for the installed WebProcessService, which does not +// need to be re-execed, or mess around with DYLD. +WK_EXPORT int WebProcessServiceMain(int argc, char** argv); + +// This entry point is used for the WebProcessServiceForWebKitDevelopment +// which needs to be re-exec, and can't link directly to WebKit2 requiring +// some DYLD fiddling. +WK_EXPORT void InitializeWebProcessForWebProcessServiceForWebKitDevelopment(const char* clientIdentifer, xpc_connection_t connection, mach_port_t serverPort); + +#ifdef __cplusplus +}; // extern "C" +#endif + +#endif // HAVE(XPC) + +#endif // WebProcessServiceEntryPoints_h -- cgit v1.2.1