Commit eb9a413d authored by tkent@chromium.org's avatar tkent@chromium.org

2010-08-29 Kent Tamura <tkent@chromium.org>

        Reviewed by Dimitri Glazkov.

        [DRT/Chromium] Remove dependency to base/keyboard_codes.h
        https://bugs.webkit.org/show_bug.cgi?id=44847

        * DEPS: Roll Chromium revision to 57823 to have a webkit_support change.
2010-08-29  Kent Tamura  <tkent@chromium.org>

        Reviewed by Dimitri Glazkov.

        [DRT/Chromium] Remove dependency to base/keyboard_codes.h
        https://bugs.webkit.org/show_bug.cgi?id=44847

        * DumpRenderTree/chromium/EventSender.cpp:
         Use webkit_support::VKEY_* instead of base::VKEY_*.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66351 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3dd064f1
2010-08-29 Kent Tamura <tkent@chromium.org>
Reviewed by Dimitri Glazkov.
[DRT/Chromium] Remove dependency to base/keyboard_codes.h
https://bugs.webkit.org/show_bug.cgi?id=44847
* DEPS: Roll Chromium revision to 57823 to have a webkit_support change.
2010-08-28 Jian Li <jianli@chromium.org>
Reviewed by Darin Fisher.
......
......@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
'chromium_rev': '57707',
'chromium_rev': '57823',
}
deps = {
......
2010-08-29 Kent Tamura <tkent@chromium.org>
Reviewed by Dimitri Glazkov.
[DRT/Chromium] Remove dependency to base/keyboard_codes.h
https://bugs.webkit.org/show_bug.cgi?id=44847
* DumpRenderTree/chromium/EventSender.cpp:
Use webkit_support::VKEY_* instead of base::VKEY_*.
2010-08-29 Darin Adler <darin@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=40589
......
......@@ -44,7 +44,6 @@
#include "EventSender.h"
#include "TestShell.h"
#include "base/keyboard_codes.h"
#include "public/WebDragData.h"
#include "public/WebDragOperation.h"
#include "public/WebPoint.h"
......@@ -61,7 +60,6 @@
// FIXME: layout before each event?
using namespace base;
using namespace std;
using namespace WebKit;
......@@ -211,16 +209,16 @@ bool getEditCommand(const WebKeyboardEvent& event, string* name)
return false;
switch (event.windowsKeyCode) {
case base::VKEY_LEFT:
case webkit_support::VKEY_LEFT:
*name = "MoveToBeginningOfLine";
break;
case base::VKEY_RIGHT:
case webkit_support::VKEY_RIGHT:
*name = "MoveToEndOfLine";
break;
case base::VKEY_UP:
case webkit_support::VKEY_UP:
*name = "MoveToBeginningOfDocument";
break;
case base::VKEY_DOWN:
case webkit_support::VKEY_DOWN:
*name = "MoveToEndOfDocument";
break;
default:
......@@ -532,29 +530,29 @@ void EventSender::keyDown(const CppArgumentList& arguments, CppVariant* result)
bool needsShiftKeyModifier = false;
if ("\n" == codeStr) {
generateChar = true;
text = code = base::VKEY_RETURN;
text = code = webkit_support::VKEY_RETURN;
} else if ("rightArrow" == codeStr)
code = base::VKEY_RIGHT;
code = webkit_support::VKEY_RIGHT;
else if ("downArrow" == codeStr)
code = base::VKEY_DOWN;
code = webkit_support::VKEY_DOWN;
else if ("leftArrow" == codeStr)
code = base::VKEY_LEFT;
code = webkit_support::VKEY_LEFT;
else if ("upArrow" == codeStr)
code = base::VKEY_UP;
code = webkit_support::VKEY_UP;
else if ("insert" == codeStr)
code = base::VKEY_INSERT;
code = webkit_support::VKEY_INSERT;
else if ("delete" == codeStr)
code = base::VKEY_DELETE;
code = webkit_support::VKEY_DELETE;
else if ("pageUp" == codeStr)
code = base::VKEY_PRIOR;
code = webkit_support::VKEY_PRIOR;
else if ("pageDown" == codeStr)
code = base::VKEY_NEXT;
code = webkit_support::VKEY_NEXT;
else if ("home" == codeStr)
code = base::VKEY_HOME;
code = webkit_support::VKEY_HOME;
else if ("end" == codeStr)
code = base::VKEY_END;
code = webkit_support::VKEY_END;
else if ("printScreen" == codeStr)
code = base::VKEY_SNAPSHOT;
code = webkit_support::VKEY_SNAPSHOT;
else {
// Compare the input string with the function-key names defined by the
// DOM spec (i.e. "F1",...,"F24"). If the input string is a function-key
......@@ -564,7 +562,7 @@ void EventSender::keyDown(const CppArgumentList& arguments, CppVariant* result)
snprintf(functionChars, 10, "F%d", i);
string functionKeyName(functionChars);
if (functionKeyName == codeStr) {
code = base::VKEY_F1 + (i - 1);
code = webkit_support::VKEY_F1 + (i - 1);
break;
}
}
......
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