[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 13:54:34 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 32263bbbff03427a98aab2f90c117e6d8d326e15
Author: satish at chromium.org <satish at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 29 13:45:15 2010 +0000
2010-09-29 Satish Sampath <satish at chromium.org>
Reviewed by Jeremy Orlow.
Rename the input element's @speech attribute to @webkitspeech since it is still experimental.
https://bugs.webkit.org/show_bug.cgi?id=46799
* fast/speech/input-appearance-numberandspeech.html:
* fast/speech/input-appearance-searchandspeech.html:
* fast/speech/input-appearance-speechbutton.html:
* fast/speech/input-text-speechbutton.html:
* fast/speech/speech-button-ignore-generated-events.html:
2010-09-29 Satish Sampath <satish at chromium.org>
Reviewed by Jeremy Orlow.
Rename the input element's @speech attribute to @webkitspeech since it is still experimental.
https://bugs.webkit.org/show_bug.cgi?id=46799
* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::webkitspeechEnabled): Rename the runtime feature flag getter.
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
* css/CSSValueKeywords.in: Rename the css style name.
* css/html.css: Rename the css style name.
(input::-webkit-input-speech-button):
* html/HTMLAttributeNames.in: Rename the @speech attribute.
* html/HTMLInputElement.cpp: Update code using the attribute.
(WebCore::HTMLInputElement::parseMappedAttribute):
(WebCore::HTMLInputElement::isSpeechEnabled):
* html/HTMLInputElement.idl: Rename the @speech attribute.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68640 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c534496..1014c67 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-29 Satish Sampath <satish at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Rename the input element's @speech attribute to @webkitspeech since it is still experimental.
+ https://bugs.webkit.org/show_bug.cgi?id=46799
+
+ * fast/speech/input-appearance-numberandspeech.html:
+ * fast/speech/input-appearance-searchandspeech.html:
+ * fast/speech/input-appearance-speechbutton.html:
+ * fast/speech/input-text-speechbutton.html:
+ * fast/speech/speech-button-ignore-generated-events.html:
+
2010-09-29 James Kozianski <koz at chromium.org>
Reviewed by James Robinson.
diff --git a/LayoutTests/fast/speech/input-appearance-numberandspeech.html b/LayoutTests/fast/speech/input-appearance-numberandspeech.html
index 3b866e5..893ddc6 100644
--- a/LayoutTests/fast/speech/input-appearance-numberandspeech.html
+++ b/LayoutTests/fast/speech/input-appearance-numberandspeech.html
@@ -19,7 +19,7 @@ var cellCount = 0;
var index = 0;
for (var size = 8; size < 24; size++) {
cells[index] += '<input type="number" style="font-size:' + size + 'px" value="012345678901234567890123456789"><br>'
- + '<input type="number" style="font-size:' + size + 'px" value="012345678901234567890123456789" speech><br>';
+ + '<input type="number" style="font-size:' + size + 'px" value="012345678901234567890123456789" webkitspeech><br>';
if (++cellCount >= maxCellCount[index]) {
++index;
cellCount = 0;
diff --git a/LayoutTests/fast/speech/input-appearance-searchandspeech.html b/LayoutTests/fast/speech/input-appearance-searchandspeech.html
index 0e07cbe..2e35e73 100644
--- a/LayoutTests/fast/speech/input-appearance-searchandspeech.html
+++ b/LayoutTests/fast/speech/input-appearance-searchandspeech.html
@@ -18,9 +18,9 @@ var maxCellCount = [7, 5, 5];
var cellCount = 0;
var index = 0;
for (var size = 8; size < 24; size++) {
- cells[index] += '<input type="search" style="font-size:' + size + 'px" speech><br>'
+ cells[index] += '<input type="search" style="font-size:' + size + 'px" webkitspeech><br>'
+ '<input type="search" style="font-size:' + size + 'px" value="012345678901234567890123456789"><br>'
- + '<input type="search" style="font-size:' + size + 'px" value="012345678901234567890123456789" speech><br>';
+ + '<input type="search" style="font-size:' + size + 'px" value="012345678901234567890123456789" webkitspeech><br>';
if (++cellCount >= maxCellCount[index]) {
++index;
cellCount = 0;
diff --git a/LayoutTests/fast/speech/input-appearance-speechbutton.html b/LayoutTests/fast/speech/input-appearance-speechbutton.html
index 639f247..6adc9b6 100644
--- a/LayoutTests/fast/speech/input-appearance-speechbutton.html
+++ b/LayoutTests/fast/speech/input-appearance-speechbutton.html
@@ -19,7 +19,7 @@ var cellCount = 0;
var index = 0;
for (var size = 8; size < 24; size++) {
cells[index] += '<input style="font-size:' + size + 'px" value="A quick brown fox jumps over the lazy dog"><br>'
- + '<input style="font-size:' + size + 'px" value="A quick brown fox jumps over the lazy dog" speech><br>';
+ + '<input style="font-size:' + size + 'px" value="A quick brown fox jumps over the lazy dog" webkitspeech><br>';
if (++cellCount >= maxCellCount[index]) {
++index;
cellCount = 0;
diff --git a/LayoutTests/fast/speech/input-text-speechbutton.html b/LayoutTests/fast/speech/input-text-speechbutton.html
index 98bf8b7..67faa99 100644
--- a/LayoutTests/fast/speech/input-text-speechbutton.html
+++ b/LayoutTests/fast/speech/input-text-speechbutton.html
@@ -31,16 +31,11 @@ function onChange() {
}
function run() {
- var input = document.createElement('input');
- input.id = 'speechInput';
- input.speech = 'speech';
- input.onchange = onChange;
- document.body.appendChild(input);
-
if (window.layoutTestController && window.eventSender) {
layoutTestController.setMockSpeechInputResult('Pictures of the moon');
// Clicking the speech button should fill in mock speech-recognized text.
+ var input = document.getElementById('speechInput');
var x = input.offsetLeft + input.offsetWidth - 4;
var y = input.offsetTop + input.offsetHeight / 2;
eventSender.mouseMoveTo(x, y);
@@ -54,5 +49,6 @@ window.jsTestIsAsync = true;
window.successfullyParsed = true;
</script>
<script src="../js/resources/js-test-post.js"></script>
+<input id='speechInput' webkitspeech onchange="onChange()">
</body>
</html>
diff --git a/LayoutTests/fast/speech/speech-button-ignore-generated-events.html b/LayoutTests/fast/speech/speech-button-ignore-generated-events.html
index 0498504..3247a64 100644
--- a/LayoutTests/fast/speech/speech-button-ignore-generated-events.html
+++ b/LayoutTests/fast/speech/speech-button-ignore-generated-events.html
@@ -68,6 +68,6 @@ window.jsTestIsAsync = true;
window.successfullyParsed = true;
</script>
<script src="../js/resources/js-test-post.js"></script>
-<input id='speechInput' speech>
+<input id='speechInput' webkitspeech>
</body>
</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 73caf1e..fbeedce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-29 Satish Sampath <satish at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Rename the input element's @speech attribute to @webkitspeech since it is still experimental.
+ https://bugs.webkit.org/show_bug.cgi?id=46799
+
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::webkitspeechEnabled): Rename the runtime feature flag getter.
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ * css/CSSValueKeywords.in: Rename the css style name.
+ * css/html.css: Rename the css style name.
+ (input::-webkit-input-speech-button):
+ * html/HTMLAttributeNames.in: Rename the @speech attribute.
+ * html/HTMLInputElement.cpp: Update code using the attribute.
+ (WebCore::HTMLInputElement::parseMappedAttribute):
+ (WebCore::HTMLInputElement::isSpeechEnabled):
+ * html/HTMLInputElement.idl: Rename the @speech attribute.
+
2010-09-29 MORITA Hajime <morrita at google.com>
[Chromium] failed to build without ACCELERATED_COMPOSITING
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index ba4a4fb..88350c7 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -138,7 +138,7 @@ public:
static void setSpeechInputEnabled(bool isEnabled) { isSpeechInputEnabled = isEnabled; }
static bool speechInputEnabled() { return isSpeechInputEnabled; }
- static bool speechEnabled() { return isSpeechInputEnabled; }
+ static bool webkitspeechEnabled() { return isSpeechInputEnabled; }
#if ENABLE(XHR_RESPONSE_BLOB)
static bool xhrResponseBlobEnabled() { return isXHRResponseBlobEnabled; }
diff --git a/WebCore/css/CSSPrimitiveValueMappings.h b/WebCore/css/CSSPrimitiveValueMappings.h
index a452733..14afdf6 100644
--- a/WebCore/css/CSSPrimitiveValueMappings.h
+++ b/WebCore/css/CSSPrimitiveValueMappings.h
@@ -352,7 +352,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ControlPart e)
break;
case InputSpeechButtonPart:
#if ENABLE(INPUT_SPEECH)
- m_value.ident = CSSValueInputSpeechButton;
+ m_value.ident = CSSValueWebkitInputSpeechButton;
#endif
break;
}
diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
index 990bb36..556d0bc 100644
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -568,7 +568,7 @@ button
button-bevel
default-button
inner-spin-button
-input-speech-button
+-webkit-input-speech-button
list-button
listbox
listitem
diff --git a/WebCore/css/html.css b/WebCore/css/html.css
index 05100f4..5399c1c 100644
--- a/WebCore/css/html.css
+++ b/WebCore/css/html.css
@@ -378,7 +378,7 @@ input::-webkit-outer-spin-button {
}
input::-webkit-input-speech-button {
- -webkit-appearance: input-speech-button;
+ -webkit-appearance: -webkit-input-speech-button;
display: inline-block;
}
diff --git a/WebCore/html/HTMLAttributeNames.in b/WebCore/html/HTMLAttributeNames.in
index d838615..7a80c13 100644
--- a/WebCore/html/HTMLAttributeNames.in
+++ b/WebCore/html/HTMLAttributeNames.in
@@ -258,7 +258,7 @@ size
sortable
sortdirection
span
-speech
+webkitspeech
spellcheck
src
standby
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index 6c19e38..b389be0 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -1208,7 +1208,7 @@ void HTMLInputElement::parseMappedAttribute(Attribute* attr)
// FIXME: we need to tell this change to a renderer if the attribute affects the appearance.
#endif
#if ENABLE(INPUT_SPEECH)
- else if (attr->name() == speechAttr) {
+ else if (attr->name() == webkitspeechAttr) {
if (renderer())
renderer()->updateFromElement();
setNeedsStyleRecalc();
@@ -2947,7 +2947,7 @@ bool HTMLInputElement::isSpeechEnabled() const
case SEARCH:
case TELEPHONE:
case TEXT:
- return hasAttribute(speechAttr);
+ return hasAttribute(webkitspeechAttr);
case BUTTON:
case CHECKBOX:
case COLOR:
diff --git a/WebCore/html/HTMLInputElement.idl b/WebCore/html/HTMLInputElement.idl
index 19e4226..19dfa5a 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, EnabledAtRuntime] boolean speech;
+ attribute [Reflect, EnabledAtRuntime] boolean webkitspeech;
#endif
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list