diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 22:59:43 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 22:59:43 +0000 |
commit | 090ac3fac1a1d4d49cec412321653c089838f965 (patch) | |
tree | 829313314a1b3641b3f4e3016e250b45ed8e9b28 | |
parent | fb9a9fa42b71367b1cda5ca444cf93a3ef74cd3b (diff) | |
download | chromium_src-090ac3fac1a1d4d49cec412321653c089838f965.zip chromium_src-090ac3fac1a1d4d49cec412321653c089838f965.tar.gz chromium_src-090ac3fac1a1d4d49cec412321653c089838f965.tar.bz2 |
Add stub constructors to compile on Linux and remove warning for switch cases not handled in the code
Review URL: http://codereview.chromium.org/6426
Patch from icefox.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3146 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | webkit/glue/SConscript | 2 | ||||
-rw-r--r-- | webkit/glue/event_conversion.cc | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index 9d75882..5312a7b 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -21,6 +21,7 @@ input_files = [ 'dom_operations.cc', 'editor_client_impl.cc', 'entity_map.cc', + 'event_conversion.cc', 'glue_util.cc', 'image_decoder.cc', 'npruntime_util.cc', @@ -49,7 +50,6 @@ if env['PLATFORM'] == 'win32': 'debugger.cc', 'dom_serializer.cc', 'dragclient_impl.cc', - 'event_conversion.cc', 'feed_preview.cc', 'glue_accessibility.cc', 'glue_serialize.cc', diff --git a/webkit/glue/event_conversion.cc b/webkit/glue/event_conversion.cc index ba5d418..af476c2 100644 --- a/webkit/glue/event_conversion.cc +++ b/webkit/glue/event_conversion.cc @@ -40,6 +40,8 @@ MakePlatformMouseEvent::MakePlatformMouseEvent(Widget* widget, : PlatformMouseEvent(NULL, 0, 0, 0, false /* TODO(darin): do we care? */) { #elif defined(OS_MACOSX) : PlatformMouseEvent(e.mac_event.get()) { +#elif defined(OS_LINUX) + : PlatformMouseEvent() { #endif #if defined(OS_WIN) || defined(OS_LINUX) // TODO(mpcomplete): widget is always toplevel, unless it's a popup. We @@ -128,6 +130,8 @@ MakePlatformWheelEvent::MakePlatformWheelEvent(Widget* widget, : PlatformWheelEvent(NULL, 0, 0, false) { // TODO(jackson): Check if it's a horizontal event #elif defined(OS_MACOSX) : PlatformWheelEvent(e.mac_event.get()) { +#elif defined(OS_LINUX) + : PlatformWheelEvent(NULL) { #endif #if defined(OS_WIN) || defined(OS_LINUX) m_position = widget->convertFromContainingWindow(IntPoint(e.x, e.y)); @@ -153,8 +157,9 @@ static inline const PlatformKeyboardEvent::Type platformKeyTypeForWebInputEventT return PlatformKeyboardEvent::KeyDown; case WebInputEvent::CHAR: return PlatformKeyboardEvent::Char; + default: + ASSERT_NOT_REACHED(); } - ASSERT_NOT_REACHED(); return PlatformKeyboardEvent::KeyDown; } @@ -167,6 +172,8 @@ MakePlatformKeyboardEvent::MakePlatformKeyboardEvent(const WebKeyboardEvent& e) e.system_key) { #elif defined(OS_MACOSX) : PlatformKeyboardEvent(e.mac_event.get()) { +#elif defined(OS_LINUX) + : PlatformKeyboardEvent(NULL) { #endif m_autoRepeat = (e.modifiers & WebInputEvent::IS_AUTO_REPEAT) != 0; m_isKeypad = (e.modifiers & WebInputEvent::IS_KEYPAD) != 0; |