diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-24 00:18:50 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-24 00:18:50 +0000 |
| commit | 0e99b20309c9dd45d122d597ddcaab33a2653826 (patch) | |
| tree | 79973122d1dd4c1d845642ebcb1cabdceb1a9d27 /webkit/port | |
| parent | e6bc3f6a01430619561a4f2b95f8f921e5841ab3 (diff) | |
| download | chromium_src-0e99b20309c9dd45d122d597ddcaab33a2653826.zip chromium_src-0e99b20309c9dd45d122d597ddcaab33a2653826.tar.gz chromium_src-0e99b20309c9dd45d122d597ddcaab33a2653826.tar.bz2 | |
Now that we have the windows VK_* values defined, we can include
handleKeyEvent on all platforms.
Also change #ifs to use the webkit style in port rather than the chrome style.
Review URL: http://codereview.chromium.org/7942
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
| -rw-r--r-- | webkit/port/platform/chromium/DragImageRef.h | 2 | ||||
| -rw-r--r-- | webkit/port/platform/chromium/PopupMenuChromium.cpp | 6 | ||||
| -rw-r--r-- | webkit/port/platform/chromium/ScrollViewChromium.cpp | 7 |
3 files changed, 5 insertions, 10 deletions
diff --git a/webkit/port/platform/chromium/DragImageRef.h b/webkit/port/platform/chromium/DragImageRef.h index d2e603f..b498e9a 100644 --- a/webkit/port/platform/chromium/DragImageRef.h +++ b/webkit/port/platform/chromium/DragImageRef.h @@ -30,7 +30,7 @@ #ifndef DragImageRef_h__ #define DragImageRef_h__ -#include "build/build_config.h" +#include "config.h" #if defined(OS_WIN) typedef struct HBITMAP__* HBITMAP; diff --git a/webkit/port/platform/chromium/PopupMenuChromium.cpp b/webkit/port/platform/chromium/PopupMenuChromium.cpp index 47afef4..8d63e71 100644 --- a/webkit/port/platform/chromium/PopupMenuChromium.cpp +++ b/webkit/port/platform/chromium/PopupMenuChromium.cpp @@ -54,7 +54,7 @@ #include "Widget.h" #include "WidgetClientChromium.h" -#if PLATFORM(DARWIN) +#if !PLATFORM(WIN_OS) #include "KeyboardCodes.h" #endif @@ -549,7 +549,6 @@ 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; @@ -585,9 +584,6 @@ 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 diff --git a/webkit/port/platform/chromium/ScrollViewChromium.cpp b/webkit/port/platform/chromium/ScrollViewChromium.cpp index 92eb67a..b773243 100644 --- a/webkit/port/platform/chromium/ScrollViewChromium.cpp +++ b/webkit/port/platform/chromium/ScrollViewChromium.cpp @@ -24,7 +24,6 @@ */ #include "config.h" -#include "build/build_config.h" #include "ScrollView.h" #include "Chrome.h" @@ -108,7 +107,7 @@ public: // Highlights the node selected in the DOM inspector. void highlightInspectedNode(GraphicsContext* context, Frame* frame) const; -#if defined(OS_WIN) +#if PLATFORM(WIN_OS) // Highlight a certain Range on the page. void highlightRange(HDC hdc, HDC mem_dc, RefPtr<Range> range) const; #endif @@ -308,7 +307,7 @@ const SkBitmap* ScrollView::ScrollViewPrivate::GetPreloadedBitmapFromRenderer( return c->getPreloadedResourceBitmap(resource_id); } -#if defined(OS_WIN) +#if PLATFORM(WIN_OS) void ScrollView::ScrollViewPrivate::highlightMatches( GraphicsContext* context) const { @@ -451,7 +450,7 @@ void ScrollView::ScrollViewPrivate::highlightInspectedNode( #endif } -#if defined(OS_WIN) +#if PLATFORM(WIN_OS) void ScrollView::ScrollViewPrivate::highlightRange(HDC hdc, HDC mem_dc, RefPtr<Range> range) const { // We need to figure out whether the match that we want to |