diff options
author | Ben Murdoch <benm@google.com> | 2011-01-06 21:36:31 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-01-07 10:36:05 +0000 |
commit | 4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch) | |
tree | ee905fa007e14522848f571215c1054734db9269 /WebCore/editing/TypingCommand.h | |
parent | 21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff) | |
download | external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2 |
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebCore/editing/TypingCommand.h')
-rw-r--r-- | WebCore/editing/TypingCommand.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/editing/TypingCommand.h b/WebCore/editing/TypingCommand.h index 60b5f2a..284ebc0 100644 --- a/WebCore/editing/TypingCommand.h +++ b/WebCore/editing/TypingCommand.h @@ -81,6 +81,8 @@ private: virtual bool isTypingCommand() const; virtual bool preservesTypingStyle() const { return m_preservesTypingStyle; } + static void updateSelectionIfDifferentFromCurrentSelection(TypingCommand*, Frame*); + void updatePreservesTypingStyle(ETypingCommand); void markMisspellingsAfterTyping(ETypingCommand); void typingAddedToOpenCommand(ETypingCommand); |