diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit/chromium/src/WebInputElement.cpp | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebKit/chromium/src/WebInputElement.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebInputElement.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/Source/WebKit/chromium/src/WebInputElement.cpp b/Source/WebKit/chromium/src/WebInputElement.cpp index 736165bbf..f5d52da80 100644 --- a/Source/WebKit/chromium/src/WebInputElement.cpp +++ b/Source/WebKit/chromium/src/WebInputElement.cpp @@ -33,8 +33,6 @@ #include "HTMLInputElement.h" #include "HTMLNames.h" -#include "RenderObject.h" -#include "RenderTextControlSingleLine.h" #include "TextControlInnerElements.h" #include "platform/WebString.h" #include <wtf/PassRefPtr.h> @@ -165,12 +163,7 @@ bool WebInputElement::isSpeechInputEnabled() const WebInputElement::SpeechInputState WebInputElement::getSpeechInputState() const { #if ENABLE(INPUT_SPEECH) - RenderObject* renderer = constUnwrap<HTMLInputElement>()->renderer(); - if (!renderer) - return Idle; - - RenderTextControlSingleLine* control = toRenderTextControlSingleLine(renderer); - InputFieldSpeechButtonElement* speechButton = toInputFieldSpeechButtonElement(control->speechButtonElement()); + InputFieldSpeechButtonElement* speechButton = toInputFieldSpeechButtonElement(constUnwrap<HTMLInputElement>()->speechButtonElement()); if (speechButton) return static_cast<WebInputElement::SpeechInputState>(speechButton->state()); #endif @@ -181,12 +174,7 @@ WebInputElement::SpeechInputState WebInputElement::getSpeechInputState() const void WebInputElement::startSpeechInput() { #if ENABLE(INPUT_SPEECH) - RenderObject* renderer = constUnwrap<HTMLInputElement>()->renderer(); - if (!renderer) - return; - - RenderTextControlSingleLine* control = toRenderTextControlSingleLine(renderer); - InputFieldSpeechButtonElement* speechButton = toInputFieldSpeechButtonElement(control->speechButtonElement()); + InputFieldSpeechButtonElement* speechButton = toInputFieldSpeechButtonElement(constUnwrap<HTMLInputElement>()->speechButtonElement()); if (speechButton) speechButton->startSpeechInput(); #endif @@ -195,12 +183,7 @@ void WebInputElement::startSpeechInput() void WebInputElement::stopSpeechInput() { #if ENABLE(INPUT_SPEECH) - RenderObject* renderer = constUnwrap<HTMLInputElement>()->renderer(); - if (!renderer) - return; - - RenderTextControlSingleLine* control = toRenderTextControlSingleLine(renderer); - InputFieldSpeechButtonElement* speechButton = toInputFieldSpeechButtonElement(control->speechButtonElement()); + InputFieldSpeechButtonElement* speechButton = toInputFieldSpeechButtonElement(constUnwrap<HTMLInputElement>()->speechButtonElement()); if (speechButton) speechButton->stopSpeechInput(); #endif |