Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1470)

Unified Diff: WebCore/html/HTMLInputElement.cpp

Issue 4111010: Merge 70644 - 2010-10-27 Satish Sampath <satish@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/html/HTMLInputElement.cpp
===================================================================
--- WebCore/html/HTMLInputElement.cpp (revision 70867)
+++ WebCore/html/HTMLInputElement.cpp (working copy)
@@ -63,6 +63,7 @@
#include "RenderText.h"
#include "RenderTextControlSingleLine.h"
#include "RenderTheme.h"
+#include "RuntimeEnabledFeatures.h"
#include "ScriptEventListener.h"
#include "StepRange.h"
#include "TextEvent.h"
@@ -2977,7 +2978,7 @@
case SEARCH:
case TELEPHONE:
case TEXT:
- return hasAttribute(speechAttr);
+ return RuntimeEnabledFeatures::speechInputEnabled() && hasAttribute(speechAttr);
case BUTTON:
case CHECKBOX:
case COLOR:
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698