From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 4 Nov 2010 12:00:17 -0700
Subject: Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
---
 WebCore/rendering/TextControlInnerElements.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'WebCore/rendering/TextControlInnerElements.h')

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)
-- 
cgit v1.1