[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 37aceac7108223fa59ea443b7c1bde38095aafd2
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 20:36:17 2010 +0000

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

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 792fa38..af7f73f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,15 @@
 2010-03-12  Garret Kelly  <gdk at chromium.org>
 
+        Unreviewed.
+
+        Fix Chromium Mac build.
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::toPlatformTouchEventType):
+        (WebKit::toPlatformTouchPointState):
+
+2010-03-12  Garret Kelly  <gdk at chromium.org>
+
         Reviewed by Eric Seidel.
 
         Enable touch events in Chromium features gypi file.
diff --git a/WebKit/chromium/src/WebInputEventConversion.cpp b/WebKit/chromium/src/WebInputEventConversion.cpp
index 6a990aa..1321f7b 100644
--- a/WebKit/chromium/src/WebInputEventConversion.cpp
+++ b/WebKit/chromium/src/WebInputEventConversion.cpp
@@ -184,6 +184,7 @@ static inline TouchEventType toPlatformTouchEventType(const WebInputEvent::Type
     default:
         ASSERT_NOT_REACHED();
     }
+    return WebInputEvent::Undefined;
 }
 
 static inline PlatformTouchPoint::State toPlatformTouchPointState(const WebTouchPoint::State state)
@@ -202,6 +203,7 @@ static inline PlatformTouchPoint::State toPlatformTouchPointState(const WebTouch
     case WebTouchPoint::StateUndefined:
         ASSERT_NOT_REACHED();
     }
+    return WebTouchPoint::StateUndefined;
 }
 
 PlatformTouchPointBuilder::PlatformTouchPointBuilder(Widget* widget, const WebTouchPoint& point)

-- 
WebKit Debian packaging