[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 13:45:21 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9f9639f813c9b5dbf8330ffefef79e89aa364b10
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 23:12:24 2010 +0000
Fill in more of PluginProcess
https://bugs.webkit.org/show_bug.cgi?id=46534
Reviewed by Adam Roben.
* DerivedSources.make:
Add PluginProcessProxy.
* Platform/CoreIPC/MessageID.h:
Add a MessageClassPluginProcessProxy message class.
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::PluginProcess):
Initialize the shutdown timer.
(WebKit::PluginProcess::initializeConnection):
Rename this to initializeConnection to avoid conflicts in the CoreIPC message handler.
(WebKit::PluginProcess::removeWebProcessConnection):
Remove the given web process connection from our vector.
(WebKit::PluginProcess::initialize):
Create the plug-in module.
(WebKit::PluginProcess::createWebProcessConnection):
Create a connection handle and send it to the UI process.
(WebKit::PluginProcess::shutdownTimerFired):
Quit.
* PluginProcess/mac/PluginProcessMainMac.mm:
(WebKit::PluginProcessMain):
Call initializeConnection.
* Scripts/webkit2/messages.py:
Add CoreIPC::MachPort as a special case.
* Scripts/webkit2/messages_unittest.py:
Add test case.
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::didCreateWebProcessConnection):
Add empty function.
* UIProcess/Plugins/PluginProcessProxy.messages.in: Added.
* WebKit2.xcodeproj/project.pbxproj:
Add PluginProcessProxy.messages.in.
* WebKit2Prefix.h:
Add an ENABLE_PLUGIN_PROCESS #define which is 0 for now.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68309 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ef6c3cd..c9853b7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -154,6 +154,59 @@
Reviewed by Adam Roben.
+ Fill in more of PluginProcess
+ https://bugs.webkit.org/show_bug.cgi?id=46534
+
+ * DerivedSources.make:
+ Add PluginProcessProxy.
+
+ * Platform/CoreIPC/MessageID.h:
+ Add a MessageClassPluginProcessProxy message class.
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::PluginProcess):
+ Initialize the shutdown timer.
+
+ (WebKit::PluginProcess::initializeConnection):
+ Rename this to initializeConnection to avoid conflicts in the CoreIPC message handler.
+
+ (WebKit::PluginProcess::removeWebProcessConnection):
+ Remove the given web process connection from our vector.
+
+ (WebKit::PluginProcess::initialize):
+ Create the plug-in module.
+
+ (WebKit::PluginProcess::createWebProcessConnection):
+ Create a connection handle and send it to the UI process.
+
+ (WebKit::PluginProcess::shutdownTimerFired):
+ Quit.
+
+ * PluginProcess/mac/PluginProcessMainMac.mm:
+ (WebKit::PluginProcessMain):
+ Call initializeConnection.
+
+ * Scripts/webkit2/messages.py:
+ Add CoreIPC::MachPort as a special case.
+
+ * Scripts/webkit2/messages_unittest.py:
+ Add test case.
+
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::didCreateWebProcessConnection):
+ Add empty function.
+
+ * UIProcess/Plugins/PluginProcessProxy.messages.in: Added.
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add PluginProcessProxy.messages.in.
+
+ * WebKit2Prefix.h:
+ Add an ENABLE_PLUGIN_PROCESS #define which is 0 for now.
+
+2010-09-24 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Adam Roben.
+
messages_unittest.py should compare the generated results against expected results
https://bugs.webkit.org/show_bug.cgi?id=46490
diff --git a/WebKit2/DerivedSources.make b/WebKit2/DerivedSources.make
index 4d8e8bb..dc1c046 100644
--- a/WebKit2/DerivedSources.make
+++ b/WebKit2/DerivedSources.make
@@ -1,10 +1,12 @@
VPATH = \
$(WebKit2)/PluginProcess \
$(WebKit2)/WebProcess/WebPage \
+ $(WebKit2)/UIProcess/Plugins \
#
MESSAGE_RECEIVERS = \
PluginProcess \
+ PluginProcessProxy \
WebPage \
#
diff --git a/WebKit2/Platform/CoreIPC/MessageID.h b/WebKit2/Platform/CoreIPC/MessageID.h
index d200b29..e6a50a0 100644
--- a/WebKit2/Platform/CoreIPC/MessageID.h
+++ b/WebKit2/Platform/CoreIPC/MessageID.h
@@ -48,6 +48,9 @@ enum MessageClass {
// Messages sent by the UI process to the plug-in process.
MessageClassPluginProcess,
+
+ // Messages sent by the plug-in process to the UI process.
+ MessageClassPluginProcessProxy,
};
template<typename> struct MessageKindTraits { };
diff --git a/WebKit2/PluginProcess/PluginProcess.cpp b/WebKit2/PluginProcess/PluginProcess.cpp
index c630de2..e2551c7 100644
--- a/WebKit2/PluginProcess/PluginProcess.cpp
+++ b/WebKit2/PluginProcess/PluginProcess.cpp
@@ -23,12 +23,19 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if ENABLE(PLUGIN_PROCESS)
+
#include "PluginProcess.h"
-#if ENABLE(PLUGIN_PROCESS)
+#include "MachPort.h"
+#include "NetscapePluginModule.h"
+#include "PluginProcessProxyMessages.h"
+#include "WebProcessConnection.h"
namespace WebKit {
+static const double shutdownTimeout = 15.0;
+
PluginProcess& PluginProcess::shared()
{
DEFINE_STATIC_LOCAL(PluginProcess, pluginProcess, ());
@@ -36,6 +43,7 @@ PluginProcess& PluginProcess::shared()
}
PluginProcess::PluginProcess()
+ : m_shutdownTimer(RunLoop::main(), this, &PluginProcess::shutdownTimerFired)
{
}
@@ -43,7 +51,7 @@ PluginProcess::~PluginProcess()
{
}
-void PluginProcess::initialize(CoreIPC::Connection::Identifier serverIdentifier)
+void PluginProcess::initializeConnection(CoreIPC::Connection::Identifier serverIdentifier)
{
ASSERT(!m_connection);
@@ -51,6 +59,19 @@ void PluginProcess::initialize(CoreIPC::Connection::Identifier serverIdentifier)
m_connection->open();
}
+void PluginProcess::removeWebProcessConnection(WebProcessConnection* webProcessConnection)
+{
+ size_t vectorIndex = m_webProcessConnections.find(webProcessConnection);
+ ASSERT(vectorIndex != notFound);
+
+ m_webProcessConnections.remove(vectorIndex);
+
+ if (m_webProcessConnections.isEmpty()) {
+ // Start the shutdown timer.
+ m_shutdownTimer.startOneShot(shutdownTimeout);
+ }
+}
+
void PluginProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
}
@@ -66,6 +87,37 @@ void PluginProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::Mess
{
}
+void PluginProcess::initialize(const String& pluginPath)
+{
+ ASSERT(!m_pluginModule);
+
+ m_pluginModule = NetscapePluginModule::getOrCreate(pluginPath);
+}
+
+void PluginProcess::createWebProcessConnection()
+{
+ // FIXME: This is platform specific!
+
+ // Create the listening port.
+ mach_port_t listeningPort;
+ mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
+
+ // Create a listening connection.
+ RefPtr<WebProcessConnection> connection = WebProcessConnection::create(listeningPort);
+ m_webProcessConnections.append(connection.release());
+
+ CoreIPC::MachPort clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
+ m_connection->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientPort), 0);
+
+ // Stop the shutdown timer.
+ m_shutdownTimer.stop();
+}
+
+void PluginProcess::shutdownTimerFired()
+{
+ RunLoop::current()->stop();
+}
+
} // namespace WebKit
#endif // ENABLE(PLUGIN_PROCESS)
diff --git a/WebKit2/PluginProcess/PluginProcess.h b/WebKit2/PluginProcess/PluginProcess.h
index 60b3273..c338b23 100644
--- a/WebKit2/PluginProcess/PluginProcess.h
+++ b/WebKit2/PluginProcess/PluginProcess.h
@@ -30,14 +30,21 @@
#include "Connection.h"
#include "RunLoop.h"
+#include <wtf/Forward.h>
namespace WebKit {
+class NetscapePluginModule;
+class WebProcessConnection;
+
class PluginProcess : Noncopyable, CoreIPC::Connection::Client {
public:
static PluginProcess& shared();
- void initialize(CoreIPC::Connection::Identifier);
+ void initializeConnection(CoreIPC::Connection::Identifier);
+ void removeWebProcessConnection(WebProcessConnection* webProcessConnection);
+
+ NetscapePluginModule* netscapePluginModule() const { return m_pluginModule.get(); }
private:
PluginProcess();
@@ -48,8 +55,23 @@ private:
virtual void didClose(CoreIPC::Connection*);
virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ // Message handlers.
+ void initialize(const String& pluginPath);
+ void createWebProcessConnection();
+
+ void shutdownTimerFired();
+
// The connection to the UI process.
RefPtr<CoreIPC::Connection> m_connection;
+
+ // Our web process connections.
+ Vector<RefPtr<WebProcessConnection> > m_webProcessConnections;
+
+ // The plug-in module.
+ RefPtr<NetscapePluginModule> m_pluginModule;
+
+ // A timer used for the shutdown timeout.
+ RunLoop::Timer<PluginProcess> m_shutdownTimer;
};
} // namespace WebKit
diff --git a/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm b/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
index 772cd41..eaa3526 100644
--- a/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
+++ b/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
@@ -71,8 +71,8 @@ int PluginProcessMain(const CommandLine& commandLine)
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
- // Initialize the plug-in host process.
- PluginProcess::shared().initialize(serverPort);
+ // Initialize the plug-in process connection.
+ PluginProcess::shared().initializeConnection(serverPort);
[NSApplication sharedApplication];
diff --git a/WebKit2/Scripts/webkit2/messages.py b/WebKit2/Scripts/webkit2/messages.py
index 7195575..4a6e12f 100644
--- a/WebKit2/Scripts/webkit2/messages.py
+++ b/WebKit2/Scripts/webkit2/messages.py
@@ -282,6 +282,7 @@ def case_statement(receiver, message):
def header_for_type(type):
special_cases = {
+ 'CoreIPC::MachPort': '"MachPort.h"',
'WTF::String': '<wtf/text/WTFString.h>',
'WebKit::WebKeyboardEvent': '"WebEvent.h"',
'WebKit::WebMouseEvent': '"WebEvent.h"',
diff --git a/WebKit2/Scripts/webkit2/messages_unittest.py b/WebKit2/Scripts/webkit2/messages_unittest.py
index 1f55ee5..fc391c5 100644
--- a/WebKit2/Scripts/webkit2/messages_unittest.py
+++ b/WebKit2/Scripts/webkit2/messages_unittest.py
@@ -63,6 +63,8 @@ messages -> WebPage {
RunJavaScriptAlert(uint64_t frameID, WTF::String message) -> ()
GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins)
GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) delayed
+
+ DidCreateWebProcessConnection(CoreIPC::MachPort connectionIdentifier)
}
#endif
@@ -156,7 +158,15 @@ _expected_results = {
'base_class': 'CoreIPC::Arguments1<const WTF::String&>',
'reply_base_class': 'CoreIPC::Arguments1<CoreIPC::Connection::Handle&>',
'delayed_reply_base_class': 'CoreIPC::Arguments1<const CoreIPC::Connection::Handle&>',
- }
+ },
+ {
+ 'name': 'DidCreateWebProcessConnection',
+ 'parameters': (
+ ('CoreIPC::MachPort', 'connectionIdentifier'),
+ ),
+ 'condition': None,
+ 'base_class': 'CoreIPC::Arguments2<double, float>',
+ },
),
}
@@ -221,6 +231,10 @@ _expected_header = """/*
#include "Arguments.h"
#include "MessageID.h"
+namespace CoreIPC {
+ class MachPort;
+}
+
namespace WTF {
class String;
}
@@ -245,6 +259,7 @@ enum Kind {
RunJavaScriptAlertID,
GetPluginsID,
GetPluginProcessConnectionID,
+ DidCreateWebProcessConnectionID,
};
struct LoadURL : CoreIPC::Arguments1<const WTF::String&> {
@@ -317,6 +332,14 @@ struct GetPluginProcessConnection : CoreIPC::Arguments1<const WTF::String&> {
}
};
+struct DidCreateWebProcessConnection : CoreIPC::Arguments1<const CoreIPC::MachPort&> {
+ static const Kind messageID = DidCreateWebProcessConnectionID;
+ explicit DidCreateWebProcessConnection(const CoreIPC::MachPort& connectionIdentifier)
+ : CoreIPC::Arguments1<const CoreIPC::MachPort&>(connectionIdentifier)
+ {
+ }
+};
+
} // namespace WebPage
} // namespace Messages
@@ -364,6 +387,7 @@ _expected_receiver_implementation = """/*
#include "ArgumentDecoder.h"
#include "HandleMessage.h"
+#include "MachPort.h"
#include "WebEvent.h"
#include "WebPageMessages.h"
#include <wtf/text/WTFString.h>
@@ -402,6 +426,9 @@ void WebPage::didReceiveWebPageMessage(CoreIPC::Connection*, CoreIPC::MessageID
case Messages::WebPage::GetPluginProcessConnectionID:
CoreIPC::handleMessage<Messages::WebPage::GetPluginProcessConnection>(arguments, this, &WebPage::getPluginProcessConnection);
return;
+ case Messages::WebPage::DidCreateWebProcessConnectionID:
+ CoreIPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(arguments, this, &WebPage::didCreateWebProcessConnection);
+ return;
}
ASSERT_NOT_REACHED();
diff --git a/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp b/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
index 1446209..e53b9d6 100644
--- a/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
+++ b/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
@@ -79,6 +79,11 @@ void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connectio
m_connection->send(Messages::PluginProcess::Initialize(m_pluginInfo.path), 0);
}
+void PluginProcessProxy::didCreateWebProcessConnection(const CoreIPC::MachPort&)
+{
+ // FIXME: Implement.
+}
+
} // namespace WebKit
#endif // ENABLE(PLUGIN_PROCESS)
diff --git a/WebKit2/UIProcess/Plugins/PluginProcessProxy.h b/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
index e6406cf..6da82e1 100644
--- a/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
+++ b/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
@@ -33,6 +33,11 @@
#include "ProcessLauncher.h"
#include <wtf/Deque.h>
+// FIXME: This is platform specific.
+namespace CoreIPC {
+ class MachPort;
+}
+
namespace WebKit {
class PluginProcessManager;
@@ -54,7 +59,11 @@ private:
// ProcessLauncher::Client
virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier);
-
+
+ // Message handlers
+ void didReceivePluginProcessProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+ void didCreateWebProcessConnection(const CoreIPC::MachPort&);
+
// The plug-in host process manager.
PluginProcessManager* m_pluginProcessManager;
diff --git a/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in b/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in
new file mode 100644
index 0000000..cbd5abc
--- /dev/null
+++ b/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in
@@ -0,0 +1,30 @@
+# Copyright (C) 2010 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.
+
+#if ENABLE(PLUGIN_PROCESS)
+
+messages -> PluginProcessProxy {
+ # FIXME: This is platform specific
+ DidCreateWebProcessConnection(CoreIPC::MachPort connectionIdentifier)
+}
+
+#endif
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index d8a62d3..c16c8c2 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -47,6 +47,9 @@
1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043975124D034800FFBFB5 /* PluginProcess.cpp */; };
1A043A09124D11A900FFBFB5 /* WebProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043A07124D11A900FFBFB5 /* WebProcessConnection.h */; };
1A043A0A124D11A900FFBFB5 /* WebProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043A08124D11A900FFBFB5 /* WebProcessConnection.cpp */; };
+ 1A043B4D124D5E3600FFBFB5 /* PluginProcessProxy.messages.in in Resources */ = {isa = PBXBuildFile; fileRef = 1A043B4C124D5E3600FFBFB5 /* PluginProcessProxy.messages.in */; };
+ 1A043B5D124D5E9D00FFBFB5 /* PluginProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043B5B124D5E9D00FFBFB5 /* PluginProcessProxyMessageReceiver.cpp */; };
+ 1A043B5E124D5E9D00FFBFB5 /* PluginProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043B5C124D5E9D00FFBFB5 /* PluginProcessProxyMessages.h */; };
1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */; };
1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */; };
1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */; };
@@ -453,6 +456,9 @@
1A043975124D034800FFBFB5 /* PluginProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcess.cpp; sourceTree = "<group>"; };
1A043A07124D11A900FFBFB5 /* WebProcessConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessConnection.h; sourceTree = "<group>"; };
1A043A08124D11A900FFBFB5 /* WebProcessConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcessConnection.cpp; sourceTree = "<group>"; };
+ 1A043B4C124D5E3600FFBFB5 /* PluginProcessProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PluginProcessProxy.messages.in; sourceTree = "<group>"; };
+ 1A043B5B124D5E9D00FFBFB5 /* PluginProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginProcessProxyMessageReceiver.cpp; path = /Users/andersca/Build/Debug/DerivedSources/WebKit2/PluginProcessProxyMessageReceiver.cpp; sourceTree = "<absolute>"; };
+ 1A043B5C124D5E9D00FFBFB5 /* PluginProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginProcessProxyMessages.h; path = /Users/andersca/Build/Debug/DerivedSources/WebKit2/PluginProcessProxyMessages.h; sourceTree = "<absolute>"; };
1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessManager.h; sourceTree = "<group>"; };
1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessManager.cpp; sourceTree = "<group>"; };
1A0EC6B1124BBD36007EF4A5 /* PluginProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PluginProcess.messages.in; sourceTree = "<group>"; };
@@ -1100,6 +1106,7 @@
1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */,
1A0EC75D124BC7B2007EF4A5 /* PluginProcessProxy.cpp */,
1A0EC75C124BC7B2007EF4A5 /* PluginProcessProxy.h */,
+ 1A043B4C124D5E3600FFBFB5 /* PluginProcessProxy.messages.in */,
);
path = Plugins;
sourceTree = "<group>";
@@ -1581,6 +1588,8 @@
children = (
1A0EC6BD124BBD9B007EF4A5 /* PluginProcessMessageReceiver.cpp */,
1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */,
+ 1A043B5B124D5E9D00FFBFB5 /* PluginProcessProxyMessageReceiver.cpp */,
+ 1A043B5C124D5E9D00FFBFB5 /* PluginProcessProxyMessages.h */,
C0CE729E1247E71D00BC0EC4 /* WebPageMessageReceiver.cpp */,
C0CE729F1247E71D00BC0EC4 /* WebPageMessages.h */,
);
@@ -1799,6 +1808,7 @@
1A0EC90F124C0AF5007EF4A5 /* PluginProcessConnectionManager.h in Headers */,
1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */,
1A043A09124D11A900FFBFB5 /* WebProcessConnection.h in Headers */,
+ 1A043B5E124D5E9D00FFBFB5 /* PluginProcessProxyMessages.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1883,6 +1893,7 @@
buildActionMask = 2147483647;
files = (
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
+ 1A043B4D124D5E3600FFBFB5 /* PluginProcessProxy.messages.in in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2077,6 +2088,7 @@
1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */,
1A043A0A124D11A900FFBFB5 /* WebProcessConnection.cpp in Sources */,
C06C6095124C144B0001682F /* WebPageCreationParameters.cpp in Sources */,
+ 1A043B5D124D5E9D00FFBFB5 /* PluginProcessProxyMessageReceiver.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/WebKit2Prefix.h b/WebKit2/WebKit2Prefix.h
index f38777a..5811fa3 100644
--- a/WebKit2/WebKit2Prefix.h
+++ b/WebKit2/WebKit2Prefix.h
@@ -43,6 +43,9 @@
#define ENABLE_WEB_PROCESS_SANDBOX 1
#endif
+// FIXME: Enable once this works well enough.
+#define ENABLE_PLUGIN_PROCESS 0
+
#import <CoreGraphics/CoreGraphics.h>
#ifdef __OBJC__
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list