From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 13:36:51 +0100 Subject: Merge WebKit at r78450: Initial merge by git. Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1 --- Source/WebKit2/PluginProcess/PluginControllerProxy.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/WebKit2/PluginProcess/PluginControllerProxy.h') diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.h b/Source/WebKit2/PluginProcess/PluginControllerProxy.h index 339c151..c39542a 100644 --- a/Source/WebKit2/PluginProcess/PluginControllerProxy.h +++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.h @@ -90,6 +90,7 @@ private: #if PLATFORM(MAC) virtual void setComplexTextInputEnabled(bool); + virtual mach_port_t compositingRenderServerPort(); #endif virtual String proxiesForURL(const String&); -- cgit v1.1