am 652e9a01: Migrate to new keycode constants in keycodes.h.

Merge commit '652e9a017a7c5c772361bf57279fae0c26992329' into gingerbread-plus-aosp

* commit '652e9a017a7c5c772361bf57279fae0c26992329':
  Migrate to new keycode constants in keycodes.h.

1 files changed, 6 insertions, 6 deletions

diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 6c58852..2ed6148 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -637,19 +637,19 @@ void getVisibleRect(WebCore::IntRect* rect)
     checkException(env);
 }
 
-static CachedFrame::Direction KeyToDirection(KeyCode keyCode)
+static CachedFrame::Direction KeyToDirection(int32_t keyCode)
 {
     switch (keyCode) {
-        case kKeyCodeDpadRight:
+        case AKEYCODE_DPAD_RIGHT:
             DBG_NAV_LOGD("keyCode=%s", "right");
             return CachedFrame::RIGHT;
-        case kKeyCodeDpadLeft:
+        case AKEYCODE_DPAD_LEFT:
             DBG_NAV_LOGD("keyCode=%s", "left");
             return CachedFrame::LEFT;
-        case kKeyCodeDpadDown:
+        case AKEYCODE_DPAD_DOWN:
             DBG_NAV_LOGD("keyCode=%s", "down");
             return CachedFrame::DOWN;
-        case kKeyCodeDpadUp:
+        case AKEYCODE_DPAD_UP:
             DBG_NAV_LOGD("keyCode=%s", "up");
             return CachedFrame::UP;
         default:
@@ -686,7 +686,7 @@ bool moveCursor(int keyCode, int count, bool ignoreScroll)
     }
 
     m_viewImpl->m_moveGeneration++;
-    CachedFrame::Direction direction = KeyToDirection((KeyCode) keyCode);
+    CachedFrame::Direction direction = KeyToDirection(keyCode);
     const CachedFrame* cachedFrame, * oldFrame = 0;
     const CachedNode* cursor = root->currentCursor(&oldFrame);
     WebCore::IntPoint cursorLocation = root->cursorLocation();