[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:21:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8ae9316e1f19e99fa3d7abd7f2612892fb997185
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 1 21:29:12 2010 +0000
Add NPObjectMessageReceiver.messages.in
https://bugs.webkit.org/show_bug.cgi?id=48782
Reviewed by Adam Roben.
* DerivedSources.make:
Add NPObjectMessageReceiver.
* Platform/CoreIPC/MessageID.h:
Add MessageClassNPObjectMessageReceiver message class.
* Shared/Plugins/NPObjectMessageReceiver.cpp:
(WebKit::NPObjectMessageReceiver::deallocate):
Add stubbed out deallocate member function.
* Shared/Plugins/NPObjectMessageReceiver.messages.in: Added.
* WebKit2.xcodeproj/project.pbxproj:
Add NPObjectMessageReceiver.messages.in.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71057 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a7bb894..5744b89 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,28 @@
Reviewed by Adam Roben.
+ Add NPObjectMessageReceiver.messages.in
+ https://bugs.webkit.org/show_bug.cgi?id=48782
+
+ * DerivedSources.make:
+ Add NPObjectMessageReceiver.
+
+ * Platform/CoreIPC/MessageID.h:
+ Add MessageClassNPObjectMessageReceiver message class.
+
+ * Shared/Plugins/NPObjectMessageReceiver.cpp:
+ (WebKit::NPObjectMessageReceiver::deallocate):
+ Add stubbed out deallocate member function.
+
+ * Shared/Plugins/NPObjectMessageReceiver.messages.in: Added.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add NPObjectMessageReceiver.messages.in.
+
+2010-11-01 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Adam Roben.
+
Start stubbing out NPClass functions in NPObjectProxy
https://bugs.webkit.org/show_bug.cgi?id=48778
diff --git a/WebKit2/DerivedSources.make b/WebKit2/DerivedSources.make
index 0138282..f195a21 100644
--- a/WebKit2/DerivedSources.make
+++ b/WebKit2/DerivedSources.make
@@ -1,5 +1,6 @@
VPATH = \
$(WebKit2)/PluginProcess \
+ $(WebKit2)/Shared/Plugins \
$(WebKit2)/WebProcess/Plugins \
$(WebKit2)/WebProcess/WebPage \
$(WebKit2)/WebProcess \
@@ -8,6 +9,7 @@ VPATH = \
#
MESSAGE_RECEIVERS = \
+ NPObjectMessageReceiver \
PluginControllerProxy \
PluginProcess \
PluginProcessProxy \
diff --git a/WebKit2/Platform/CoreIPC/MessageID.h b/WebKit2/Platform/CoreIPC/MessageID.h
index aaade4c..7b2bf24 100644
--- a/WebKit2/Platform/CoreIPC/MessageID.h
+++ b/WebKit2/Platform/CoreIPC/MessageID.h
@@ -60,6 +60,9 @@ enum MessageClass {
// Messages sent by the plug-in process to the web process.
MessageClassPluginProxy,
+
+ // NPObject messages sent by both the plug-in process and the web process.
+ MessageClassNPObjectMessageReceiver,
};
template<typename> struct MessageKindTraits { };
diff --git a/WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp b/WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp
index 933c6d8..a9fc042 100644
--- a/WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp
+++ b/WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp
@@ -28,6 +28,7 @@
#include "NPObjectMessageReceiver.h"
#include "NPRuntimeUtilities.h"
+#include "NotImplemented.h"
namespace WebKit {
@@ -47,6 +48,11 @@ NPObjectMessageReceiver::~NPObjectMessageReceiver()
releaseNPObject(m_npObject);
}
+void NPObjectMessageReceiver::deallocate()
+{
+ notImplemented();
+}
+
} // namespace WebKit
#endif // ENABLE(PLUGIN_PROCESS)
diff --git a/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h b/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h
index 1bca047..d6aa4b4 100644
--- a/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h
+++ b/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h
@@ -28,6 +28,7 @@
#if ENABLE(PLUGIN_PROCESS)
+#include "Connection.h"
#include <WebCore/npruntime.h>
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
@@ -44,6 +45,10 @@ public:
private:
explicit NPObjectMessageReceiver(NPObject* npObject);
+ // Message handlers.
+ CoreIPC::SyncReplyMode didReceiveSyncNPObjectMessageReceiverMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
+ void deallocate();
+
NPObject* m_npObject;
};
diff --git a/WebKit2/Shared/Plugins/NPObjectMessageReceiver.messages.in b/WebKit2/Shared/Plugins/NPObjectMessageReceiver.messages.in
new file mode 100644
index 0000000..2a458f3
--- /dev/null
+++ b/WebKit2/Shared/Plugins/NPObjectMessageReceiver.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 -> NPObjectMessageReceiver {
+ # Deallocate the NPObject.
+ Deallocate() -> ()
+}
+
+#endif
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 2afac01..f871572 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -87,6 +87,8 @@
1A2D82A7127F4EAB001EB962 /* NPObjectProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1FA283127A13BC0050E709 /* NPObjectProxy.h */; };
1A2D82A8127F4EAB001EB962 /* NPRemoteObjectMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FA252127A0E4F0050E709 /* NPRemoteObjectMap.cpp */; };
1A2D82A9127F4EAB001EB962 /* NPRemoteObjectMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1FA251127A0E4F0050E709 /* NPRemoteObjectMap.h */; };
+ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D8437127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp */; };
+ 1A2D843A127F65D5001EB962 /* NPObjectMessageReceiverMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D8438127F65D5001EB962 /* NPObjectMessageReceiverMessages.h */; };
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 */; };
@@ -592,6 +594,9 @@
1A24B5F111F531E800C38269 /* MachUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachUtilities.h; sourceTree = "<group>"; };
1A24BED3120894D100FBB059 /* SharedMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedMemory.h; sourceTree = "<group>"; };
1A24BF39120896A600FBB059 /* SharedMemoryMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedMemoryMac.cpp; sourceTree = "<group>"; };
+ 1A2D8411127F64E8001EB962 /* NPObjectMessageReceiver.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NPObjectMessageReceiver.messages.in; sourceTree = "<group>"; };
+ 1A2D8437127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NPObjectMessageReceiverMessageReceiver.cpp; path = /Users/andersca/Build/Debug/DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp; sourceTree = "<absolute>"; };
+ 1A2D8438127F65D5001EB962 /* NPObjectMessageReceiverMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NPObjectMessageReceiverMessages.h; path = /Users/andersca/Build/Debug/DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h; sourceTree = "<absolute>"; };
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>"; };
@@ -1344,6 +1349,7 @@
children = (
1A1FA35C127A45BF0050E709 /* NPObjectMessageReceiver.cpp */,
1A1FA35B127A45BF0050E709 /* NPObjectMessageReceiver.h */,
+ 1A2D8411127F64E8001EB962 /* NPObjectMessageReceiver.messages.in */,
1A1FA284127A13BC0050E709 /* NPObjectProxy.cpp */,
1A1FA283127A13BC0050E709 /* NPObjectProxy.h */,
1A1FA252127A0E4F0050E709 /* NPRemoteObjectMap.cpp */,
@@ -1961,6 +1967,8 @@
C0CE729D1247E71D00BC0EC4 /* Derived Sources */ = {
isa = PBXGroup;
children = (
+ 1A2D8437127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp */,
+ 1A2D8438127F65D5001EB962 /* NPObjectMessageReceiverMessages.h */,
1A8EF96C1252AF6B00F7067F /* PluginControllerProxyMessageReceiver.cpp */,
1A8EF96D1252AF6B00F7067F /* PluginControllerProxyMessages.h */,
1A0EC6BD124BBD9B007EF4A5 /* PluginProcessMessageReceiver.cpp */,
@@ -2248,6 +2256,7 @@
1A2D82A5127F4EAB001EB962 /* NPObjectMessageReceiver.h in Headers */,
1A2D82A7127F4EAB001EB962 /* NPObjectProxy.h in Headers */,
1A2D82A9127F4EAB001EB962 /* NPRemoteObjectMap.h in Headers */,
+ 1A2D843A127F65D5001EB962 /* NPObjectMessageReceiverMessages.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2582,6 +2591,7 @@
1A2D82A4127F4EAB001EB962 /* NPObjectMessageReceiver.cpp in Sources */,
1A2D82A6127F4EAB001EB962 /* NPObjectProxy.cpp in Sources */,
1A2D82A8127F4EAB001EB962 /* NPRemoteObjectMap.cpp in Sources */,
+ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list