Skip to content

GitLab

T
tangled
Commit 8b0e5ddb authored by jbroman@chromium.org's avatar jbroman@chromium.org
Browse files
Options

Remove macCharCode from inspector code. 

Follow up to https://codereview.chromium.org/236403002/

BUG=362927

Review URL: https://codereview.chromium.org/236353003

git-svn-id: svn://svn.chromium.org/blink/trunk@171476 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent c6497e9c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
third_party/WebKit/Source/core/inspector/InspectorInputAgent.cpp
View file @ 8b0e5ddb
......@@ -99,7 +99,7 @@ InspectorInputAgent::~InspectorInputAgent()
{
}
void InspectorInputAgent::dispatchKeyEvent(ErrorString* error, const String& type, const int* modifiers, const double* timestamp, const String* text, const String* unmodifiedText, const String* keyIdentifier, const int* windowsVirtualKeyCode, const int* nativeVirtualKeyCode, const int* macCharCode, const bool* autoRepeat, const bool* isKeypad, const bool* isSystemKey)
void InspectorInputAgent::dispatchKeyEvent(ErrorString* error, const String& type, const int* modifiers, const double* timestamp, const String* text, const String* unmodifiedText, const String* keyIdentifier, const int* windowsVirtualKeyCode, const int* nativeVirtualKeyCode, const bool* autoRepeat, const bool* isKeypad, const bool* isSystemKey)
{
PlatformEvent::Type convertedType;
if (type == "keyDown")
......
third_party/WebKit/Source/core/inspector/InspectorInputAgent.h
View file @ 8b0e5ddb
......@@ -53,7 +53,7 @@ public:
virtual ~InspectorInputAgent();
// Methods called from the frontend for simulating input.
virtual void dispatchKeyEvent(ErrorString*, const String& type, const int* modifiers, const double* timestamp, const String* text, const String* unmodifiedText, const String* keyIdentifier, const int* windowsVirtualKeyCode, const int* nativeVirtualKeyCode, const int* macCharCode, const bool* autoRepeat, const bool* isKeypad, const bool* isSystemKey) OVERRIDE;
virtual void dispatchKeyEvent(ErrorString*, const String& type, const int* modifiers, const double* timestamp, const String* text, const String* unmodifiedText, const String* keyIdentifier, const int* windowsVirtualKeyCode, const int* nativeVirtualKeyCode, const bool* autoRepeat, const bool* isKeypad, const bool* isSystemKey) OVERRIDE;
virtual void dispatchMouseEvent(ErrorString*, const String& type, int x, int y, const int* modifiers, const double* timestamp, const String* button, const int* clickCount, const bool* deviceSpace) OVERRIDE;
virtual void dispatchTouchEvent(ErrorString*, const String& type, const RefPtr<JSONArray>& touchPoints, const int* modifiers, const double* timestamp) OVERRIDE;
private:
......
third_party/WebKit/Source/devtools/Inspector-1.1.json
View file @ 8b0e5ddb
......@@ -3831,7 +3831,6 @@
{ "name": "keyIdentifier", "type": "string", "optional": true, "description": "Unique key identifier (e.g., 'U+0041') (default: \"\")." },
{ "name": "windowsVirtualKeyCode", "type": "integer", "optional": true, "description": "Windows virtual key code (default: 0)." },
{ "name": "nativeVirtualKeyCode", "type": "integer", "optional": true, "description": "Native virtual key code (default: 0)." },
{ "name": "macCharCode", "type": "integer", "optional": true, "description": "Mac character code (default: 0)." },
{ "name": "autoRepeat", "type": "boolean", "optional": true, "description": "Whether the event was generated from auto repeat (default: false)." },
{ "name": "isKeypad", "type": "boolean", "optional": true, "description": "Whether the event was generated from the keypad (default: false)." },
{ "name": "isSystemKey", "type": "boolean", "optional": true, "description": "Whether the event was a system key event (default: false)." }
......
third_party/WebKit/Source/devtools/front_end/ScreencastView.js
View file @ 8b0e5ddb
......@@ -312,7 +312,7 @@ WebInspector.ScreencastView.prototype = {
var text = event.type === "keypress" ? String.fromCharCode(event.charCode) : undefined;
InputAgent.dispatchKeyEvent(type, this._modifiersForEvent(event), event.timeStamp / 1000, text, text ? text.toLowerCase() : undefined,
event.keyIdentifier, event.keyCode /* windowsVirtualKeyCode */, event.keyCode /* nativeVirtualKeyCode */, undefined /* macCharCode */, false, false, false);
event.keyIdentifier, event.keyCode /* windowsVirtualKeyCode */, event.keyCode /* nativeVirtualKeyCode */, false, false, false);
event.consume();
this._canvasElement.focus();
},
......
third_party/WebKit/Source/devtools/protocol.json
View file @ 8b0e5ddb
......@@ -3773,7 +3773,6 @@
{ "name": "keyIdentifier", "type": "string", "optional": true, "description": "Unique key identifier (e.g., 'U+0041') (default: \"\")." },
{ "name": "windowsVirtualKeyCode", "type": "integer", "optional": true, "description": "Windows virtual key code (default: 0)." },
{ "name": "nativeVirtualKeyCode", "type": "integer", "optional": true, "description": "Native virtual key code (default: 0)." },
{ "name": "macCharCode", "type": "integer", "optional": true, "description": "Mac character code (default: 0)." },
{ "name": "autoRepeat", "type": "boolean", "optional": true, "description": "Whether the event was generated from auto repeat (default: false)." },
{ "name": "isKeypad", "type": "boolean", "optional": true, "description": "Whether the event was generated from the keypad (default: false)." },
{ "name": "isSystemKey", "type": "boolean", "optional": true, "description": "Whether the event was a system key event (default: false)." }
......
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