[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
antonm at chromium.org
antonm at chromium.org
Wed Dec 22 15:36:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2c41705b146aee8943c2f077814f8c8d4239f92f
Author: antonm at chromium.org <antonm at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 02:32:04 2010 +0000
2010-11-08 Anton Muhin <antonm at chromium.org>
Reviewed by Nate Chapin.
[v8] Get rid of automatically generated named property getter for classes with namedItem method
https://bugs.webkit.org/show_bug.cgi?id=48770
* platform/chromium-mac/fast/dom/HTMLSelectElement/named-options-expected.txt:
* platform/chromium-win/fast/dom/HTMLSelectElement/named-options-expected.txt:
2010-11-08 Anton Muhin <antonm at chromium.org>
Reviewed by Nate Chapin.
[v8] Get rid of automatically generated named property getter for classes with namedItem method
https://bugs.webkit.org/show_bug.cgi?id=48770
* bindings/scripts/CodeGeneratorV8.pm:
* bindings/v8/custom/V8HTMLSelectElementCustom.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71594 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 54b6334..16f2187 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-08 Anton Muhin <antonm at chromium.org>
+
+ Reviewed by Nate Chapin.
+
+ [v8] Get rid of automatically generated named property getter for classes with namedItem method
+ https://bugs.webkit.org/show_bug.cgi?id=48770
+
+ * platform/chromium-mac/fast/dom/HTMLSelectElement/named-options-expected.txt:
+ * platform/chromium-win/fast/dom/HTMLSelectElement/named-options-expected.txt:
+
2010-11-08 Dumitru Daniliuc <dumi at chromium.org>
Unreviewed, updating Chromium expectations.
diff --git a/LayoutTests/platform/chromium-mac/fast/dom/HTMLSelectElement/named-options-expected.txt b/LayoutTests/platform/chromium-mac/fast/dom/HTMLSelectElement/named-options-expected.txt
index 7fa84cb..59df233 100644
--- a/LayoutTests/platform/chromium-mac/fast/dom/HTMLSelectElement/named-options-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/dom/HTMLSelectElement/named-options-expected.txt
@@ -4,16 +4,16 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
Confirm that the option named 'test' is accessible from the select element
-PASS select1.test.toString() is "[object HTMLOptionElement]"
-PASS select1.test.value is "Value"
+FAIL select1.test.toString() should be [object HTMLOptionElement]. Threw exception TypeError: Cannot call method 'toString' of undefined
+FAIL select1.test.value should be Value. Threw exception TypeError: Cannot read property 'value' of undefined
Confirm that the option named 'test' is accessible from the options collection
PASS select1.options.test.toString() is "[object HTMLOptionElement]"
PASS select1.options.test.value is "Value"
Confirm that both options named 'test' are accessible from the select element
-PASS select2.test.length is 2
-PASS select2.test.toString() is "[object NodeList]"
-PASS select2.test[0].value is "Value1"
-PASS select2.test[1].value is "Value2"
+FAIL select2.test.length should be 2. Threw exception TypeError: Cannot read property 'length' of undefined
+FAIL select2.test.toString() should be [object NodeList]. Threw exception TypeError: Cannot call method 'toString' of undefined
+FAIL select2.test[0].value should be Value1. Threw exception TypeError: Cannot read property '0' of undefined
+FAIL select2.test[1].value should be Value2. Threw exception TypeError: Cannot read property '1' of undefined
Confirm that both options named 'test' are accessible from the options collection
PASS select2.options.test.length is 2
PASS select2.options.test.toString() is "[object NodeList]"
diff --git a/LayoutTests/platform/chromium-win/fast/dom/HTMLSelectElement/named-options-expected.txt b/LayoutTests/platform/chromium-win/fast/dom/HTMLSelectElement/named-options-expected.txt
index 7fa84cb..59df233 100644
--- a/LayoutTests/platform/chromium-win/fast/dom/HTMLSelectElement/named-options-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/dom/HTMLSelectElement/named-options-expected.txt
@@ -4,16 +4,16 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
Confirm that the option named 'test' is accessible from the select element
-PASS select1.test.toString() is "[object HTMLOptionElement]"
-PASS select1.test.value is "Value"
+FAIL select1.test.toString() should be [object HTMLOptionElement]. Threw exception TypeError: Cannot call method 'toString' of undefined
+FAIL select1.test.value should be Value. Threw exception TypeError: Cannot read property 'value' of undefined
Confirm that the option named 'test' is accessible from the options collection
PASS select1.options.test.toString() is "[object HTMLOptionElement]"
PASS select1.options.test.value is "Value"
Confirm that both options named 'test' are accessible from the select element
-PASS select2.test.length is 2
-PASS select2.test.toString() is "[object NodeList]"
-PASS select2.test[0].value is "Value1"
-PASS select2.test[1].value is "Value2"
+FAIL select2.test.length should be 2. Threw exception TypeError: Cannot read property 'length' of undefined
+FAIL select2.test.toString() should be [object NodeList]. Threw exception TypeError: Cannot call method 'toString' of undefined
+FAIL select2.test[0].value should be Value1. Threw exception TypeError: Cannot read property '0' of undefined
+FAIL select2.test[1].value should be Value2. Threw exception TypeError: Cannot read property '1' of undefined
Confirm that both options named 'test' are accessible from the options collection
PASS select2.options.test.length is 2
PASS select2.options.test.toString() is "[object NodeList]"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 661c2fb..c3cb8a8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-08 Anton Muhin <antonm at chromium.org>
+
+ Reviewed by Nate Chapin.
+
+ [v8] Get rid of automatically generated named property getter for classes with namedItem method
+ https://bugs.webkit.org/show_bug.cgi?id=48770
+
+ * bindings/scripts/CodeGeneratorV8.pm:
+ * bindings/v8/custom/V8HTMLSelectElementCustom.cpp:
+
2010-11-08 Ned Holbrook <nholbrook at apple.com>
Reviewed by Adam Barth.
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 078794b..b9f9e92 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -524,7 +524,7 @@ sub GenerateHeaderNamedAndIndexedPropertyAccessors
$hasCustomDeleterr = 0;
$hasEnumerator = 0;
}
- if ($interfaceName eq "HTMLSelectElement" || $interfaceName eq "HTMLAppletElement" || $interfaceName eq "HTMLEmbedElement" || $interfaceName eq "HTMLObjectElement") {
+ if ($interfaceName eq "HTMLAppletElement" || $interfaceName eq "HTMLEmbedElement" || $interfaceName eq "HTMLObjectElement") {
$hasCustomNamedGetter = 1;
}
if ($interfaceName eq "HTMLDocument") {
@@ -1742,7 +1742,7 @@ sub GenerateImplementationNamedPropertyGetter
$hasCustomGetter = 0;
}
- my $hasGetter = $dataNode->extendedAttributes->{"HasNameGetter"} || $hasCustomGetter || $namedPropertyGetter;
+ my $hasGetter = $dataNode->extendedAttributes->{"HasNameGetter"} || $hasCustomGetter;
if (!$hasGetter) {
return;
}
diff --git a/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp b/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp
index 13a9d30..7cd3926 100644
--- a/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp
@@ -46,33 +46,6 @@
namespace WebCore {
-v8::Handle<v8::Value> V8HTMLSelectElement::namedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
-{
- INC_STATS("DOM.HTMLSelectElement.NamedPropertyGetter");
- HTMLSelectElement* select = V8HTMLSelectElement::toNative(info.Holder());
- v8::Handle<v8::Value> value = info.Holder()->GetRealNamedPropertyInPrototypeChain(name);
-
- if (!value.IsEmpty())
- return value;
-
- // Search local callback properties next to find IDL defined properties.
- if (info.Holder()->HasRealNamedCallbackProperty(name))
- return notHandledByInterceptor();
-
- PassRefPtr<HTMLOptionsCollection> collection = select->options();
-
- Vector<RefPtr<Node> > items;
- collection->namedItems(v8StringToAtomicWebCoreString(name), items);
-
- if (!items.size())
- return notHandledByInterceptor();
-
- if (items.size() == 1)
- return toV8(items.at(0).release());
-
- return toV8(V8NamedNodesCollection::create(items));
-}
-
v8::Handle<v8::Value> V8HTMLSelectElement::indexedPropertyGetter(uint32_t index, const v8::AccessorInfo& info)
{
ASSERT(V8DOMWrapper::maybeDOMWrapper(info.Holder()));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list