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

[rniwa at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 8fe0b0bb5193e65edff46bdafa17285a4edebbc8
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 01:58:16 2011 +0000

    2011-01-12  Ryosuke Niwa  <rniwa at webkit.org>
    
            Unreviewed Qt build fix for r75661
    
            * Shared/WebEvent.h: Don't declare phase() on non-Mac platforms.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75667 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0b8ea31..2d6588c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-12  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Unreviewed Qt build fix for r75661
+
+        * Shared/WebEvent.h: Don't declare phase() on non-Mac platforms.
+
 2011-01-12  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/Shared/WebEvent.h b/WebKit2/Shared/WebEvent.h
index d4af992..f048d6e 100644
--- a/WebKit2/Shared/WebEvent.h
+++ b/WebKit2/Shared/WebEvent.h
@@ -174,7 +174,9 @@ public:
     const WebCore::FloatSize delta() const { return m_delta; }
     const WebCore::FloatSize wheelTicks() const { return m_wheelTicks; }
     Granularity granularity() const { return static_cast<Granularity>(m_granularity); }
+#if PLATFORM(MAC)
     Phase phase() const { return static_cast<Phase>(m_phase); }
+#endif
 
     void encode(CoreIPC::ArgumentEncoder*) const;
     static bool decode(CoreIPC::ArgumentDecoder*, WebWheelEvent&);

-- 
WebKit Debian packaging