summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/TextControlInnerElements.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-07-30 10:46:49 +0100
committerKristian Monsen <kristianm@google.com>2010-08-04 13:01:34 +0100
commit0617145a89917ae7735fe1c9538688ab9a577df5 (patch)
tree56206078694427c37ed7bdf27eb5221398b833c0 /WebCore/rendering/TextControlInnerElements.h
parentef1adcdfc805d4d13103f6f15cc5b4d96828a60f (diff)
downloadexternal_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.zip
external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.gz
external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.bz2
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Diffstat (limited to 'WebCore/rendering/TextControlInnerElements.h')
-rw-r--r--WebCore/rendering/TextControlInnerElements.h4
1 files changed, 2 insertions, 2 deletions
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)