[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 11:47:10 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6630cf0823e5ee7f789cecc30a399371a39f7ccc
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 6 20:40:51 2010 +0000
Add CoreIPC::MessageReceiver class
https://bugs.webkit.org/show_bug.cgi?id=43637
Reviewed by Adam Roben.
* Platform/CoreIPC/Connection.h:
(CoreIPC::Connection::MessageReceiver::~MessageReceiver):
Add MessageReceiver class and make Client inherit from it.
(CoreIPC::Connection::MessageReceiver::didReceiveSyncMessage):
Change didReceiveSyncMessage from being a pure virtual member function and make it
assert by default instead.
* UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
* UIProcess/ChunkedUpdateDrawingAreaProxy.h:
Remove ChunkedUpdateDrawingAreaProxy::didReceiveSyncMessage.
* Shared/DrawingAreaBase.h:
Include "Connection.h" instead.
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::didReceiveSyncMessage):
Change didReceiveSyncMessage from being a pure virtual member function and make it
assert by default instead.
* WebProcess/WebProcess.cpp:
* WebProcess/WebProcess.h:
Remove didReceiveSyncMessage.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64867 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3f4435a..ed9cddb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,34 @@
+2010-08-06 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Add CoreIPC::MessageReceiver class
+ https://bugs.webkit.org/show_bug.cgi?id=43637
+
+ * Platform/CoreIPC/Connection.h:
+ (CoreIPC::Connection::MessageReceiver::~MessageReceiver):
+ Add MessageReceiver class and make Client inherit from it.
+
+ (CoreIPC::Connection::MessageReceiver::didReceiveSyncMessage):
+ Change didReceiveSyncMessage from being a pure virtual member function and make it
+ assert by default instead.
+
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.h:
+ Remove ChunkedUpdateDrawingAreaProxy::didReceiveSyncMessage.
+
+ * Shared/DrawingAreaBase.h:
+ Include "Connection.h" instead.
+
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::didReceiveSyncMessage):
+ Change didReceiveSyncMessage from being a pure virtual member function and make it
+ assert by default instead.
+
+ * WebProcess/WebProcess.cpp:
+ * WebProcess/WebProcess.h:
+ Remove didReceiveSyncMessage.
+
2010-08-06 Jessie Berlin <jberlin at apple.com>
Roll out http://trac.webkit.org/changeset/64801, which broke the Safari Windows Build.
diff --git a/WebKit2/Platform/CoreIPC/Connection.h b/WebKit2/Platform/CoreIPC/Connection.h
index 3dcd763..db341ec 100644
--- a/WebKit2/Platform/CoreIPC/Connection.h
+++ b/WebKit2/Platform/CoreIPC/Connection.h
@@ -55,12 +55,20 @@ class MessageID;
class Connection : public ThreadSafeShared<Connection> {
public:
- class Client {
+ class MessageReceiver {
+ protected:
+ virtual ~MessageReceiver() { }
+
public:
- virtual ~Client() { }
-
virtual void didReceiveMessage(Connection*, MessageID, ArgumentDecoder*) = 0;
- virtual void didReceiveSyncMessage(Connection*, MessageID, ArgumentDecoder*, ArgumentEncoder*) = 0;
+ virtual void didReceiveSyncMessage(Connection*, MessageID, ArgumentDecoder*, ArgumentEncoder*) { ASSERT_NOT_REACHED(); }
+ };
+
+ class Client : public MessageReceiver {
+ protected:
+ virtual ~Client() { }
+
+ public:
virtual void didClose(Connection*) = 0;
};
diff --git a/WebKit2/Shared/DrawingAreaBase.h b/WebKit2/Shared/DrawingAreaBase.h
index d44aa50..2ac7ddf 100644
--- a/WebKit2/Shared/DrawingAreaBase.h
+++ b/WebKit2/Shared/DrawingAreaBase.h
@@ -27,18 +27,13 @@
#define DrawingAreaBase_h
#include "ArgumentCoders.h"
+#include "Connection.h"
namespace WebCore {
class IntRect;
class IntSize;
}
-namespace CoreIPC {
- class ArgumentDecoder;
- class Connection;
- class MessageID;
-}
-
namespace WebKit {
class DrawingAreaBase {
diff --git a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
index 06a4d1d..9db7d57 100644
--- a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
@@ -168,9 +168,4 @@ void ChunkedUpdateDrawingAreaProxy::didReceiveMessage(CoreIPC::Connection*, Core
}
}
-void ChunkedUpdateDrawingAreaProxy::didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&, CoreIPC::ArgumentEncoder&)
-{
- ASSERT_NOT_REACHED();
-}
-
} // namespace WebKit
diff --git a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
index af8aafa..58ccaca 100644
--- a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
+++ b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
@@ -71,7 +71,6 @@ private:
// DrawingAreaProxy
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&);
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&, CoreIPC::ArgumentEncoder&);
virtual void paint(const WebCore::IntRect&, PlatformDrawingContext);
virtual void setSize(const WebCore::IntSize&);
virtual void setPageIsVisible(bool isVisible);
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.h b/WebKit2/UIProcess/DrawingAreaProxy.h
index f7259f8..5a73f49 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -49,7 +49,7 @@ public:
virtual ~DrawingAreaProxy();
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&) = 0;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&, CoreIPC::ArgumentEncoder&) = 0;
+ virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&, CoreIPC::ArgumentEncoder&) { ASSERT_NOT_REACHED(); }
virtual void paint(const WebCore::IntRect&, PlatformDrawingContext) = 0;
virtual void setSize(const WebCore::IntSize&) = 0;
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index b1d3a48..85b8bae 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -819,8 +819,8 @@
BC111B5F112F635E00337BAB /* CoreIPCSupport */,
BC111B5A112F628200337BAB /* mac */,
BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
- 0FB659221208B4DB0044816C /* DrawingAreaBase.h */,
0FB659A51208B9EE0044816C /* DrawingAreaBase.cpp */,
+ 0FB659221208B4DB0044816C /* DrawingAreaBase.h */,
1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */,
BC64696D11DBE603006455B0 /* ImmutableArray.cpp */,
BC64696E11DBE603006455B0 /* ImmutableArray.h */,
diff --git a/WebKit2/WebProcess/WebProcess.cpp b/WebKit2/WebProcess/WebProcess.cpp
index dd9f633..25cb4bc 100644
--- a/WebKit2/WebProcess/WebProcess.cpp
+++ b/WebKit2/WebProcess/WebProcess.cpp
@@ -309,12 +309,6 @@ void WebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::Mes
page->didReceiveMessage(connection, messageID, *arguments);
}
-void WebProcess::didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*)
-{
- // The web process should never ever get sync messages.
- ASSERT_NOT_REACHED();
-}
-
void WebProcess::didClose(CoreIPC::Connection*)
{
// When running in the same process the connection will never be closed.
diff --git a/WebKit2/WebProcess/WebProcess.h b/WebKit2/WebProcess/WebProcess.h
index dfcb2ef..1617d74 100644
--- a/WebKit2/WebProcess/WebProcess.h
+++ b/WebKit2/WebProcess/WebProcess.h
@@ -86,7 +86,6 @@ private:
// CoreIPC::Connection::Client
void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
- void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
void didClose(CoreIPC::Connection*);
RefPtr<CoreIPC::Connection> m_connection;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list