[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ba24f91097893729a7ef989581e1c78fd3087514
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 20:48:17 2010 +0000

    2010-03-12  Garret Kelly  <gdk at chromium.org>
    
            Unreviewed.
    
            Fix Chromium Mac build. This time, with actual fixing goodness.
    
            * src/WebInputEventConversion.cpp:
            (WebKit::toPlatformTouchEventType):
            (WebKit::toPlatformTouchPointState):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55932 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index af7f73f..18a8e26 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,16 @@
 
         Unreviewed.
 
+        Fix Chromium Mac build. This time, with actual fixing goodness.
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::toPlatformTouchEventType):
+        (WebKit::toPlatformTouchPointState):
+
+2010-03-12  Garret Kelly  <gdk at chromium.org>
+
+        Unreviewed.
+
         Fix Chromium Mac build.
 
         * src/WebInputEventConversion.cpp:
diff --git a/WebKit/chromium/src/WebInputEventConversion.cpp b/WebKit/chromium/src/WebInputEventConversion.cpp
index 1321f7b..b968862 100644
--- a/WebKit/chromium/src/WebInputEventConversion.cpp
+++ b/WebKit/chromium/src/WebInputEventConversion.cpp
@@ -81,6 +81,7 @@ PlatformMouseEventBuilder::PlatformMouseEventBuilder(Widget* widget, const WebMo
     default:
         ASSERT_NOT_REACHED();
     }
+    return TouchStart;
 }
 
 // PlatformWheelEventBuilder --------------------------------------------------
@@ -154,6 +155,7 @@ void PlatformKeyboardEventBuilder::setKeyType(Type type)
         m_keyIdentifier = String();
         m_windowsVirtualKeyCode = 0;
     }
+    return PlatformTouchPoint::TouchReleased;
 }
 
 // Please refer to bug http://b/issue?id=961192, which talks about Webkit

-- 
WebKit Debian packaging