summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/TextControlInnerElements.h
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2010-11-04 12:00:17 -0700
committerJohn Reck <jreck@google.com>2010-11-09 11:35:04 -0800
commite14391e94c850b8bd03680c23b38978db68687a8 (patch)
tree3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebCore/rendering/TextControlInnerElements.h
parent1bd705833a68f07850cf7e204b26f8d328d16951 (diff)
downloadexternal_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip
external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz
external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebCore/rendering/TextControlInnerElements.h')
-rw-r--r--WebCore/rendering/TextControlInnerElements.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/rendering/TextControlInnerElements.h b/WebCore/rendering/TextControlInnerElements.h
index c146a42..46c1c8e 100644
--- a/WebCore/rendering/TextControlInnerElements.h
+++ b/WebCore/rendering/TextControlInnerElements.h
@@ -141,7 +141,7 @@ public:
// SpeechInputListener methods.
void didCompleteRecording(int);
void didCompleteRecognition(int);
- void setRecognitionResult(int, const String& result);
+ void setRecognitionResult(int, const SpeechInputResultArray&);
private:
InputFieldSpeechButtonElement(HTMLElement*);
@@ -151,6 +151,7 @@ private:
bool m_capturing;
SpeechInputState m_state;
int m_listenerId;
+ SpeechInputResultArray m_results;
};
#endif // ENABLE(INPUT_SPEECH)