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

weinig at apple.com weinig at apple.com
Sun Feb 20 22:53:48 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 0300e230f6d13b3d7f1d8706a5b0e62d785a13cf
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 02:01:43 2011 +0000

    Another build fix.
    
    * platform/mac/WheelEventMac.mm:
    (WebCore::phaseForEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75668 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ac00b71..c1297bb 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-12  Sam Weinig  <sam at webkit.org>
 
+        Another build fix.
+
+        * platform/mac/WheelEventMac.mm:
+        (WebCore::phaseForEvent):
+
+2011-01-12  Sam Weinig  <sam at webkit.org>
+
         Fix build.
 
         * platform/mac/WheelEventMac.mm:
diff --git a/Source/WebCore/platform/mac/WheelEventMac.mm b/Source/WebCore/platform/mac/WheelEventMac.mm
index cb40cc2..d4fc698 100644
--- a/Source/WebCore/platform/mac/WheelEventMac.mm
+++ b/Source/WebCore/platform/mac/WheelEventMac.mm
@@ -35,7 +35,7 @@ namespace WebCore {
 
 static PlatformWheelEventPhase phaseForEvent(NSEvent *event)
 {
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     uint32_t phase = PlatformWheelEventPhaseNone; 
     if ([event momentumPhase] & NSEventPhaseBegan)
         phase |= PlatformWheelEventPhaseBegan;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list