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

1 files changed, 6 insertions, 1 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/EditorClientAndroid.h b/Source/WebKit/android/WebCoreSupport/EditorClientAndroid.h
index 94a6518..ab8d253 100644
--- a/Source/WebKit/android/WebCoreSupport/EditorClientAndroid.h
+++ b/Source/WebKit/android/WebCoreSupport/EditorClientAndroid.h
@@ -31,6 +31,7 @@
 
 #include "EditorClient.h"
 #include "Page.h"
+#include "TextCheckerClient.h"
 #include "autofill/WebAutoFill.h"
 
 #include <wtf/OwnPtr.h>
@@ -39,7 +40,7 @@ using namespace WebCore;
 
 namespace android {
 
-class EditorClientAndroid : public EditorClient {
+class EditorClientAndroid : public EditorClient, public TextCheckerClient {
 public:
     EditorClientAndroid() {
         m_shouldChangeSelectedRange = true;
@@ -84,6 +85,8 @@ public:
     virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
     virtual void clearUndoRedoOperations();
     
+    virtual bool canCopyCut(bool defaultValue) const;
+    virtual bool canPaste(bool defaultValue) const;
     virtual bool canUndo() const;
     virtual bool canRedo() const;
     
@@ -114,6 +117,8 @@ public:
     virtual void setInputMethodState(bool);
     virtual void requestCheckingOfString(SpellChecker*, int, const String&);
 
+    virtual TextCheckerClient* textChecker() { return this; }
+
     // Android specific:
     void setPage(Page* page) { m_page = page; }
     void setShouldChangeSelectedRange(bool shouldChangeSelectedRange) { m_shouldChangeSelectedRange = shouldChangeSelectedRange; }