[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:33:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cbdf294878d2811bc35b509516ee76ab53fc82e1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 29 11:27:54 2010 +0000
2010-07-29 Satish Sampath <satish at chromium.org>
Reviewed by Steve Block.
Runtime feature switch for speech input.
https://bugs.webkit.org/show_bug.cgi?id=43146
Add a runtime feature switch that decides whether speech input attributes are available or not.
Defaults to true.
* bindings/generic/RuntimeEnabledFeatures.cpp:
* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setSpeechInputEnabled):
(WebCore::RuntimeEnabledFeatures::speechInputEnabled):
(WebCore::RuntimeEnabledFeatures::speechEnabled):
* html/HTMLInputElement.idl:
2010-07-29 Satish Sampath <satish at chromium.org>
Reviewed by Steve Block.
Runtime feature switch for speech input
https://bugs.webkit.org/show_bug.cgi?id=43146
Add a runtime feature switch that decides whether speech input attributes are available or not.
Defaults to true.
* public/WebRuntimeFeatures.h:
* src/SpeechInputClientImpl.cpp:
(WebKit::SpeechInputClientImpl::SpeechInputClientImpl):
* src/WebRuntimeFeatures.cpp:
(WebKit::WebRuntimeFeatures::enableSpeechInput):
(WebKit::WebRuntimeFeatures::isSpeechInputEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64269 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0596a4d..df737f4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-29 Satish Sampath <satish at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Runtime feature switch for speech input.
+ https://bugs.webkit.org/show_bug.cgi?id=43146
+
+ Add a runtime feature switch that decides whether speech input attributes are available or not.
+ Defaults to true.
+
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::setSpeechInputEnabled):
+ (WebCore::RuntimeEnabledFeatures::speechInputEnabled):
+ (WebCore::RuntimeEnabledFeatures::speechEnabled):
+ * html/HTMLInputElement.idl:
+
2010-07-27 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index 153f995..eb027c3 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -48,6 +48,7 @@ bool RuntimeEnabledFeatures::isWebGLEnabled = false;
bool RuntimeEnabledFeatures::isPushStateEnabled = false;
bool RuntimeEnabledFeatures::isTouchEnabled = true;
bool RuntimeEnabledFeatures::isDeviceOrientationEnabled = true;
+bool RuntimeEnabledFeatures::isSpeechInputEnabled = true;
#if ENABLE(VIDEO)
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index b059d6e..c9eb21f 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -119,6 +119,10 @@ public:
static bool deviceOrientationEventEnabled() { return isDeviceOrientationEnabled; }
static bool ondeviceorientationEnabled() { return isDeviceOrientationEnabled; }
+ static void setSpeechInputEnabled(bool isEnabled) { isSpeechInputEnabled = isEnabled; }
+ static bool speechInputEnabled() { return isSpeechInputEnabled; }
+ static bool speechEnabled() { return isSpeechInputEnabled; }
+
private:
// Never instantiate.
RuntimeEnabledFeatures() { }
@@ -133,6 +137,7 @@ private:
static bool isPushStateEnabled;
static bool isTouchEnabled;
static bool isDeviceOrientationEnabled;
+ static bool isSpeechInputEnabled;
};
} // namespace WebCore
diff --git a/WebCore/html/HTMLInputElement.idl b/WebCore/html/HTMLInputElement.idl
index c66e775..c726caa 100644
--- a/WebCore/html/HTMLInputElement.idl
+++ b/WebCore/html/HTMLInputElement.idl
@@ -100,7 +100,7 @@ module html {
readonly attribute NodeList labels;
#if defined(ENABLE_INPUT_SPEECH) && ENABLE_INPUT_SPEECH
- attribute [Reflect] boolean speech;
+ attribute [Reflect, EnabledAtRuntime] boolean speech;
#endif
};
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 37e8793..4255315 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-29 Satish Sampath <satish at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Runtime feature switch for speech input
+ https://bugs.webkit.org/show_bug.cgi?id=43146
+
+ Add a runtime feature switch that decides whether speech input attributes are available or not.
+ Defaults to true.
+
+ * public/WebRuntimeFeatures.h:
+ * src/SpeechInputClientImpl.cpp:
+ (WebKit::SpeechInputClientImpl::SpeechInputClientImpl):
+ * src/WebRuntimeFeatures.cpp:
+ (WebKit::WebRuntimeFeatures::enableSpeechInput):
+ (WebKit::WebRuntimeFeatures::isSpeechInputEnabled):
+
2010-07-28 Kavita Kanetkar <kkanetkar at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/public/WebRuntimeFeatures.h b/WebKit/chromium/public/WebRuntimeFeatures.h
index 95307a2..517aad5 100644
--- a/WebKit/chromium/public/WebRuntimeFeatures.h
+++ b/WebKit/chromium/public/WebRuntimeFeatures.h
@@ -80,6 +80,9 @@ public:
WEBKIT_API static void enableDeviceOrientation(bool);
WEBKIT_API static bool isDeviceOrientationEnabled();
+ WEBKIT_API static void enableSpeechInput(bool);
+ WEBKIT_API static bool isSpeechInputEnabled();
+
private:
WebRuntimeFeatures();
};
diff --git a/WebKit/chromium/src/SpeechInputClientImpl.cpp b/WebKit/chromium/src/SpeechInputClientImpl.cpp
index 8bccacf..6bd0a2c 100644
--- a/WebKit/chromium/src/SpeechInputClientImpl.cpp
+++ b/WebKit/chromium/src/SpeechInputClientImpl.cpp
@@ -45,7 +45,11 @@ SpeechInputClientImpl::SpeechInputClientImpl(WebViewClient* web_view_client)
: m_controller(web_view_client->speechInputController(this))
, m_listener(0)
{
- ASSERT(m_controller);
+ // FIXME: Right now WebViewClient gives a null pointer, and with the
+ // runtime flag for speech input feature set to true by default this will
+ // always assert. Enable this assert once the WebViewClient starts to
+ // give a valid pointer.
+ // ASSERT(m_controller);
}
SpeechInputClientImpl::~SpeechInputClientImpl()
diff --git a/WebKit/chromium/src/WebRuntimeFeatures.cpp b/WebKit/chromium/src/WebRuntimeFeatures.cpp
index efb287c..217553b 100644
--- a/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -236,4 +236,14 @@ bool WebRuntimeFeatures::isDeviceOrientationEnabled()
return RuntimeEnabledFeatures::deviceOrientationEnabled();
}
+void WebRuntimeFeatures::enableSpeechInput(bool enable)
+{
+ RuntimeEnabledFeatures::setSpeechInputEnabled(enable);
+}
+
+bool WebRuntimeFeatures::isSpeechInputEnabled()
+{
+ return RuntimeEnabledFeatures::speechInputEnabled();
+}
+
} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list