From 0617145a89917ae7735fe1c9538688ab9a577df5 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 30 Jul 2010 10:46:49 +0100
Subject: Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
---
 WebCore/rendering/TextControlInnerElements.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/WebCore/rendering/TextControlInnerElements.h b/WebCore/rendering/TextControlInnerElements.h
index 68d6ff4..ed38221 100644
--- a/WebCore/rendering/TextControlInnerElements.h
+++ b/WebCore/rendering/TextControlInnerElements.h
@@ -124,7 +124,8 @@ public:
     virtual void defaultEventHandler(Event*);
 
     // SpeechInputListener methods.
-    void recordingComplete();
+    void didCompleteRecording();
+    void didCompleteRecognition();
     void setRecognitionResult(const String& result);
 
 private:
@@ -133,7 +134,6 @@ private:
     SpeechInput* speechInput();
 
     bool m_capturing;
-    OwnPtr<SpeechInput> m_speechInput;
 };
 
 #endif // ENABLE(INPUT_SPEECH)
-- 
cgit v1.1