Merge 70644 - 2010-10-27 Satish Sampath <satish@chromium.org>...

WebCore/html/HTMLInputElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 45 matching lines @@
 #include "MouseEvent.h"
 #include "Page.h"
 #include "RegularExpression.h"
 #include "RenderButton.h"
 #include "RenderFileUploadControl.h"
 #include "RenderImage.h"
 #include "RenderSlider.h"
 #include "RenderText.h"
 #include "RenderTextControlSingleLine.h"
 #include "RenderTheme.h"
+#include "RuntimeEnabledFeatures.h"
 #include "ScriptEventListener.h"
 #include "StepRange.h"
 #include "TextEvent.h"
 #include "WheelEvent.h"
 #include <wtf/HashMap.h>
 #include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/StringHash.h>
 
 using namespace std;
@@ skipping 2894 matching lines @@
 #if ENABLE(INPUT_SPEECH)
 bool HTMLInputElement::isSpeechEnabled() const
 {
     switch (inputType()) {
     // FIXME: Add support for RANGE, EMAIL, URL, COLOR and DATE/TIME input types.
     case NUMBER:
     case PASSWORD:
     case SEARCH:
     case TELEPHONE:
     case TEXT:
-        return hasAttribute(speechAttr);
+        return RuntimeEnabledFeatures::speechInputEnabled() && hasAttribute(speechAttr);
     case BUTTON:
     case CHECKBOX:
     case COLOR:
     case DATE:
     case DATETIME:
     case DATETIMELOCAL:
     case EMAIL:
     case FILE:
     case HIDDEN:
     case IMAGE:
     case ISINDEX:
     case MONTH:
     case RADIO:
     case RANGE:
     case RESET:
     case SUBMIT:
     case TIME:
     case URL:
     case WEEK:
         return false;
     }
     return false;
 }
 #endif
 
 } // namespace