[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[weinig at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit cb7e49f95307077d3ca13bd731fc47ff13e220bb
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 21:14:50 2011 +0000

    2011-01-25  Sam Weinig  <sam at webkit.org>
    
            Reviewed by Anders Carlsson.
    
            Pipe a timestamp down into the PlatformWheelEvent for the Mac.
            https://bugs.webkit.org/show_bug.cgi?id=53111
    
            * platform/PlatformWheelEvent.h:
            (WebCore::PlatformWheelEvent::PlatformWheelEvent):
            (WebCore::PlatformWheelEvent::timestamp):
            Add timestamp member.
    
            * platform/mac/WheelEventMac.mm:
            (WebCore::PlatformWheelEvent::PlatformWheelEvent):
            Initialize the timestamp from the event.
    2011-01-25  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            Don't inform the UI process about compositing changes when using the new drawing area
            https://bugs.webkit.org/show_bug.cgi?id=53120
    
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::changeAcceleratedCompositingMode):
            Return early if we're using the new drawing area.
    
            (WebKit::WebPage::exitAcceleratedCompositingMode):
            Call setRootCompositingLayer(0) so the drawing area knows when we leave accelerated compositing.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76636 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 779b7df..2e80101 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-25  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Pipe a timestamp down into the PlatformWheelEvent for the Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=53111
+
+        * platform/PlatformWheelEvent.h:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+        (WebCore::PlatformWheelEvent::timestamp):
+        Add timestamp member.
+
+        * platform/mac/WheelEventMac.mm:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+        Initialize the timestamp from the event.
+
 2011-01-25  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r76625.
diff --git a/Source/WebCore/platform/PlatformWheelEvent.h b/Source/WebCore/platform/PlatformWheelEvent.h
index 81e2243..2698e6e 100644
--- a/Source/WebCore/platform/PlatformWheelEvent.h
+++ b/Source/WebCore/platform/PlatformWheelEvent.h
@@ -100,6 +100,7 @@ namespace WebCore {
 #if PLATFORM(MAC)
             , m_hasPreciseScrollingDeltas(false)
             , m_phase(PlatformWheelEventPhaseNone)
+            , m_timestamp(0)
 #endif
         {
         }
@@ -153,6 +154,7 @@ namespace WebCore {
 
         PlatformWheelEventPhase phase() const { return m_phase; }
         bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
+        double timestamp() const { return m_timestamp; }
 #endif
 
 #if PLATFORM(QT)
@@ -190,6 +192,7 @@ namespace WebCore {
 #if PLATFORM(MAC)
         bool m_hasPreciseScrollingDeltas;
         PlatformWheelEventPhase m_phase;
+        double m_timestamp;
 #endif
     };
 
diff --git a/Source/WebCore/platform/mac/WheelEventMac.mm b/Source/WebCore/platform/mac/WheelEventMac.mm
index 422bb76..74265d1 100644
--- a/Source/WebCore/platform/mac/WheelEventMac.mm
+++ b/Source/WebCore/platform/mac/WheelEventMac.mm
@@ -64,6 +64,7 @@ PlatformWheelEvent::PlatformWheelEvent(NSEvent* event, NSView *windowView)
     , m_altKey([event modifierFlags] & NSAlternateKeyMask)
     , m_metaKey([event modifierFlags] & NSCommandKeyMask)
     , m_phase(phaseForEvent(event))
+    , m_timestamp([event timestamp])
 {
     BOOL continuous;
 
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 68a9508..085aaea 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -16,6 +16,17 @@
 
         Reviewed by Anders Carlsson.
 
+        Pipe a timestamp down into the PlatformWheelEvent for the Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=53111
+
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):
+        Assign the timestamp.
+
+2011-01-25  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
         Add hasPreciseScrollingDeltas bit to PlatformWheelEvent on the Mac.
         https://bugs.webkit.org/show_bug.cgi?id=53107
 
diff --git a/Source/WebKit2/Shared/WebEventConversion.cpp b/Source/WebKit2/Shared/WebEventConversion.cpp
index 70538b0..d82a051 100644
--- a/Source/WebKit2/Shared/WebEventConversion.cpp
+++ b/Source/WebKit2/Shared/WebEventConversion.cpp
@@ -113,6 +113,7 @@ public:
 #if PLATFORM(MAC)
         m_phase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.phase());
         m_hasPreciseScrollingDeltas = webEvent.hasPreciseScrollingDeltas();
+        m_timestamp = webEvent.timestamp();
 #endif
     }
 };

-- 
WebKit Debian packaging