[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 42cba7bcf81ef2ee414574803bd597c9851b4125
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 21:26:44 2010 +0000

    Remove redundant data members from WebTouchEvent
    
    WebEvent already stores the Type and timestamp.
    
    Fixes <http://webkit.org/b/48671> WebTouchEvent duplicates data from
    WebEvent
    
    Reviewed by Anders Carlsson.
    
    * Shared/WebEvent.h:
    * Shared/WebTouchEvent.cpp:
    (WebKit::WebTouchEvent::WebTouchEvent):
    Removed m_type and m_timestamp (which was never even getting
    initialized!).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70928 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f9edce3..32727af 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-29  Adam Roben  <aroben at apple.com>
+
+        Remove redundant data members from WebTouchEvent
+
+        WebEvent already stores the Type and timestamp.
+
+        Fixes <http://webkit.org/b/48671> WebTouchEvent duplicates data from
+        WebEvent
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebEvent.h:
+        * Shared/WebTouchEvent.cpp:
+        (WebKit::WebTouchEvent::WebTouchEvent):
+        Removed m_type and m_timestamp (which was never even getting
+        initialized!).
+
 2010-10-29  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/Shared/WebEvent.h b/WebKit2/Shared/WebEvent.h
index 46c3687..1124f4d 100644
--- a/WebKit2/Shared/WebEvent.h
+++ b/WebKit2/Shared/WebEvent.h
@@ -249,13 +249,11 @@ public:
 private:
     static bool isTouchEventType(Type);
 
-    Type m_type;
     Vector<WebPlatformTouchPoint> m_touchPoints;
     bool m_ctrlKey;
     bool m_altKey;
     bool m_shiftKey;
     bool m_metaKey;
-    double m_timestamp;
 };
 
 #endif // ENABLE(TOUCH_EVENTS)
diff --git a/WebKit2/Shared/WebTouchEvent.cpp b/WebKit2/Shared/WebTouchEvent.cpp
index f705ca0..3b79ea9 100644
--- a/WebKit2/Shared/WebTouchEvent.cpp
+++ b/WebKit2/Shared/WebTouchEvent.cpp
@@ -33,7 +33,6 @@ namespace WebKit {
 
 WebTouchEvent::WebTouchEvent(WebEvent::Type type, Vector<WebPlatformTouchPoint> touchPoints, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, Modifiers modifiers, double timestamp)
     : WebEvent(type, modifiers, timestamp)
-    , m_type(type)
     , m_touchPoints(touchPoints)
     , m_ctrlKey(ctrlKey)
     , m_altKey(altKey)

-- 
WebKit Debian packaging