[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 5e7111c6662c13ac7e5764468d6ebee729d98626
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 23:44:40 2010 +0000

    Use only CoreIPC-sanctioned types in WebEvent subclasses
    
    Fixes <http://webkit.org//48694> WebEvent subclasses should not use
    architecture-dependent types
    
    Reviewed by Anders Carlsson.
    
    * Shared/WebEvent.h:
    (WebKit::WebEvent::type):
    (WebKit::WebMouseEvent::button):
    (WebKit::WebMouseEvent::clickCount):
    (WebKit::WebWheelEvent::granularity):
    (WebKit::WebPlatformTouchPoint::id):
    (WebKit::WebPlatformTouchPoint::state):
    Replaced enums, ints, and unsigneds with uint32_ts, int32_ts, and
    uint32_ts, respectively.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70953 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index eeff561..d1cb8e5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-29  Adam Roben  <aroben at apple.com>
+
+        Use only CoreIPC-sanctioned types in WebEvent subclasses
+
+        Fixes <http://webkit.org//48694> WebEvent subclasses should not use
+        architecture-dependent types
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebEvent.h:
+        (WebKit::WebEvent::type):
+        (WebKit::WebMouseEvent::button):
+        (WebKit::WebMouseEvent::clickCount):
+        (WebKit::WebWheelEvent::granularity):
+        (WebKit::WebPlatformTouchPoint::id):
+        (WebKit::WebPlatformTouchPoint::state):
+        Replaced enums, ints, and unsigneds with uint32_ts, int32_ts, and
+        uint32_ts, respectively.
+
 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 1124f4d..34245ec 100644
--- a/WebKit2/Shared/WebEvent.h
+++ b/WebKit2/Shared/WebEvent.h
@@ -72,7 +72,7 @@ public:
         MetaKey     = 1 << 3,
     };
 
-    Type type() const { return (Type)m_type; }
+    Type type() const { return static_cast<Type>(m_type); }
 
     bool shiftKey() const { return m_modifiers & ShiftKey; }
     bool controlKey() const { return m_modifiers & ControlKey; }
@@ -109,13 +109,13 @@ public:
 
     WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp);
 
-    Button button() const { return m_button; }
+    Button button() const { return static_cast<Button>(m_button); }
     const WebCore::IntPoint& position() const { return m_position; }
     const WebCore::IntPoint& globalPosition() const { return m_globalPosition; }
     float deltaX() const { return m_deltaX; }
     float deltaY() const { return m_deltaY; }
     float deltaZ() const { return m_deltaZ; }
-    int clickCount() const { return m_clickCount; }
+    int32_t clickCount() const { return m_clickCount; }
 
     void encode(CoreIPC::ArgumentEncoder*) const;
     static bool decode(CoreIPC::ArgumentDecoder*, WebMouseEvent&);
@@ -123,13 +123,13 @@ public:
 private:
     static bool isMouseEventType(Type);
 
-    Button m_button;
+    uint32_t m_button;
     WebCore::IntPoint m_position;
     WebCore::IntPoint m_globalPosition;
     float m_deltaX;
     float m_deltaY;
     float m_deltaZ;
-    int m_clickCount;
+    int32_t m_clickCount;
 };
 
 // FIXME: Move this class to its own header file.
@@ -148,7 +148,7 @@ public:
     const WebCore::IntPoint globalPosition() const { return m_globalPosition; }
     const WebCore::FloatSize delta() const { return m_delta; }
     const WebCore::FloatSize wheelTicks() const { return m_wheelTicks; }
-    Granularity granularity() const { return (Granularity)m_granularity; }
+    Granularity granularity() const { return static_cast<Granularity>(m_granularity); }
 
     void encode(CoreIPC::ArgumentEncoder*) const;
     static bool decode(CoreIPC::ArgumentDecoder*, WebWheelEvent&);
@@ -160,7 +160,7 @@ private:
     WebCore::IntPoint m_globalPosition;
     WebCore::FloatSize m_delta;
     WebCore::FloatSize m_wheelTicks;
-    unsigned m_granularity; // Granularity
+    uint32_t m_granularity; // Granularity
 };
 
 // FIXME: Move this class to its own header file.
@@ -212,10 +212,10 @@ public:
 
     WebPlatformTouchPoint() { }
 
-    WebPlatformTouchPoint(unsigned id, TouchPointState, const WebCore::IntPoint& screenPosition, const WebCore::IntPoint& position);
+    WebPlatformTouchPoint(uint32_t id, TouchPointState, const WebCore::IntPoint& screenPosition, const WebCore::IntPoint& position);
 
-    unsigned id() const { return m_id; }
-    TouchPointState state() const { return m_state; }
+    uint32_t id() const { return m_id; }
+    TouchPointState state() const { return static_cast<TouchPointState>(m_state); }
 
     const WebCore::IntPoint& screenPosition() const { return m_screenPosition; }
     const WebCore::IntPoint& position() const { return m_position; }
@@ -226,8 +226,8 @@ public:
     static bool decode(CoreIPC::ArgumentDecoder*, WebPlatformTouchPoint&);
 
 private:
-    unsigned m_id;
-    TouchPointState m_state;
+    uint32_t m_id;
+    uint32_t m_state;
     WebCore::IntPoint m_screenPosition;
     WebCore::IntPoint m_position;
 

-- 
WebKit Debian packaging