[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:41:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 89315186d477e0e08ad9e427e11730b12fcc3e7e
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 18:21:43 2010 +0000
Add PluginProcessProxy class
https://bugs.webkit.org/show_bug.cgi?id=46377
Reviewed by Sam Weinig.
* DerivedSources.make:
Add PluginProcess.
* Platform/CoreIPC/Connection.h:
(CoreIPC::Connection::send):
Add send overload that takes a message.
* Platform/CoreIPC/MessageID.h:
Add MessageClassPluginProcess message kind.
* PluginProcess/PluginProcess.messages.in: Added.
Add PluginProcess messages.
* UIProcess/Plugins/PluginInfoStore.cpp:
(WebKit::PluginInfoStore::infoForPluginWithPath):
* UIProcess/Plugins/PluginInfoStore.h:
New function that returns the plug-in info for a plug-in with the given path.
* UIProcess/Plugins/PluginProcessManager.cpp:
(WebKit::PluginProcessManager::getPluginProcessConnection):
Look for an existing plug-in process proxy.
* UIProcess/Plugins/PluginProcessProxy.cpp: Added.
(WebKit::PluginProcessProxy::create):
Launch the process.
(WebKit::PluginProcessProxy::didReceiveMessage):
(WebKit::PluginProcessProxy::didReceiveInvalidMessage):
Add stubbed out functions.
(WebKit::PluginProcessProxy::didClose):
Delete the plug-in process proxy.
(WebKit::PluginProcessProxy::didFinishLaunching):
Open a connection to the plug-in process proxy.
* UIProcess/Plugins/PluginProcessProxy.h: Added.
(WebKit::PluginProcessProxy::pluginInfo):
Return the plug-in info.
* UIProcess/WebProcessProxy.h:
(WebKit::WebProcessProxy::context):
Add a context getter.
* WebKit2.xcodeproj/project.pbxproj:
Add new files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68170 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d59801b..055a029 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,57 @@
+2010-09-23 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Add PluginProcessProxy class
+ https://bugs.webkit.org/show_bug.cgi?id=46377
+
+ * DerivedSources.make:
+ Add PluginProcess.
+
+ * Platform/CoreIPC/Connection.h:
+ (CoreIPC::Connection::send):
+ Add send overload that takes a message.
+
+ * Platform/CoreIPC/MessageID.h:
+ Add MessageClassPluginProcess message kind.
+
+ * PluginProcess/PluginProcess.messages.in: Added.
+ Add PluginProcess messages.
+
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::PluginInfoStore::infoForPluginWithPath):
+ * UIProcess/Plugins/PluginInfoStore.h:
+ New function that returns the plug-in info for a plug-in with the given path.
+
+ * UIProcess/Plugins/PluginProcessManager.cpp:
+ (WebKit::PluginProcessManager::getPluginProcessConnection):
+ Look for an existing plug-in process proxy.
+
+ * UIProcess/Plugins/PluginProcessProxy.cpp: Added.
+ (WebKit::PluginProcessProxy::create):
+ Launch the process.
+
+ (WebKit::PluginProcessProxy::didReceiveMessage):
+ (WebKit::PluginProcessProxy::didReceiveInvalidMessage):
+ Add stubbed out functions.
+
+ (WebKit::PluginProcessProxy::didClose):
+ Delete the plug-in process proxy.
+
+ (WebKit::PluginProcessProxy::didFinishLaunching):
+ Open a connection to the plug-in process proxy.
+
+ * UIProcess/Plugins/PluginProcessProxy.h: Added.
+ (WebKit::PluginProcessProxy::pluginInfo):
+ Return the plug-in info.
+
+ * UIProcess/WebProcessProxy.h:
+ (WebKit::WebProcessProxy::context):
+ Add a context getter.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
2010-09-23 Jessie Berlin <jberlin at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/DerivedSources.make b/WebKit2/DerivedSources.make
index 87ff134..4d8e8bb 100644
--- a/WebKit2/DerivedSources.make
+++ b/WebKit2/DerivedSources.make
@@ -1,8 +1,10 @@
VPATH = \
+ $(WebKit2)/PluginProcess \
$(WebKit2)/WebProcess/WebPage \
#
MESSAGE_RECEIVERS = \
+ PluginProcess \
WebPage \
#
diff --git a/WebKit2/Platform/CoreIPC/Connection.h b/WebKit2/Platform/CoreIPC/Connection.h
index 2409f2a..eeaa5a7 100644
--- a/WebKit2/Platform/CoreIPC/Connection.h
+++ b/WebKit2/Platform/CoreIPC/Connection.h
@@ -94,8 +94,11 @@ public:
bool open();
void invalidate();
+ // FIXME: This variant of send is deprecated, all clients should move to the overload that takes a message.
template<typename E, typename T> bool send(E messageID, uint64_t destinationID, const T& arguments);
+ template<typename T> bool send(const T& message, uint64_t destinationID);
+
static const unsigned long long NoTimeout = 10000000000ULL;
template<typename E, typename T, typename U> bool sendSync(E messageID, uint64_t destinationID, const T& arguments, const U& reply, double timeout);
@@ -219,6 +222,14 @@ bool Connection::send(E messageID, uint64_t destinationID, const T& arguments)
return sendMessage(MessageID(messageID), argumentEncoder.release());
}
+template<typename T> bool Connection::send(const T& message, uint64_t destinationID)
+{
+ OwnPtr<ArgumentEncoder> argumentEncoder(new ArgumentEncoder(destinationID));
+ argumentEncoder->encode(message);
+
+ return sendMessage(MessageID(T::messageID), argumentEncoder.release());
+}
+
template<typename E, typename T, typename U>
inline bool Connection::sendSync(E messageID, uint64_t destinationID, const T& arguments, const U& reply, double timeout)
{
diff --git a/WebKit2/Platform/CoreIPC/MessageID.h b/WebKit2/Platform/CoreIPC/MessageID.h
index 0b0f893..d200b29 100644
--- a/WebKit2/Platform/CoreIPC/MessageID.h
+++ b/WebKit2/Platform/CoreIPC/MessageID.h
@@ -44,7 +44,10 @@ enum MessageClass {
MessageClassWebContext,
MessageClassWebProcessProxy,
MessageClassWebPageProxy,
- MessageClassDrawingAreaProxy
+ MessageClassDrawingAreaProxy,
+
+ // Messages sent by the UI process to the plug-in process.
+ MessageClassPluginProcess,
};
template<typename> struct MessageKindTraits { };
diff --git a/WebKit2/PluginProcess/PluginProcess.messages.in b/WebKit2/PluginProcess/PluginProcess.messages.in
new file mode 100644
index 0000000..05d5420
--- /dev/null
+++ b/WebKit2/PluginProcess/PluginProcess.messages.in
@@ -0,0 +1,29 @@
+# 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 -> PluginProcess {
+ Initialize(WTF::String pluginPath)
+}
+
+#endif
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
index e55b00c..93d3c87 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
@@ -190,4 +190,15 @@ PluginInfoStore::Plugin PluginInfoStore::findPlugin(String& mimeType, const KURL
return Plugin();
}
+PluginInfoStore::Plugin PluginInfoStore::infoForPluginWithPath(const String& pluginPath)
+{
+ for (size_t i = 0; i < m_plugins.size(); ++i) {
+ if (m_plugins[i].path == pluginPath)
+ return m_plugins[i];
+ }
+
+ ASSERT_NOT_REACHED();
+ return Plugin();
+}
+
} // namespace WebKit
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.h b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
index 173f05e..e28111a 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.h
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
@@ -59,6 +59,9 @@ public:
// plug-in type. In that case, mimeType will be filled in with the right MIME type.
Plugin findPlugin(String& mimeType, const WebCore::KURL& url);
+ // Returns the info for the plug-in with the given path.
+ Plugin infoForPluginWithPath(const String& pluginPath);
+
private:
Plugin findPluginForMIMEType(const String& mimeType);
diff --git a/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp b/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
index c0a3757..98aacf7 100644
--- a/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
+++ b/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
@@ -28,6 +28,7 @@
#include "PluginProcessManager.h"
#include "PluginInfoStore.h"
+#include "PluginProcessProxy.h"
#include "WebContext.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/WTFString.h>
@@ -44,7 +45,23 @@ void PluginProcessManager::getPluginProcessConnection(const String& pluginPath,
{
ASSERT(!pluginPath.isNull());
- // FIXME: Implement.
+ PluginInfoStore::Plugin plugin = webProcessProxy->context()->pluginInfoStore()->infoForPluginWithPath(pluginPath);
+
+ PluginProcessProxy* pluginProcess = 0;
+
+ for (size_t i = 0; i < m_pluginProcesses.size(); ++i) {
+ if (m_pluginProcesses[i]->pluginInfo().path == plugin.path) {
+ pluginProcess = m_pluginProcesses[i];
+ break;
+ }
+ }
+
+ if (!pluginProcess) {
+ pluginProcess = PluginProcessProxy::create(this, plugin).leakPtr();
+ m_pluginProcesses.append(pluginProcess);
+ }
+
+ // FIXME: Ask the plug-in process for a connection
}
void PluginProcessManager::removePluginProcessProxy(PluginProcessProxy* pluginProcessProxy)
diff --git a/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp b/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
new file mode 100644
index 0000000..1446209
--- /dev/null
+++ b/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
@@ -0,0 +1,84 @@
+/*
+ * 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)
+
+#include "PluginProcessProxy.h"
+
+#include "PluginProcessManager.h"
+#include "PluginProcessMessages.h"
+#include "RunLoop.h"
+#include "WebCoreArgumentCoders.h"
+
+namespace WebKit {
+
+PassOwnPtr<PluginProcessProxy> PluginProcessProxy::create(PluginProcessManager* PluginProcessManager, const PluginInfoStore::Plugin& pluginInfo)
+{
+ return adoptPtr(new PluginProcessProxy(PluginProcessManager, pluginInfo));
+}
+
+PluginProcessProxy::PluginProcessProxy(PluginProcessManager* PluginProcessManager, const PluginInfoStore::Plugin& pluginInfo)
+ : m_pluginProcessManager(PluginProcessManager)
+ , m_pluginInfo(pluginInfo)
+{
+ ProcessLauncher::LaunchOptions launchOptions;
+ launchOptions.processType = ProcessLauncher::PluginProcess;
+#if PLATFORM(MAC)
+ launchOptions.architecture = pluginInfo.pluginArchitecture;
+#endif
+
+ m_processLauncher = ProcessLauncher::create(this, launchOptions);
+}
+
+void PluginProcessProxy::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
+{
+ // FIXME: Implement.
+}
+
+void PluginProcessProxy::didClose(CoreIPC::Connection*)
+{
+ // Tell the plug-in process manager to forget about this plug-in process proxy.
+ m_pluginProcessManager->removePluginProcessProxy(this);
+ delete this;
+}
+
+void PluginProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+{
+}
+
+void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier connectionIdentifier)
+{
+ ASSERT(!m_connection);
+
+ m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection->open();
+
+ // Initialize the plug-in host process.
+ m_connection->send(Messages::PluginProcess::Initialize(m_pluginInfo.path), 0);
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(PLUGIN_PROCESS)
diff --git a/WebKit2/UIProcess/Plugins/PluginProcessProxy.h b/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
new file mode 100644
index 0000000..e6406cf
--- /dev/null
+++ b/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+#ifndef PluginProcessProxy_h
+#define PluginProcessProxy_h
+
+#if ENABLE(PLUGIN_PROCESS)
+
+#include "Connection.h"
+#include "PluginInfoStore.h"
+#include "ProcessLauncher.h"
+#include <wtf/Deque.h>
+
+namespace WebKit {
+
+class PluginProcessManager;
+class WebProcessProxy;
+
+class PluginProcessProxy : CoreIPC::Connection::Client, ProcessLauncher::Client {
+public:
+ static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginInfoStore::Plugin&);
+
+ const PluginInfoStore::Plugin& pluginInfo() const { return m_pluginInfo; }
+
+private:
+ PluginProcessProxy(PluginProcessManager*, const PluginInfoStore::Plugin&);
+
+ // CoreIPC::Connection::Client
+ virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+ virtual void didClose(CoreIPC::Connection*);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+
+ // ProcessLauncher::Client
+ virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier);
+
+ // The plug-in host process manager.
+ PluginProcessManager* m_pluginProcessManager;
+
+ // Information about the plug-in.
+ PluginInfoStore::Plugin m_pluginInfo;
+
+ // The connection to the plug-in host process.
+ RefPtr<CoreIPC::Connection> m_connection;
+
+ // The process launcher for the plug-in host process.
+ RefPtr<ProcessLauncher> m_processLauncher;
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(PLUGIN_PROCESS)
+
+#endif // PluginProcessProxy_h
diff --git a/WebKit2/UIProcess/WebProcessProxy.h b/WebKit2/UIProcess/WebProcessProxy.h
index a18f91f..81c52b0 100644
--- a/WebKit2/UIProcess/WebProcessProxy.h
+++ b/WebKit2/UIProcess/WebProcessProxy.h
@@ -71,6 +71,8 @@ public:
return m_connection.get();
}
+ WebContext* context() const { return m_context; }
+
PlatformProcessIdentifier processIdentifier() const { return m_processLauncher->processIdentifier(); }
WebPageProxy* webPage(uint64_t pageID) const;
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index b38ff66..59cbfb4 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -46,6 +46,10 @@
0FB659A61208B9EE0044816C /* DrawingAreaBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FB659A51208B9EE0044816C /* DrawingAreaBase.cpp */; };
1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */; };
1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */; };
+ 1A0EC6B2124BBD36007EF4A5 /* PluginProcess.messages.in in Resources */ = {isa = PBXBuildFile; fileRef = 1A0EC6B1124BBD36007EF4A5 /* PluginProcess.messages.in */; };
+ 1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */; };
+ 1A0EC75E124BC7B2007EF4A5 /* PluginProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC75C124BC7B2007EF4A5 /* PluginProcessProxy.h */; };
+ 1A0EC75F124BC7B2007EF4A5 /* PluginProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC75D124BC7B2007EF4A5 /* PluginProcessProxy.cpp */; };
1A0F29CB120B37160053D1B9 /* VisitedLinkTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */; };
1A0F29CC120B37160053D1B9 /* VisitedLinkTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */; };
1A0F29E3120B44420053D1B9 /* VisitedLinkProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */; };
@@ -439,6 +443,11 @@
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; 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>"; };
+ 1A0EC6BD124BBD9B007EF4A5 /* PluginProcessMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; name = PluginProcessMessageReceiver.cpp; path = /Users/andersca/Build/Debug/DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp; sourceTree = "<absolute>"; };
+ 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginProcessMessages.h; path = /Users/andersca/Build/Debug/DerivedSources/WebKit2/PluginProcessMessages.h; sourceTree = "<absolute>"; };
+ 1A0EC75C124BC7B2007EF4A5 /* PluginProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessProxy.h; sourceTree = "<group>"; };
+ 1A0EC75D124BC7B2007EF4A5 /* PluginProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessProxy.cpp; sourceTree = "<group>"; };
1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkTable.cpp; sourceTree = "<group>"; };
1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkTable.h; sourceTree = "<group>"; };
1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProvider.cpp; sourceTree = "<group>"; };
@@ -827,6 +836,7 @@
children = (
C0CE72DB1247E8F700BC0EC4 /* DerivedSources.make */,
BC2E6E74114196F000A63B1E /* Platform */,
+ 1A0EC6B0124BBD36007EF4A5 /* PluginProcess */,
1AADDF4B10D82AF000D3D63D /* Shared */,
BC032D5C10F436D50058C15A /* WebProcess */,
BC032DC310F438260058C15A /* UIProcess */,
@@ -885,6 +895,14 @@
name = "Other Frameworks";
sourceTree = "<group>";
};
+ 1A0EC6B0124BBD36007EF4A5 /* PluginProcess */ = {
+ isa = PBXGroup;
+ children = (
+ 1A0EC6B1124BBD36007EF4A5 /* PluginProcess.messages.in */,
+ );
+ path = PluginProcess;
+ sourceTree = "<group>";
+ };
1A4F9769100E7B6600637A18 /* Configurations */ = {
isa = PBXGroup;
children = (
@@ -1041,6 +1059,8 @@
1AEFCC1011D01F96008219D3 /* PluginInfoStore.h */,
1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */,
1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */,
+ 1A0EC75D124BC7B2007EF4A5 /* PluginProcessProxy.cpp */,
+ 1A0EC75C124BC7B2007EF4A5 /* PluginProcessProxy.h */,
);
path = Plugins;
sourceTree = "<group>";
@@ -1520,6 +1540,8 @@
C0CE729D1247E71D00BC0EC4 /* Derived Sources */ = {
isa = PBXGroup;
children = (
+ 1A0EC6BD124BBD9B007EF4A5 /* PluginProcessMessageReceiver.cpp */,
+ 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */,
C0CE729E1247E71D00BC0EC4 /* WebPageMessageReceiver.cpp */,
C0CE729F1247E71D00BC0EC4 /* WebPageMessages.h */,
);
@@ -1731,6 +1753,8 @@
C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */,
C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */,
1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */,
+ 1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */,
+ 1A0EC75E124BC7B2007EF4A5 /* PluginProcessProxy.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1780,6 +1804,7 @@
isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WebKit2" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@@ -1814,6 +1839,7 @@
buildActionMask = 2147483647;
files = (
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
+ 1A0EC6B2124BBD36007EF4A5 /* PluginProcess.messages.in in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2002,6 +2028,7 @@
BCF5072F12432A97005955AE /* WKCertificateInfoMac.mm in Sources */,
C0CE72A01247E71D00BC0EC4 /* WebPageMessageReceiver.cpp in Sources */,
1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */,
+ 1A0EC75F124BC7B2007EF4A5 /* PluginProcessProxy.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list