From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Mon, 28 Jun 2010 16:42:48 +0100
Subject: Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
---
 WebCore/rendering/TextControlInnerElements.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

diff --git a/WebCore/rendering/TextControlInnerElements.h b/WebCore/rendering/TextControlInnerElements.h
index ed1887e..1884a34 100644
--- a/WebCore/rendering/TextControlInnerElements.h
+++ b/WebCore/rendering/TextControlInnerElements.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -104,6 +105,20 @@ private:
     bool m_onUpButton;
 };
 
+#if ENABLE(INPUT_SPEECH)
+
+class InputFieldSpeechButtonElement : public TextControlInnerElement {
+public:
+    static PassRefPtr<InputFieldSpeechButtonElement> create(Document*);
+
+    virtual void defaultEventHandler(Event*);
+
+private:
+    InputFieldSpeechButtonElement(Document*);
+};
+
+#endif // ENABLE(INPUT_SPEECH)
+
 } // namespace
 
 #endif
-- 
cgit v1.1