[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 14:11:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 495c3bfff2e67b333f129c16586665e973057765
Author: satish at chromium.org <satish at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 5 09:03:36 2010 +0000
2010-10-05 Satish Sampath <satish at chromium.org>
Reviewed by Jeremy Orlow.
Rename @webkitspeech to @x-webkit-speech to follow HTML5 convention.
https://bugs.webkit.org/show_bug.cgi?id=46873
Updated layout tests to use the new attribute name.
* 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-10-05 Satish Sampath <satish at chromium.org>
Reviewed by Jeremy Orlow.
Rename @webkitspeech to @x-webkit-speech to follow HTML5 convention
https://bugs.webkit.org/show_bug.cgi?id=46873
The @webkitspeech attribute is renamed to @x-webkit-speech per the HTML5 spec for extension
attributes. The DOM attribute in IDL was renamed to 'webkitSpeech' as well. But the generated
code for the attribute did not match the generated code for the IDL, so I modified
dom/make_names.pl to generate the appropriate name for such extension attributes.
* bindings/generic/RuntimeEnabledFeatures.h: Rename flag accessor to match IDL attribute name.
(WebCore::RuntimeEnabledFeatures::webkitSpeechEnabled):
* dom/make_names.pl: Additions to generate names for x-webkit-xxxx attributes that match the
generated code from IDL and remember the original names including the x- prefix when writing
out the cpp files.
* html/HTMLAttributeNames.in: Rename @webkitspeech to @x-webkit-speech
* html/HTMLInputElement.idl: Rename @webkitspeech to @webkitSpeech
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69099 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3c2f383..56af857 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-05 Satish Sampath <satish at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Rename @webkitspeech to @x-webkit-speech to follow HTML5 convention.
+ https://bugs.webkit.org/show_bug.cgi?id=46873
+
+ Updated layout tests to use the new attribute name.
+
+ * 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-10-05 Kent Tamura <tkent at chromium.org>
Unreviewed, test expectation update.
diff --git a/LayoutTests/fast/speech/input-appearance-numberandspeech.html b/LayoutTests/fast/speech/input-appearance-numberandspeech.html
index 893ddc6..c9c3ad4 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" webkitspeech><br>';
+ + '<input type="number" style="font-size:' + size + 'px" value="012345678901234567890123456789" x-webkit-speech><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 2e35e73..7c17539 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" webkitspeech><br>'
+ cells[index] += '<input type="search" style="font-size:' + size + 'px" x-webkit-speech><br>'
+ '<input type="search" style="font-size:' + size + 'px" value="012345678901234567890123456789"><br>'
- + '<input type="search" style="font-size:' + size + 'px" value="012345678901234567890123456789" webkitspeech><br>';
+ + '<input type="search" style="font-size:' + size + 'px" value="012345678901234567890123456789" x-webkit-speech><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 6adc9b6..7af05e4 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" webkitspeech><br>';
+ + '<input style="font-size:' + size + 'px" value="A quick brown fox jumps over the lazy dog" x-webkit-speech><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 67faa99..b564fd7 100644
--- a/LayoutTests/fast/speech/input-text-speechbutton.html
+++ b/LayoutTests/fast/speech/input-text-speechbutton.html
@@ -49,6 +49,6 @@ window.jsTestIsAsync = true;
window.successfullyParsed = true;
</script>
<script src="../js/resources/js-test-post.js"></script>
-<input id='speechInput' webkitspeech onchange="onChange()">
+<input id='speechInput' x-webkit-speech 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 3247a64..4c2925d 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' webkitspeech>
+<input id='speechInput' x-webkit-speech>
</body>
</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dabd22f..5312dd7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-10-05 Satish Sampath <satish at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Rename @webkitspeech to @x-webkit-speech to follow HTML5 convention
+ https://bugs.webkit.org/show_bug.cgi?id=46873
+
+ The @webkitspeech attribute is renamed to @x-webkit-speech per the HTML5 spec for extension
+ attributes. The DOM attribute in IDL was renamed to 'webkitSpeech' as well. But the generated
+ code for the attribute did not match the generated code for the IDL, so I modified
+ dom/make_names.pl to generate the appropriate name for such extension attributes.
+
+ * bindings/generic/RuntimeEnabledFeatures.h: Rename flag accessor to match IDL attribute name.
+ (WebCore::RuntimeEnabledFeatures::webkitSpeechEnabled):
+ * dom/make_names.pl: Additions to generate names for x-webkit-xxxx attributes that match the
+ generated code from IDL and remember the original names including the x- prefix when writing
+ out the cpp files.
+ * html/HTMLAttributeNames.in: Rename @webkitspeech to @x-webkit-speech
+ * html/HTMLInputElement.idl: Rename @webkitspeech to @webkitSpeech
+
2010-10-04 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index 88350c7..be18366 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 webkitspeechEnabled() { return isSpeechInputEnabled; }
+ static bool webkitSpeechEnabled() { return isSpeechInputEnabled; }
#if ENABLE(XHR_RESPONSE_BLOB)
static bool xhrResponseBlobEnabled() { return isXHRResponseBlobEnabled; }
diff --git a/WebCore/dom/make_names.pl b/WebCore/dom/make_names.pl
index 9dec124..a3b71b8 100755
--- a/WebCore/dom/make_names.pl
+++ b/WebCore/dom/make_names.pl
@@ -54,6 +54,7 @@ my %allTags = ();
my %allAttrs = ();
my %parameters = ();
my $extraDefines = 0;
+my %extensionAttrs = ();
require Config;
@@ -180,7 +181,14 @@ sub tagsHandler
sub attrsHandler
{
my ($attr, $property, $value) = @_;
-
+ # Translate HTML5 extension attributes of the form 'x-webkit-feature' to 'webkitfeature'.
+ # We don't just check for the 'x-' prefix because there are attributes such as x-height
+ # which should follow the default path below.
+ if ($attr =~ m/^x-webkit-(.*)/) {
+ my $newAttr = "webkit$1";
+ $extensionAttrs{$newAttr} = $attr;
+ $attr = $newAttr;
+ }
$attr =~ s/-/_/g;
# Initialize default properties' values.
@@ -620,8 +628,11 @@ sub printDefinitions
print F " // " . ucfirst($type) . "\n";
for my $name (sort keys %$namesRef) {
- my $realName = $name;
- $realName =~ s/_/-/g;
+ my $realName = $extensionAttrs{$name};
+ if (!$realName) {
+ $realName = $name;
+ $realName =~ s/_/-/g;
+ }
print F " new ((void*)&$name","${shortCamelType}) QualifiedName(nullAtom, \"$realName\", $namespaceURI);\n";
}
}
diff --git a/WebCore/html/HTMLAttributeNames.in b/WebCore/html/HTMLAttributeNames.in
index 7a80c13..56b4d9c 100644
--- a/WebCore/html/HTMLAttributeNames.in
+++ b/WebCore/html/HTMLAttributeNames.in
@@ -258,7 +258,7 @@ size
sortable
sortdirection
span
-webkitspeech
+x-webkit-speech
spellcheck
src
standby
diff --git a/WebCore/html/HTMLInputElement.idl b/WebCore/html/HTMLInputElement.idl
index 0cfb386..bc3fd2b 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 webkitspeech;
+ attribute [Reflect, EnabledAtRuntime] boolean webkitSpeech;
#endif
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list