[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 15:18:32 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit dde5dff0e2a09dc909e4c75d627843f702329160
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 30 01:09:58 2010 +0000
2010-10-29 Andreas Kling <kling at webkit.org>
Reviewed by Anders Carlsson.
WK2: Unbreak compilation of WebPlatformTouchPoint::decode()
* Shared/WebPlatformTouchPoint.cpp:
(WebKit::WebPlatformTouchPoint::decode):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70964 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index cd23932..06a7255 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-29 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ WK2: Unbreak compilation of WebPlatformTouchPoint::decode()
+
+ * Shared/WebPlatformTouchPoint.cpp:
+ (WebKit::WebPlatformTouchPoint::decode):
+
2010-10-29 Darin Adler <darin at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/Shared/WebPlatformTouchPoint.cpp b/WebKit2/Shared/WebPlatformTouchPoint.cpp
index a974f84..3954368 100644
--- a/WebKit2/Shared/WebPlatformTouchPoint.cpp
+++ b/WebKit2/Shared/WebPlatformTouchPoint.cpp
@@ -49,7 +49,7 @@ void WebPlatformTouchPoint::encode(CoreIPC::ArgumentEncoder* encoder) const
bool WebPlatformTouchPoint::decode(CoreIPC::ArgumentDecoder* decoder, WebPlatformTouchPoint& t)
{
- return decoder->decode(CoreIPC::Out(m_id, m_state, m_screenPosition, m_position));
+ return decoder->decode(CoreIPC::Out(t.m_id, t.m_state, t.m_screenPosition, t.m_position));
}
} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list