diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 18:31:28 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 10:37:20 +0100 |
| commit | c2a132734701e9acb0c0b0c4b3bf37f505a5b538 (patch) | |
| tree | c842bcb18efeb907a75f9461191d40c2c1241b5c /Source/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp | |
| parent | fe73b6358fa742d943e85ba9a90544a7b6ba8d9d (diff) | |
| download | external_webkit-c2a132734701e9acb0c0b0c4b3bf37f505a5b538.zip external_webkit-c2a132734701e9acb0c0b0c4b3bf37f505a5b538.tar.gz external_webkit-c2a132734701e9acb0c0b0c4b3bf37f505a5b538.tar.bz2 | |
Merge WebKit at r80534: Fix EditorClientAndroid
Make EditorClientAndroid inherit from TextCheckerClient.
See http://trac.webkit.org/changeset/78533
Add EditorClient callbacks. See http://trac.webkit.org/changeset/78532
Change-Id: Ia0f68e2047306415502d5ff1d40cd384c5db91e3
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp index 250fdbf..d7bfd4b 100644 --- a/Source/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp @@ -217,6 +217,8 @@ bool EditorClientAndroid::canUndo() const { return false; } bool EditorClientAndroid::canRedo() const { return false; } void EditorClientAndroid::undo() {} void EditorClientAndroid::redo() {} +bool EditorClientAndroid::canCopyCut(bool defaultValue) const { return defaultValue; } +bool EditorClientAndroid::canPaste(bool defaultValue) const { return defaultValue; } // functions new to Jun-07 tip of tree merge: void EditorClientAndroid::showSpellingUI(bool) {} |