Commit 0ea4f58a authored by abarth@webkit.org's avatar abarth@webkit.org
Browse files

2010-03-12 Garret Kelly <gdk@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
parent ba24f910
2010-03-12 Garret Kelly <gdk@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@chromium.org>
Unreviewed.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment