diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/editing/EditorCommand.cpp | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/editing/EditorCommand.cpp')
-rw-r--r-- | Source/WebCore/editing/EditorCommand.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/editing/EditorCommand.cpp b/Source/WebCore/editing/EditorCommand.cpp index 64993d5..9e5bf9f 100644 --- a/Source/WebCore/editing/EditorCommand.cpp +++ b/Source/WebCore/editing/EditorCommand.cpp @@ -477,7 +477,7 @@ static bool executeIndent(Frame* frame, Event*, EditorCommandSource, const Strin static bool executeInsertBacktab(Frame* frame, Event* event, EditorCommandSource, const String&) { - return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\t", event, false, true); + return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\t", event, TextEventInputBackTab); } static bool executeInsertHorizontalRule(Frame* frame, Event*, EditorCommandSource, const String& value) @@ -505,7 +505,7 @@ static bool executeInsertLineBreak(Frame* frame, Event* event, EditorCommandSour { switch (source) { case CommandFromMenuOrKeyBinding: - return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\n", event, true); + return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\n", event, TextEventInputLineBreak); case CommandFromDOM: case CommandFromDOMWithUserInterface: // Doesn't scroll to make the selection visible, or modify the kill ring. @@ -521,7 +521,7 @@ static bool executeInsertLineBreak(Frame* frame, Event* event, EditorCommandSour static bool executeInsertNewline(Frame* frame, Event* event, EditorCommandSource, const String&) { Frame* targetFrame = WebCore::targetFrame(frame, event); - return targetFrame->eventHandler()->handleTextInputEvent("\n", event, !targetFrame->editor()->canEditRichly()); + return targetFrame->eventHandler()->handleTextInputEvent("\n", event, targetFrame->editor()->canEditRichly() ? TextEventInputKeyboard : TextEventInputLineBreak); } static bool executeInsertNewlineInQuotedContent(Frame* frame, Event*, EditorCommandSource, const String&) @@ -544,7 +544,7 @@ static bool executeInsertParagraph(Frame* frame, Event*, EditorCommandSource, co static bool executeInsertTab(Frame* frame, Event* event, EditorCommandSource, const String&) { - return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\t", event, false, false); + return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\t", event); } static bool executeInsertText(Frame* frame, Event*, EditorCommandSource, const String& value) |