[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 15:26:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5eb521c9c3a446a907e392cd437559e977ddfdc1
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 3 17:17:21 2010 +0000
Pass the accelerated compositing render server port to the plug-in process at startup
https://bugs.webkit.org/show_bug.cgi?id=48925
Reviewed by Adam Roben.
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::PluginProcess):
Initialize m_compositingRenderServerPort to MACH_PORT_NULL.
(WebKit::PluginProcess::initialize):
Get the plug-in path and render server port from the creation parameters.
* PluginProcess/PluginProcess.messages.in:
Change the Initialize message to take a PluginProcessCreationParameters struct.
* Shared/Plugins/PluginProcessCreationParameters.cpp: Added.
* Shared/Plugins/PluginProcessCreationParameters.h: Added.
Add new PluginProcessCreationParameters struct.
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::didFinishLaunching):
Initialize now takes a PluginProcessCreationParameters struct.
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm: Added.
(WebKit::PluginProcessProxy::platformInitializePluginProcess):
Initialize the render server port.
* WebKit2.xcodeproj/project.pbxproj:
Add new files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8045732..f8471f1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,35 @@
+2010-11-03 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Pass the accelerated compositing render server port to the plug-in process at startup
+ https://bugs.webkit.org/show_bug.cgi?id=48925
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::PluginProcess):
+ Initialize m_compositingRenderServerPort to MACH_PORT_NULL.
+
+ (WebKit::PluginProcess::initialize):
+ Get the plug-in path and render server port from the creation parameters.
+
+ * PluginProcess/PluginProcess.messages.in:
+ Change the Initialize message to take a PluginProcessCreationParameters struct.
+
+ * Shared/Plugins/PluginProcessCreationParameters.cpp: Added.
+ * Shared/Plugins/PluginProcessCreationParameters.h: Added.
+ Add new PluginProcessCreationParameters struct.
+
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::didFinishLaunching):
+ Initialize now takes a PluginProcessCreationParameters struct.
+
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm: Added.
+ (WebKit::PluginProcessProxy::platformInitializePluginProcess):
+ Initialize the render server port.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
2010-11-03 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/PluginProcess/PluginProcess.cpp b/WebKit2/PluginProcess/PluginProcess.cpp
index 93a41ee..b6817f5 100644
--- a/WebKit2/PluginProcess/PluginProcess.cpp
+++ b/WebKit2/PluginProcess/PluginProcess.cpp
@@ -30,6 +30,7 @@
#include "MachPort.h"
#include "NetscapePluginModule.h"
#include "PluginProcessProxyMessages.h"
+#include "PluginProcessCreationParameters.h"
#include "WebProcessConnection.h"
namespace WebKit {
@@ -44,6 +45,9 @@ PluginProcess& PluginProcess::shared()
PluginProcess::PluginProcess()
: m_shutdownTimer(RunLoop::main(), this, &PluginProcess::shutdownTimerFired)
+#if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
+ , m_compositingRenderServerPort(MACH_PORT_NULL)
+#endif
{
}
@@ -88,11 +92,15 @@ void PluginProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::Mess
{
}
-void PluginProcess::initialize(const String& pluginPath)
+void PluginProcess::initialize(const PluginProcessCreationParameters& parameters)
{
ASSERT(!m_pluginModule);
- m_pluginModule = NetscapePluginModule::getOrCreate(pluginPath);
+ m_pluginModule = NetscapePluginModule::getOrCreate(parameters.pluginPath);
+
+#if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
+ m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
+#endif
}
void PluginProcess::createWebProcessConnection()
diff --git a/WebKit2/PluginProcess/PluginProcess.h b/WebKit2/PluginProcess/PluginProcess.h
index 35de9c2..c855f5a 100644
--- a/WebKit2/PluginProcess/PluginProcess.h
+++ b/WebKit2/PluginProcess/PluginProcess.h
@@ -35,6 +35,7 @@
namespace WebKit {
class NetscapePluginModule;
+class PluginProcessCreationParameters;
class WebProcessConnection;
class PluginProcess : Noncopyable, CoreIPC::Connection::Client {
@@ -57,7 +58,7 @@ private:
// Message handlers.
void didReceivePluginProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
- void initialize(const String& pluginPath);
+ void initialize(const PluginProcessCreationParameters&);
void createWebProcessConnection();
void shutdownTimerFired();
@@ -73,6 +74,12 @@ private:
// A timer used for the shutdown timeout.
RunLoop::Timer<PluginProcess> m_shutdownTimer;
+
+#if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
+ // The Mach port used for accelerated compositing.
+ mach_port_t m_compositingRenderServerPort;
+#endif
+
};
} // namespace WebKit
diff --git a/WebKit2/PluginProcess/PluginProcess.messages.in b/WebKit2/PluginProcess/PluginProcess.messages.in
index 7f5500f..e9b0fd3 100644
--- a/WebKit2/PluginProcess/PluginProcess.messages.in
+++ b/WebKit2/PluginProcess/PluginProcess.messages.in
@@ -23,8 +23,8 @@
#if ENABLE(PLUGIN_PROCESS)
messages -> PluginProcess {
- # Initializes the plug-in and specifies the path to the plug-in module.
- Initialize(WTF::String pluginPath)
+ # Initializes the plug-in.
+ Initialize(WebKit::PluginProcessCreationParameters processCreationParameters)
# Creates a web process connection. When the connection has been created,
# The plug-in process sends back a DidCreateWebProcessConnection message with
diff --git a/WebKit2/Scripts/webkit2/messages.py b/WebKit2/Scripts/webkit2/messages.py
index a90f28d..cfe6627 100644
--- a/WebKit2/Scripts/webkit2/messages.py
+++ b/WebKit2/Scripts/webkit2/messages.py
@@ -252,6 +252,7 @@ def struct_or_class(namespace, type):
'WebCore::KeypressCommand',
'WebCore::ViewportArguments',
'WebCore::WindowFeatures',
+ 'WebKit::PluginProcessCreationParameters',
'WebKit::WebPageCreationParameters',
'WebKit::WebPreferencesStore',
'WebKit::WebProcessCreationParameters',
diff --git a/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp b/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
new file mode 100644
index 0000000..90bbf07
--- /dev/null
+++ b/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
@@ -0,0 +1,63 @@
+/*
+ * 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 "PluginProcessCreationParameters.h"
+
+#include "ArgumentCoders.h"
+
+namespace WebKit {
+
+PluginProcessCreationParameters::PluginProcessCreationParameters()
+{
+}
+
+void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ encoder->encode(pluginPath);
+
+#if PLATFORM(MAC)
+ encoder->encode(acceleratedCompositingPort);
+#endif
+}
+
+bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, PluginProcessCreationParameters::PluginProcessCreationParameters& result)
+{
+ if (!decoder->decode(result.pluginPath))
+ return false;
+
+#if PLATFORM(MAC)
+ if (!decoder->decode(result.acceleratedCompositingPort))
+ return false;
+#endif
+
+ return true;
+}
+
+
+} // namespace WebKit
+
+#endif // ENABLE(PLUGIN_PROCESS)
diff --git a/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h b/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
new file mode 100644
index 0000000..1aeef01
--- /dev/null
+++ b/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
@@ -0,0 +1,61 @@
+/*
+ * 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 PluginProcessCreationParameters_h
+#define PluginProcessCreationParameters_h
+
+#if ENABLE(PLUGIN_PROCESS)
+
+#include <wtf/text/WTFString.h>
+
+#if PLATFORM(MAC)
+#include "MachPort.h"
+#endif
+
+namespace CoreIPC {
+ class ArgumentDecoder;
+ class ArgumentEncoder;
+}
+
+namespace WebKit {
+
+struct PluginProcessCreationParameters {
+ PluginProcessCreationParameters();
+
+ void encode(CoreIPC::ArgumentEncoder*) const;
+ static bool decode(CoreIPC::ArgumentDecoder*, PluginProcessCreationParameters&);
+
+ String pluginPath;
+
+#if PLATFORM(MAC)
+ CoreIPC::MachPort acceleratedCompositingPort;
+#endif
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(PLUGIN_PROCESS)
+
+#endif // PluginProcessCreationParameters_h
diff --git a/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp b/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
index f08689c..093a31f 100644
--- a/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
+++ b/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
@@ -28,6 +28,7 @@
#include "PluginProcessProxy.h"
#include "MachPort.h"
+#include "PluginProcessCreationParameters.h"
#include "PluginProcessManager.h"
#include "PluginProcessMessages.h"
#include "RunLoop.h"
@@ -118,8 +119,14 @@ void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connectio
m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
m_connection->open();
+ PluginProcessCreationParameters parameters;
+
+ parameters.pluginPath = m_pluginInfo.path;
+
+ platformInitializePluginProcess(parameters);
+
// Initialize the plug-in host process.
- m_connection->send(Messages::PluginProcess::Initialize(m_pluginInfo.path), 0);
+ m_connection->send(Messages::PluginProcess::Initialize(parameters), 0);
// Send all our pending requests.
for (unsigned i = 0; i < m_numPendingConnectionRequests; ++i)
diff --git a/WebKit2/UIProcess/Plugins/PluginProcessProxy.h b/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
index b1cc751..364ce25 100644
--- a/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
+++ b/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
@@ -40,9 +40,10 @@ namespace CoreIPC {
namespace WebKit {
+class PluginProcessCreationParameters;
class PluginProcessManager;
class WebProcessProxy;
-
+
class PluginProcessProxy : CoreIPC::Connection::Client, ProcessLauncher::Client {
public:
static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginInfoStore::Plugin&);
@@ -71,6 +72,8 @@ private:
void didReceivePluginProcessProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
void didCreateWebProcessConnection(const CoreIPC::MachPort&);
+ void platformInitializePluginProcess(PluginProcessCreationParameters& parameters);
+
// The plug-in host process manager.
PluginProcessManager* m_pluginProcessManager;
diff --git a/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm b/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
new file mode 100644
index 0000000..81c8620
--- /dev/null
+++ b/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
@@ -0,0 +1,46 @@
+/*
+ * 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 "PluginProcessCreationParameters.h"
+#include "WebKitSystemInterface.h"
+
+namespace WebKit {
+
+void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters& parameters)
+{
+#if USE(ACCELERATED_COMPOSITING) && HAVE(HOSTED_CORE_ANIMATION)
+ mach_port_t renderServerPort = WKInitializeRenderServer();
+ if (renderServerPort != MACH_PORT_NULL)
+ parameters.acceleratedCompositingPort = CoreIPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND);
+#endif
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(PLUGIN_PROCESS)
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 27b4fb8..3bfb526 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -93,6 +93,9 @@
1A2D848C127F6A49001EB962 /* NPIdentifierData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D848A127F6A49001EB962 /* NPIdentifierData.cpp */; };
1A2D84A3127F6AD1001EB962 /* NPVariantData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D84A1127F6AD1001EB962 /* NPVariantData.h */; };
1A2D84A4127F6AD1001EB962 /* NPVariantData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D84A2127F6AD1001EB962 /* NPVariantData.cpp */; };
+ 1A2D90BB1281C931001EB962 /* PluginProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D90BA1281C931001EB962 /* PluginProcessProxyMac.mm */; };
+ 1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D90D01281C966001EB962 /* PluginProcessCreationParameters.h */; };
+ 1A2D90D31281C966001EB962 /* PluginProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D90D11281C966001EB962 /* PluginProcessCreationParameters.cpp */; };
1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */; };
1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */; };
1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */; };
@@ -607,6 +610,9 @@
1A2D848A127F6A49001EB962 /* NPIdentifierData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPIdentifierData.cpp; sourceTree = "<group>"; };
1A2D84A1127F6AD1001EB962 /* NPVariantData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPVariantData.h; sourceTree = "<group>"; };
1A2D84A2127F6AD1001EB962 /* NPVariantData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPVariantData.cpp; sourceTree = "<group>"; };
+ 1A2D90BA1281C931001EB962 /* PluginProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessProxyMac.mm; sourceTree = "<group>"; };
+ 1A2D90D01281C966001EB962 /* PluginProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessCreationParameters.h; sourceTree = "<group>"; };
+ 1A2D90D11281C966001EB962 /* PluginProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessCreationParameters.cpp; sourceTree = "<group>"; };
1A30066C1110F4F70031937C /* ResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponsivenessTimer.h; sourceTree = "<group>"; };
1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConnectionMac.cpp; sourceTree = "<group>"; };
1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFindClient.cpp; sourceTree = "<group>"; };
@@ -1360,6 +1366,8 @@
1AAE058C1279DCD400852418 /* Plugins */ = {
isa = PBXGroup;
children = (
+ 1A2D90D11281C966001EB962 /* PluginProcessCreationParameters.cpp */,
+ 1A2D90D01281C966001EB962 /* PluginProcessCreationParameters.h */,
1A2D848A127F6A49001EB962 /* NPIdentifierData.cpp */,
1A2D8489127F6A49001EB962 /* NPIdentifierData.h */,
1A1FA35C127A45BF0050E709 /* NPObjectMessageReceiver.cpp */,
@@ -1421,6 +1429,7 @@
isa = PBXGroup;
children = (
1AEFCCBC11D02C5E008219D3 /* PluginInfoStoreMac.mm */,
+ 1A2D90BA1281C931001EB962 /* PluginProcessProxyMac.mm */,
);
path = mac;
sourceTree = "<group>";
@@ -2280,6 +2289,7 @@
1A2D848B127F6A49001EB962 /* NPIdentifierData.h in Headers */,
1A2D84A3127F6AD1001EB962 /* NPVariantData.h in Headers */,
1C8E2A361277852400BC7BD0 /* WebInspectorMessages.h in Headers */,
+ 1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2618,6 +2628,8 @@
1A2D848C127F6A49001EB962 /* NPIdentifierData.cpp in Sources */,
1A2D84A4127F6AD1001EB962 /* NPVariantData.cpp in Sources */,
1C8E2A351277852400BC7BD0 /* WebInspectorMessageReceiver.cpp in Sources */,
+ 1A2D90BB1281C931001EB962 /* PluginProcessProxyMac.mm in Sources */,
+ 1A2D90D31281C966001EB962 /* PluginProcessCreationParameters.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list