diff options
| -rw-r--r-- | webkit/SConscript.port | 1 | ||||
| -rw-r--r-- | webkit/port/platform/chromium/PopupMenuChromium.cpp | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index 1949ce3..1e6af37 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -120,7 +120,6 @@ if env['PLATFORM'] == 'posix': '$PORT_DIR/page/chromium/AXObjectCacheChromium.cpp', '$PORT_DIR/platform/chromium/DragDataChromium.cpp', '$PORT_DIR/platform/chromium/PlatformScrollBarChromium.cpp', - '$PORT_DIR/platform/chromium/PopupMenuChromium.cpp', '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp', '$PORT_DIR/platform/graphics/ImageSkia.cpp', ] diff --git a/webkit/port/platform/chromium/PopupMenuChromium.cpp b/webkit/port/platform/chromium/PopupMenuChromium.cpp index 31a07b7..75ea7a9 100644 --- a/webkit/port/platform/chromium/PopupMenuChromium.cpp +++ b/webkit/port/platform/chromium/PopupMenuChromium.cpp @@ -41,11 +41,12 @@ #include "FramelessScrollView.h" #include "GraphicsContext.h" #include "IntRect.h" +#include "NotImplemented.h" #include "Page.h" #include "PlatformKeyboardEvent.h" #include "PlatformMouseEvent.h" #include "PlatformScreen.h" -#include "PlatformScrollbar.h" +#include "PlatformScrollBar.h" #include "PlatformWheelEvent.h" #include "SystemTime.h" #include "RenderBlock.h" @@ -182,11 +183,11 @@ private: PopupListBox(PopupMenuClient* client) : m_originalIndex(0) , m_selectedIndex(0) + , m_acceptOnAbandon(false) , m_visibleRows(0) , m_popupClient(client) , m_repeatingChar(0) , m_lastCharTime(0) - , m_acceptOnAbandon(false) { setScrollbarsMode(ScrollbarAlwaysOff); } @@ -543,11 +544,10 @@ bool PopupListBox::handleKeyEvent(const PlatformKeyboardEvent& event) if (event.type() == PlatformKeyboardEvent::KeyUp) return true; +#if defined(OS_WIN) if (numItems() == 0 && event.windowsVirtualKeyCode() != VK_ESCAPE) return true; - int oldIndex = m_selectedIndex; - switch (event.windowsVirtualKeyCode()) { case VK_ESCAPE: abandon(); // may delete this @@ -580,6 +580,9 @@ bool PopupListBox::handleKeyEvent(const PlatformKeyboardEvent& event) } break; } +#else + notImplemented(); +#endif if (m_originalIndex != m_selectedIndex) { // Keyboard events should update the selection immediately (but we don't |