diff options
Diffstat (limited to 'Source/WebKit2/PluginProcess/mac')
3 files changed, 26 insertions, 23 deletions
diff --git a/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm b/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm index 40d4f6d..610ca32 100644 --- a/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm +++ b/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm @@ -23,13 +23,14 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#if ENABLE(PLUGIN_PROCESS) +#import "config.h" +#import "PluginControllerProxy.h" -#include "PluginControllerProxy.h" +#if ENABLE(PLUGIN_PROCESS) -#include <QuartzCore/QuartzCore.h> -#include "PluginProcess.h" -#include "WebKitSystemInterface.h" +#import <QuartzCore/QuartzCore.h> +#import "PluginProcess.h" +#import "WebKitSystemInterface.h" using namespace WebCore; diff --git a/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm b/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm index 3919c8b..5a54719 100644 --- a/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm +++ b/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm @@ -23,18 +23,19 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#import "config.h" +#import "PluginProcess.h" + #if ENABLE(PLUGIN_PROCESS) // FIXME (WebKit2) <rdar://problem/8728860> WebKit2 needs to be localized #define UI_STRING(__str, __desc) [NSString stringWithUTF8String:__str] - -#include "PluginProcess.h" -#include "NetscapePlugin.h" -#include "PluginProcessShim.h" -#include "PluginProcessCreationParameters.h" -#include <WebKitSystemInterface.h> -#include <dlfcn.h> +#import "NetscapePlugin.h" +#import "PluginProcessShim.h" +#import "PluginProcessCreationParameters.h" +#import <WebKitSystemInterface.h> +#import <dlfcn.h> namespace WebKit { diff --git a/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm b/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm index 36cc2a1..d39353a 100644 --- a/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm +++ b/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm @@ -23,18 +23,19 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#if ENABLE(PLUGIN_PROCESS) +#import "config.h" +#import "PluginProcessMain.h" -#include "PluginProcessMain.h" +#if ENABLE(PLUGIN_PROCESS) -#include "CommandLine.h" -#include "PluginProcess.h" -#include "RunLoop.h" -#include <runtime/InitializeThreading.h> -#include <servers/bootstrap.h> -#include <wtf/text/CString.h> -#include <wtf/text/WTFString.h> -#include <WebKitSystemInterface.h> +#import "CommandLine.h" +#import "PluginProcess.h" +#import "RunLoop.h" +#import <runtime/InitializeThreading.h> +#import <servers/bootstrap.h> +#import <wtf/text/CString.h> +#import <wtf/text/WTFString.h> +#import <WebKitSystemInterface.h> // FIXME: We should be doing this another way. extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t); @@ -84,7 +85,7 @@ int PluginProcessMain(const CommandLine& commandLine) PluginProcess::shared().initializeShim(); // Initialize the plug-in process connection. - PluginProcess::shared().initializeConnection(serverPort); + PluginProcess::shared().initialize(serverPort, RunLoop::main()); [NSApplication sharedApplication]; |