[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

satish at chromium.org satish at chromium.org
Wed Dec 22 15:01:20 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6c96b95598f189fc676d451c896b86d619065b49
Author: satish at chromium.org <satish at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 15:16:46 2010 +0000

    2010-10-27  Satish Sampath  <satish at chromium.org>
    
            Reviewed by Steve Block.
    
            Add runtime flag check before enabling speech input in code.
            https://bugs.webkit.org/show_bug.cgi?id=48426
    
            * html/HTMLInputElement.cpp:
            (WebCore::HTMLInputElement::isSpeechEnabled): Added runtime flag check.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f65de74..5ac3c65 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-27  Satish Sampath  <satish at chromium.org>
+
+        Reviewed by Steve Block.
+
+        Add runtime flag check before enabling speech input in code.
+        https://bugs.webkit.org/show_bug.cgi?id=48426
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::isSpeechEnabled): Added runtime flag check.
+
 2010-10-27  Adam Roben  <aroben at apple.com>
 
         Only decompress pixel buffers when needed (and fix a crash in the
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index 2ff8ec5..b03065c 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -61,6 +61,7 @@
 #include "RenderSlider.h"
 #include "RenderTextControlSingleLine.h"
 #include "RenderTheme.h"
+#include "RuntimeEnabledFeatures.h"
 #include "ScriptEventListener.h"
 #include "Settings.h"
 #include "StepRange.h"
@@ -1951,7 +1952,7 @@ bool HTMLInputElement::isSpeechEnabled() const
     case SEARCH:
     case TELEPHONE:
     case TEXT:
-        return hasAttribute(webkitspeechAttr);
+        return RuntimeEnabledFeatures::speechInputEnabled() && hasAttribute(webkitspeechAttr);
     case BUTTON:
     case CHECKBOX:
     case COLOR:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list