[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:42 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 85890a982eb1afbf5b13a80c047bd9a9d1cea1dc
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 13 01:45:41 2011 +0000
Fix build.
* platform/mac/WheelEventMac.mm:
(WebCore::phaseForEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75665 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 02a689c..ac00b71 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-12 Sam Weinig <sam at webkit.org>
+
+ Fix build.
+
+ * platform/mac/WheelEventMac.mm:
+ (WebCore::phaseForEvent):
+
2011-01-12 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
diff --git a/Source/WebCore/platform/mac/WheelEventMac.mm b/Source/WebCore/platform/mac/WheelEventMac.mm
index 9f171f8..cb40cc2 100644
--- a/Source/WebCore/platform/mac/WheelEventMac.mm
+++ b/Source/WebCore/platform/mac/WheelEventMac.mm
@@ -29,6 +29,7 @@
#import "PlatformMouseEvent.h"
#import "Scrollbar.h"
#import "WebCoreSystemInterface.h"
+#import <wtf/UnusedParam.h>
namespace WebCore {
@@ -48,7 +49,7 @@ static PlatformWheelEventPhase phaseForEvent(NSEvent *event)
phase |= PlatformWheelEventPhaseCancelled;
return static_cast<PlatformWheelEventPhase>(phase);
#else
- (void)event;
+ UNUSED_PARAM(event);
return PlatformWheelEventPhaseNone;
#endif
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list