[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
steveblock at google.com
steveblock at google.com
Wed Dec 22 14:06:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f0b6877472293b2e4165786c7a1f06d6063511c4
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 4 21:06:33 2010 +0000
2010-10-04 Huahui Wu <mediadependent at gmail.com>
Reviewed by Darin Adler.
Fix a compiler error for ANDROID introduced by bug 45221.
https://bugs.webkit.org/show_bug.cgi?id=47095
It's a small fix for a compiler error, so there is no new test.
* platform/android/PlatformTouchEventAndroid.cpp:
(WebCore::PlatformTouchEvent::PlatformTouchEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69034 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5ad3029..dd3789c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-04 Huahui Wu <mediadependent at gmail.com>
+
+ Reviewed by Darin Adler.
+
+ Fix a compiler error for ANDROID introduced by bug 45221.
+ https://bugs.webkit.org/show_bug.cgi?id=47095
+
+ It's a small fix for a compiler error, so there is no new test.
+
+ * platform/android/PlatformTouchEventAndroid.cpp:
+ (WebCore::PlatformTouchEvent::PlatformTouchEvent):
+
2010-10-04 Chris Fleizach <cfleizach at apple.com>
Reviewed by Beth Dakin.
diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp
index 930d13f..8b3d285 100644
--- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp
+++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp
@@ -43,7 +43,7 @@ PlatformTouchEvent::PlatformTouchEvent(const Vector<IntPoint>& windowPoints, Tou
{
m_touchPoints.reserveCapacity(windowPoints.size());
for (unsigned c = 0; c < windowPoints.size(); c++)
- m_touchPoints.append(PlatformTouchPoint(windowPos, state));
+ m_touchPoints.append(PlatformTouchPoint(c, windowPoints[c], state));
m_altKey = metaState & META_ALT_ON;
m_shiftKey = metaState & META_SHIFT_ON;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list