[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 0ea4f58a1882bd7ce70d10228d6113c9d72a6d2b
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 21:15:02 2010 +0000

    2010-03-12  Garret Kelly  <gdk at chromium.org>
    
            Unreiviewed.
    
            Fix Chromium Mac build. Last patch did not apply properly.
            (Garret assures me this patch will actually work.)
    
            * src/WebInputEventConversion.cpp:
            (WebKit::toPlatformTouchEventType):
            (WebKit::toPlatformTouchPointState):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55933 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 18a8e26..7385c58 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,16 @@
 2010-03-12  Garret Kelly  <gdk at chromium.org>
 
+        Unreiviewed.
+
+        Fix Chromium Mac build. Last patch did not apply properly.
+        (Garret assures me this patch will actually work.)
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::toPlatformTouchEventType):
+        (WebKit::toPlatformTouchPointState):
+
+2010-03-12  Garret Kelly  <gdk at chromium.org>
+
         Unreviewed.
 
         Fix Chromium Mac build. This time, with actual fixing goodness.
diff --git a/WebKit/chromium/src/WebInputEventConversion.cpp b/WebKit/chromium/src/WebInputEventConversion.cpp
index b968862..1835de3 100644
--- a/WebKit/chromium/src/WebInputEventConversion.cpp
+++ b/WebKit/chromium/src/WebInputEventConversion.cpp
@@ -81,7 +81,6 @@ PlatformMouseEventBuilder::PlatformMouseEventBuilder(Widget* widget, const WebMo
     default:
         ASSERT_NOT_REACHED();
     }
-    return TouchStart;
 }
 
 // PlatformWheelEventBuilder --------------------------------------------------
@@ -155,7 +154,6 @@ 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
@@ -186,7 +184,7 @@ static inline TouchEventType toPlatformTouchEventType(const WebInputEvent::Type
     default:
         ASSERT_NOT_REACHED();
     }
-    return WebInputEvent::Undefined;
+    return TouchStart;
 }
 
 static inline PlatformTouchPoint::State toPlatformTouchPointState(const WebTouchPoint::State state)
@@ -205,7 +203,7 @@ static inline PlatformTouchPoint::State toPlatformTouchPointState(const WebTouch
     case WebTouchPoint::StateUndefined:
         ASSERT_NOT_REACHED();
     }
-    return WebTouchPoint::StateUndefined;
+    return PlatformTouchPoint::TouchReleased;
 }
 
 PlatformTouchPointBuilder::PlatformTouchPointBuilder(Widget* widget, const WebTouchPoint& point)

-- 
WebKit Debian packaging