[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
andersca at apple.com
andersca at apple.com
Sun Feb 20 22:49:36 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit da9618c201a83930d5e7890e1c588ec69667f5bf
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 22:58:10 2011 +0000
2011-01-11 Anders Carlsson <andersca at apple.com>
Reviewed by Darin Adler.
Add DidSetSize message
https://bugs.webkit.org/show_bug.cgi?id=52254
* DerivedSources.make:
Add DrawingAReaProxy.messages.in.
* Platform/CoreIPC/MessageID.h:
Add DrawingAreaProxy message class.
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::didSetSize):
Add CoreIPC message handler function.
* UIProcess/DrawingAreaProxy.messages.in: Added.
* UIProcess/DrawingAreaProxyImpl.cpp:
(WebKit::DrawingAreaProxyImpl::didSetSize):
Add stub.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didReceiveMessage):
Handle DrawingAreaProxy messages.
* WebKit2.xcodeproj/project.pbxproj:
Add new files.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::setSize):
Send a DidSetSize message for now.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75558 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c239c8c..b7c17ad 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,37 @@
+2011-01-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Add DidSetSize message
+ https://bugs.webkit.org/show_bug.cgi?id=52254
+
+ * DerivedSources.make:
+ Add DrawingAReaProxy.messages.in.
+
+ * Platform/CoreIPC/MessageID.h:
+ Add DrawingAreaProxy message class.
+
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::didSetSize):
+ Add CoreIPC message handler function.
+
+ * UIProcess/DrawingAreaProxy.messages.in: Added.
+
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ (WebKit::DrawingAreaProxyImpl::didSetSize):
+ Add stub.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didReceiveMessage):
+ Handle DrawingAreaProxy messages.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::setSize):
+ Send a DidSetSize message for now.
+
2011-01-11 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKit2/DerivedSources.make b/WebKit2/DerivedSources.make
index 28316f2..4350226 100644
--- a/WebKit2/DerivedSources.make
+++ b/WebKit2/DerivedSources.make
@@ -37,6 +37,7 @@ VPATH = \
MESSAGE_RECEIVERS = \
AuthenticationManager \
DrawingArea \
+ DrawingAreaProxy \
DownloadProxy \
NPObjectMessageReceiver \
PluginControllerProxy \
diff --git a/WebKit2/Platform/CoreIPC/MessageID.h b/WebKit2/Platform/CoreIPC/MessageID.h
index 92a0abb..724302c 100644
--- a/WebKit2/Platform/CoreIPC/MessageID.h
+++ b/WebKit2/Platform/CoreIPC/MessageID.h
@@ -47,6 +47,7 @@ enum MessageClass {
// Messages sent by the web process to the UI process.
MessageClassDownloadProxy,
+ MessageClassDrawingAreaProxy,
MessageClassDrawingAreaProxyLegacy,
MessageClassWebContext,
MessageClassWebContextLegacy,
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.h b/WebKit2/UIProcess/DrawingAreaProxy.h
index 6f80f76..fe45da7 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -53,6 +53,10 @@ public:
virtual ~DrawingAreaProxy();
+#ifdef __APPLE__
+ void didReceiveDrawingAreaProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+#endif
+
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*) = 0;
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*) { ASSERT_NOT_REACHED(); }
@@ -79,6 +83,11 @@ protected:
WebPageProxy* m_webPageProxy;
WebCore::IntSize m_size;
+
+private:
+ // CoreIPC message handlers.
+ // FIXME: These should be pure virtual.
+ virtual void didSetSize() { }
};
} // namespace WebKit
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.messages.in b/WebKit2/UIProcess/DrawingAreaProxy.messages.in
new file mode 100644
index 0000000..00c2ce4
--- /dev/null
+++ b/WebKit2/UIProcess/DrawingAreaProxy.messages.in
@@ -0,0 +1,25 @@
+# Copyright (C) 2010, 2011 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.
+
+messages -> DrawingAreaProxy {
+ DidSetSize()
+}
diff --git a/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index f0b4fa5..e886c3c 100644
--- a/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -85,6 +85,10 @@ void DrawingAreaProxyImpl::detachCompositingContext()
ASSERT_NOT_REACHED();
}
+void DrawingAreaProxyImpl::didSetSize()
+{
+}
+
void DrawingAreaProxyImpl::sendSetSize()
{
if (!m_webPageProxy->isValid())
diff --git a/WebKit2/UIProcess/DrawingAreaProxyImpl.h b/WebKit2/UIProcess/DrawingAreaProxyImpl.h
index 990241b..0659b42 100644
--- a/WebKit2/UIProcess/DrawingAreaProxyImpl.h
+++ b/WebKit2/UIProcess/DrawingAreaProxyImpl.h
@@ -47,6 +47,9 @@ private:
virtual void attachCompositingContext(uint32_t contextID);
virtual void detachCompositingContext();
+ // CoreIPC message handlers
+ virtual void didSetSize();
+
void sendSetSize();
};
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 0ed7625..d691a65 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -912,6 +912,13 @@ void WebPageProxy::setResizesToContentsUsingLayoutSize(const WebCore::IntSize& t
void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
+#ifdef __APPLE__
+ if (messageID.is<CoreIPC::MessageClassDrawingAreaProxy>()) {
+ m_drawingArea->didReceiveDrawingAreaProxyMessage(connection, messageID, arguments);
+ return;
+ }
+#endif
+
if (messageID.is<CoreIPC::MessageClassDrawingAreaProxyLegacy>()) {
m_drawingArea->didReceiveMessage(connection, messageID, arguments);
return;
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index ebfbdbb..d18e39f 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -131,6 +131,8 @@
1A64228B12DD024700CAAE2C /* DrawingArea.messages.in in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1A64228A12DD024700CAAE2C /* DrawingArea.messages.in */; };
1A64229912DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64229712DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp */; };
1A64229A12DD029200CAAE2C /* DrawingAreaMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64229812DD029200CAAE2C /* DrawingAreaMessages.h */; };
+ 1A64230812DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64230612DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp */; };
+ 1A64230912DD09EB00CAAE2C /* DrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */; };
1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */; };
1A6FA01E11E1526300DB1371 /* WebProcessMainMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FA01D11E1526300DB1371 /* WebProcessMainMac.mm */; };
@@ -842,6 +844,9 @@
1A64228A12DD024700CAAE2C /* DrawingArea.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawingArea.messages.in; sourceTree = "<group>"; };
1A64229712DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingAreaMessageReceiver.cpp; sourceTree = "<group>"; };
1A64229812DD029200CAAE2C /* DrawingAreaMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaMessages.h; sourceTree = "<group>"; };
+ 1A6422FC12DD08FE00CAAE2C /* DrawingAreaProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawingAreaProxy.messages.in; sourceTree = "<group>"; };
+ 1A64230612DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DrawingAreaProxyMessageReceiver.cpp; path = /Users/andersca/Build/Debug/DerivedSources/WebKit2/DrawingAreaProxyMessageReceiver.cpp; sourceTree = "<absolute>"; };
+ 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DrawingAreaProxyMessages.h; path = /Users/andersca/Build/Debug/DerivedSources/WebKit2/DrawingAreaProxyMessages.h; sourceTree = "<absolute>"; };
1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineMac.cpp; sourceTree = "<group>"; };
1A6FA01D11E1526300DB1371 /* WebProcessMainMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessMainMac.mm; sourceTree = "<group>"; };
@@ -2041,6 +2046,7 @@
BC2652151182608100243E12 /* ChunkedUpdateDrawingAreaProxy.h */,
BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
BC2652131182608100243E12 /* DrawingAreaProxy.h */,
+ 1A6422FC12DD08FE00CAAE2C /* DrawingAreaProxy.messages.in */,
1A64218512DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp */,
1A64218412DCF49200CAAE2C /* DrawingAreaProxyImpl.h */,
1A910070126675C4001842F5 /* FindIndicator.cpp */,
@@ -2590,6 +2596,8 @@
C0CE729D1247E71D00BC0EC4 /* Derived Sources */ = {
isa = PBXGroup;
children = (
+ 1A64230612DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp */,
+ 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */,
512F58A012A883AD00629530 /* AuthenticationManagerMessageReceiver.cpp */,
512F58A112A883AD00629530 /* AuthenticationManagerMessages.h */,
1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */,
@@ -2995,6 +3003,7 @@
1A64218612DCF49200CAAE2C /* DrawingAreaProxyImpl.h in Headers */,
1A6421F612DCFBAB00CAAE2C /* DrawingAreaImpl.h in Headers */,
1A64229A12DD029200CAAE2C /* DrawingAreaMessages.h in Headers */,
+ 1A64230912DD09EB00CAAE2C /* DrawingAreaProxyMessages.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3446,6 +3455,7 @@
1A64218712DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp in Sources */,
1A6421F712DCFBAB00CAAE2C /* DrawingAreaImpl.cpp in Sources */,
1A64229912DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp in Sources */,
+ 1A64230812DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
index 6dfef9b..02d327e 100644
--- a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
+++ b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
@@ -25,6 +25,9 @@
#include "DrawingAreaImpl.h"
+#include "DrawingAreaProxyMessages.h"
+#include "WebPage.h"
+
#ifndef __APPLE__
#error "This drawing area is not ready for use by other ports yet."
#endif
@@ -81,6 +84,9 @@ void DrawingAreaImpl::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID
void DrawingAreaImpl::setSize(const IntSize& size)
{
+ // FIXME: Actually do something.
+
+ m_webPage->send(Messages::DrawingAreaProxy::DidSetSize());
}
} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list