[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:20 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit cf05793256faf914a2be0fbb5a999db38c5e03cb
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 21:53:29 2011 +0000
2011-01-11 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
Add SetSize message
https://bugs.webkit.org/show_bug.cgi?id=52247
* DerivedSources.make:
Add DrawingArea.messages.in
* Platform/CoreIPC/MessageID.h:
Add DrawingArea message class.
* UIProcess/DrawingAreaProxyImpl.cpp:
(WebKit::DrawingAreaProxyImpl::sizeDidChange):
Call sendSetSize.
(WebKit::DrawingAreaProxyImpl::sendSetSize):
Send a SetSize message.
* UIProcess/DrawingAreaProxyImpl.h:
Add setSize override.
* WebKit2.xcodeproj/project.pbxproj:
Add new files.
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::setSize):
Add setSize member function.
* WebProcess/WebPage/DrawingArea.messages.in: Added.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
* WebProcess/WebPage/DrawingAreaImpl.h:
Add setSize.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didReceiveMessage):
Handle drawing area messages.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75550 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0a95c0d..e7ffdda 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,46 @@
Reviewed by Sam Weinig.
+ Add SetSize message
+ https://bugs.webkit.org/show_bug.cgi?id=52247
+
+ * DerivedSources.make:
+ Add DrawingArea.messages.in
+
+ * Platform/CoreIPC/MessageID.h:
+ Add DrawingArea message class.
+
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ (WebKit::DrawingAreaProxyImpl::sizeDidChange):
+ Call sendSetSize.
+
+ (WebKit::DrawingAreaProxyImpl::sendSetSize):
+ Send a SetSize message.
+
+ * UIProcess/DrawingAreaProxyImpl.h:
+ Add setSize override.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::setSize):
+ Add setSize member function.
+
+ * WebProcess/WebPage/DrawingArea.messages.in: Added.
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+ Add setSize.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didReceiveMessage):
+ Handle drawing area messages.
+
+2011-01-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
Replace ASSERTs with FIXMEs.
* UIProcess/DrawingAreaProxyImpl.cpp:
diff --git a/WebKit2/DerivedSources.make b/WebKit2/DerivedSources.make
index f12239a..28316f2 100644
--- a/WebKit2/DerivedSources.make
+++ b/WebKit2/DerivedSources.make
@@ -36,6 +36,7 @@ VPATH = \
MESSAGE_RECEIVERS = \
AuthenticationManager \
+ DrawingArea \
DownloadProxy \
NPObjectMessageReceiver \
PluginControllerProxy \
diff --git a/WebKit2/Platform/CoreIPC/MessageID.h b/WebKit2/Platform/CoreIPC/MessageID.h
index b19a5f7..92a0abb 100644
--- a/WebKit2/Platform/CoreIPC/MessageID.h
+++ b/WebKit2/Platform/CoreIPC/MessageID.h
@@ -36,6 +36,7 @@ enum MessageClass {
// Messages sent by the UI process to the web process.
MessageClassAuthenticationManager,
+ MessageClassDrawingArea,
MessageClassDrawingAreaLegacy,
MessageClassInjectedBundle,
MessageClassWebDatabaseManager,
diff --git a/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index d3c5663..f0b4fa5 100644
--- a/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -25,6 +25,10 @@
#include "DrawingAreaProxyImpl.h"
+#include "DrawingAreaMessages.h"
+#include "WebPageProxy.h"
+#include "WebProcessProxy.h"
+
#ifndef __APPLE__
#error "This drawing area is not ready for use by other ports yet."
#endif
@@ -63,7 +67,7 @@ bool DrawingAreaProxyImpl::paint(const WebCore::IntRect&, PlatformDrawingContext
void DrawingAreaProxyImpl::sizeDidChange()
{
- // FIXME: Implement.
+ sendSetSize();
}
void DrawingAreaProxyImpl::setPageIsVisible(bool pageIsVisible)
@@ -81,4 +85,12 @@ void DrawingAreaProxyImpl::detachCompositingContext()
ASSERT_NOT_REACHED();
}
+void DrawingAreaProxyImpl::sendSetSize()
+{
+ if (!m_webPageProxy->isValid())
+ return;
+
+ m_webPageProxy->process()->send(Messages::DrawingArea::SetSize(m_size), m_webPageProxy->pageID());
+}
+
} // namespace WebKit
diff --git a/WebKit2/UIProcess/DrawingAreaProxyImpl.h b/WebKit2/UIProcess/DrawingAreaProxyImpl.h
index 855a8cb..990241b 100644
--- a/WebKit2/UIProcess/DrawingAreaProxyImpl.h
+++ b/WebKit2/UIProcess/DrawingAreaProxyImpl.h
@@ -46,6 +46,8 @@ private:
virtual void setPageIsVisible(bool);
virtual void attachCompositingContext(uint32_t contextID);
virtual void detachCompositingContext();
+
+ void sendSetSize();
};
} // namespace WebKit
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index c05e975..ebfbdbb 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -128,6 +128,9 @@
1A64218712DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64218512DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp */; };
1A6421F612DCFBAB00CAAE2C /* DrawingAreaImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6421F412DCFBAB00CAAE2C /* DrawingAreaImpl.h */; };
1A6421F712DCFBAB00CAAE2C /* DrawingAreaImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6421F512DCFBAB00CAAE2C /* DrawingAreaImpl.cpp */; };
+ 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 */; };
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 */; };
@@ -713,6 +716,7 @@
dstSubfolderSpec = 1;
files = (
1A50DB66110A3D57000D3FE5 /* WebProcess.app in CopyFiles */,
+ 1A64228B12DD024700CAAE2C /* DrawingArea.messages.in in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -835,6 +839,9 @@
1A64218512DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingAreaProxyImpl.cpp; sourceTree = "<group>"; };
1A6421F412DCFBAB00CAAE2C /* DrawingAreaImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaImpl.h; sourceTree = "<group>"; };
1A6421F512DCFBAB00CAAE2C /* DrawingAreaImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingAreaImpl.cpp; sourceTree = "<group>"; };
+ 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>"; };
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>"; };
@@ -1987,6 +1994,7 @@
93FC679E12D3CC7400A60610 /* DecoderAdapter.h */,
BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */,
BC8452A61162C80900CAB9B5 /* DrawingArea.h */,
+ 1A64228A12DD024700CAAE2C /* DrawingArea.messages.in */,
1A6421F512DCFBAB00CAAE2C /* DrawingAreaImpl.cpp */,
1A6421F412DCFBAB00CAAE2C /* DrawingAreaImpl.h */,
93FC679F12D3CC7400A60610 /* EncoderAdapter.cpp */,
@@ -2586,6 +2594,8 @@
512F58A112A883AD00629530 /* AuthenticationManagerMessages.h */,
1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */,
1AB7D6181288B9D900CFD08C /* DownloadProxyMessages.h */,
+ 1A64229712DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp */,
+ 1A64229812DD029200CAAE2C /* DrawingAreaMessages.h */,
1A2D8437127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp */,
1A2D8438127F65D5001EB962 /* NPObjectMessageReceiverMessages.h */,
1A8EF96C1252AF6B00F7067F /* PluginControllerProxyMessageReceiver.cpp */,
@@ -2984,6 +2994,7 @@
1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */,
1A64218612DCF49200CAAE2C /* DrawingAreaProxyImpl.h in Headers */,
1A6421F612DCFBAB00CAAE2C /* DrawingAreaImpl.h in Headers */,
+ 1A64229A12DD029200CAAE2C /* DrawingAreaMessages.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3434,6 +3445,7 @@
1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */,
1A64218712DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp in Sources */,
1A6421F712DCFBAB00CAAE2C /* DrawingAreaImpl.cpp in Sources */,
+ 1A64229912DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.h b/WebKit2/WebProcess/WebPage/DrawingArea.h
index ed67dd5..4ccc88e 100644
--- a/WebKit2/WebProcess/WebPage/DrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.h
@@ -47,6 +47,10 @@ public:
static PassRefPtr<DrawingArea> create(DrawingAreaInfo::Type, DrawingAreaInfo::Identifier, WebPage*);
virtual ~DrawingArea();
+#ifdef __APPLE__
+ void didReceiveDrawingAreaMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+#endif
+
virtual void setNeedsDisplay(const WebCore::IntRect&) = 0;
virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect) = 0;
@@ -71,6 +75,11 @@ protected:
DrawingAreaInfo m_info;
WebPage* m_webPage;
+
+private:
+ // CoreIPC message handlers.
+ // FIXME: These should be pure virtual.
+ virtual void setSize(const WebCore::IntSize&) { }
};
} // namespace WebKit
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.messages.in b/WebKit2/WebProcess/WebPage/DrawingArea.messages.in
new file mode 100644
index 0000000..9fd38e2
--- /dev/null
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.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 -> DrawingArea {
+ SetSize(WebCore::IntSize size)
+}
diff --git a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
index 43d3644..6dfef9b 100644
--- a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
+++ b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
@@ -47,7 +47,7 @@ DrawingAreaImpl::DrawingAreaImpl(DrawingAreaInfo::Identifier identifier, WebPage
{
}
-void DrawingAreaImpl::setNeedsDisplay(const IntRect&)
+void DrawingAreaImpl::setNeedsDisplay(const IntRect& rect)
{
}
@@ -78,5 +78,9 @@ void DrawingAreaImpl::syncCompositingLayers()
void DrawingAreaImpl::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*)
{
}
-
+
+void DrawingAreaImpl::setSize(const IntSize& size)
+{
+}
+
} // namespace WebKit
diff --git a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
index 2cd33eb..1708943 100644
--- a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
+++ b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
@@ -47,6 +47,10 @@ private:
virtual void scheduleCompositingLayerSync();
virtual void syncCompositingLayers();
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+
+ // CoreIPC message handlers.
+ virtual void setSize(const WebCore::IntSize&);
+
};
} // namespace WebKit
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 9c7c864..2d7ced9 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -1429,6 +1429,14 @@ void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::Messag
return;
}
+#ifdef __APPLE__
+ if (messageID.is<CoreIPC::MessageClassDrawingArea>()) {
+ if (m_drawingArea)
+ m_drawingArea->didReceiveDrawingAreaMessage(connection, messageID, arguments);
+ return;
+ }
+#endif
+
#if ENABLE(INSPECTOR)
if (messageID.is<CoreIPC::MessageClassWebInspector>()) {
if (WebInspector* inspector = this->inspector())
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list