Commit 2df5d3cf authored by xan@webkit.org's avatar xan@webkit.org

2009-04-28 Xan Lopez <xlopez@igalia.com>

        Unreviewed: committed a few bits by mistake, remove them.

        * WebCoreSupport/EditorClientGtk.cpp:
        (WebKit::handleEditingKeyboardEvent):

git-svn-id: svn://svn.chromium.org/blink/trunk@42927 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 684e5784
2009-04-28 Xan Lopez <xlopez@igalia.com>
Unreviewed: committed a few bits by mistake, remove them.
* WebCoreSupport/EditorClientGtk.cpp:
(WebKit::handleEditingKeyboardEvent):
2009-04-28 Xan Lopez <xlopez@igalia.com> 2009-04-28 Xan Lopez <xlopez@igalia.com>
Reviewed by Gustavo Noronha. Reviewed by Gustavo Noronha.
......
...@@ -449,9 +449,8 @@ static bool handleEditingKeyboardEvent(KeyboardEvent* evt) ...@@ -449,9 +449,8 @@ static bool handleEditingKeyboardEvent(KeyboardEvent* evt)
if (!keyEvent) if (!keyEvent)
return false; return false;
Node* start = frame->selection()->start().node();
bool caretBrowsing = frame->settings()->caretBrowsingEnabled(); bool caretBrowsing = frame->settings()->caretBrowsingEnabled();
if (caretBrowsing || (start && start->isContentEditable())) { if (caretBrowsing) {
switch (keyEvent->windowsVirtualKeyCode()) { switch (keyEvent->windowsVirtualKeyCode()) {
case VK_LEFT: case VK_LEFT:
frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::EXTEND : SelectionController::MOVE, frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::EXTEND : SelectionController::MOVE,
...@@ -480,7 +479,6 @@ static bool handleEditingKeyboardEvent(KeyboardEvent* evt) ...@@ -480,7 +479,6 @@ static bool handleEditingKeyboardEvent(KeyboardEvent* evt)
} }
} }
Editor::Command command = frame->editor()->command(interpretKeyEvent(evt)); Editor::Command command = frame->editor()->command(interpretKeyEvent(evt));
if (keyEvent->type() == PlatformKeyboardEvent::RawKeyDown) { if (keyEvent->type() == PlatformKeyboardEvent::RawKeyDown) {
...@@ -490,7 +488,7 @@ static bool handleEditingKeyboardEvent(KeyboardEvent* evt) ...@@ -490,7 +488,7 @@ static bool handleEditingKeyboardEvent(KeyboardEvent* evt)
return !command.isTextInsertion() && command.execute(evt); return !command.isTextInsertion() && command.execute(evt);
} }
if (command.execute(evt)) if (command.execute(evt))
return true; return true;
// Don't insert null or control characters as they can result in unexpected behaviour // Don't insert null or control characters as they can result in unexpected behaviour
......
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