Diff
Modified: trunk/LayoutTests/ChangeLog (115111 => 115112)
--- trunk/LayoutTests/ChangeLog 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/LayoutTests/ChangeLog 2012-04-24 21:24:50 UTC (rev 115112)
@@ -1,3 +1,10 @@
+2012-04-24 Ryosuke Niwa <[email protected]>
+
+ Revert r115009; It doesn't make necessary changes to NodeRareData and Node.
+
+ * fast/forms/form-collection-radio-node-list-expected.txt: Removed.
+ * fast/forms/form-collection-radio-node-list.html: Removed.
+
2012-04-24 Alpha Lam <[email protected]>
Unreviewed. Test expectations updates to make lint happy.
Deleted: trunk/LayoutTests/fast/forms/form-collection-radio-node-list-expected.txt (115111 => 115112)
--- trunk/LayoutTests/fast/forms/form-collection-radio-node-list-expected.txt 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/LayoutTests/fast/forms/form-collection-radio-node-list-expected.txt 2012-04-24 21:24:50 UTC (rev 115112)
@@ -1,44 +0,0 @@
-This test is for RadioNodeList specified at http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#radionodelist
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-
-
-
-PASS owner.elements.length is 23
-PASS radioNodeList.length is 4
-PASS radioNodeList[0].value is 'searching'
-PASS radioNodeList[1].value is '123'
-PASS radioNodeList[2].value is 'inputRadioValue'
-PASS radioNodeList[3].value is 'buttonValue'
-
-Changing the input value to check RadioNodeList is live view of FormCollection
-PASS radioNodeList[1].value is '456'
-
-Checking value IDL attribute on the RadioNodeList
-PASS radioNodeList.value is ""
-PASS radioNodeList.value = "inputRadioValue"; radioNodeList[2].checked is true
-PASS Object.prototype.toString.call(radioNodeList[2]) is '[object HTMLInputElement]'
-PASS radioNodeList[2].type is 'radio'
-PASS radioNodeList.value is ""
-PASS radioNodeList[2].checked = true; radioNodeList.value is 'inputRadioValue'
-
-Check RadioNodeList is updated after adding a new element
-PASS owner.appendChild(newElement); radioNodeList.length is 5
-PASS radioNodeList[4].value is 'new element'
-
-Check RadioNodeList is updated after remove an element
-PASS owner.removeChild(newElement); radioNodeList.length is 4
-PASS radioNodeList[3].value is 'buttonValue'
-
-Check RadioNodeList is updated after adding a new element
-PASS container.appendChild(nonSubtreeElement); radioNodeList.length is 5
-PASS owner.elements.length is 24
-PASS radioNodeList[4].value is 'non subtree element'
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/forms/form-collection-radio-node-list.html (115111 => 115112)
--- trunk/LayoutTests/fast/forms/form-collection-radio-node-list.html 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/LayoutTests/fast/forms/form-collection-radio-node-list.html 2012-04-24 21:24:50 UTC (rev 115112)
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="divId">
-<form id="form1">
- <button id=button1></button>
- <fieldset id=fieldset1><legend id=legend1></legend></fieldset>
- <input id=inputhidden type=hidden>
- <input id=inputtext type=text>
- <input id=inputcommon type=search value=searching>
- <input id=inputurl type=url>
- <input id=inputemail type=email>
- <input id=inputpassword type=password>
- <input id=inputdate type=date>
- <input id=numberId name=inputcommon type=number value=123>
- <input id=inputrange type=range>
- <input id=inputcolor type=color>
- <input id=inputcheckbox type=checkbox>
- <input id=inputcommon type=radio value="inputRadioValue">
- <input id=inputfile type=file>
- <input id=inputsubmit type=submit>
- <input id=inputcommon type=image>
- <input id=inputreset type=reset>
- <input id=inputcommon type=button value=buttonValue>
- <keygen id=keygen1></keygen>
- <label id=label1></label>
- <meter id=meter1></meter>
- <object id=object1></object>
- <output id=output1></output>
- <progress id=progress1></progress>
- <select id=select1>
- <optgroup id=optgroup1>group1</optgroup>
- <option id=option1>option1</option>
- </select>
- <textarea id=textarea1></textarea>
-</form>
-</div>
-<div id="console"></div>
-<script>
-description("This test is for RadioNodeList specified at http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#radionodelist ");
-debug("");
-var owner = document.getElementById('form1');
-
-shouldBe('owner.elements.length', '23');
-
-var elementsList = owner.elements;
-var radioNodeList = elementsList.namedItem("inputcommon");
-shouldBe('radioNodeList.length', '4');
-
-shouldBe('radioNodeList[0].value', "'searching'");
-shouldBe('radioNodeList[1].value', "'123'");
-shouldBe('radioNodeList[2].value', "'inputRadioValue'");
-shouldBe('radioNodeList[3].value', "'buttonValue'");
-
-debug("");
-debug("Changing the input value to check RadioNodeList is live view of FormCollection");
-document.getElementById("numberId").value = 456;
-shouldBe('radioNodeList[1].value', "'456'");
-
-debug("");
-debug("Checking value IDL attribute on the RadioNodeList");
-shouldBe('radioNodeList.value', '""');
-shouldBe('radioNodeList.value = "inputRadioValue"; radioNodeList[2].checked', 'true');
-shouldBe('Object.prototype.toString.call(radioNodeList[2])', "'[object HTMLInputElement]'");
-shouldBe('radioNodeList[2].type', "'radio'");
-
-radioNodeList[2].checked = false;
-shouldBe('radioNodeList.value', '""');
-shouldBe('radioNodeList[2].checked = true; radioNodeList.value', "'inputRadioValue'");
-
-var newElement = document.createElement("input");
-newElement.setAttribute("type", "text");
-newElement.setAttribute("value", "new element");
-newElement.setAttribute("id", "inputcommon");
-
-debug("");
-debug("Check RadioNodeList is updated after adding a new element");
-shouldBe('owner.appendChild(newElement); radioNodeList.length', '5');
-shouldBe('radioNodeList[4].value', "'new element'");
-
-debug("");
-debug("Check RadioNodeList is updated after remove an element");
-shouldBe('owner.removeChild(newElement); radioNodeList.length', '4');
-shouldBe('radioNodeList[3].value', "'buttonValue'");
-
-var nonSubtreeElement = document.createElement("input");
-nonSubtreeElement.setAttribute("type", "text");
-nonSubtreeElement.setAttribute("value", "non subtree element");
-nonSubtreeElement.setAttribute("id", "inputcommon");
-nonSubtreeElement.setAttribute("form", "form1");
-
-var container = document.getElementById("divId");
-
-debug("");
-debug("Check RadioNodeList is updated after adding a new element");
-shouldBe('container.appendChild(nonSubtreeElement); radioNodeList.length', '5');
-shouldBe('owner.elements.length', '24');
-shouldBe('radioNodeList[4].value', "'non subtree element'");
-
-debug("");
-</script>
-<script src=""
-</body>
-</html>
-
Modified: trunk/Source/WebCore/CMakeLists.txt (115111 => 115112)
--- trunk/Source/WebCore/CMakeLists.txt 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-04-24 21:24:50 UTC (rev 115112)
@@ -323,7 +323,6 @@
html/ImageData.idl
html/MediaController.idl
html/MediaError.idl
- html/RadioNodeList.idl
html/TextMetrics.idl
html/TimeRanges.idl
html/ValidityState.idl
@@ -846,7 +845,6 @@
html/PasswordInputType.cpp
html/PluginDocument.cpp
html/RadioInputType.cpp
- html/RadioNodeList.cpp
html/RangeInputType.cpp
html/ResetInputType.cpp
html/SearchInputType.cpp
Modified: trunk/Source/WebCore/ChangeLog (115111 => 115112)
--- trunk/Source/WebCore/ChangeLog 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/ChangeLog 2012-04-24 21:24:50 UTC (rev 115112)
@@ -1,3 +1,32 @@
+2012-04-24 Ryosuke Niwa <[email protected]>
+
+ Revert r115009; It doesn't make necessary changes to NodeRareData and Node.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSHTMLCollectionCustom.cpp:
+ (WebCore::getNamedItems):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/v8/custom/V8HTMLCollectionCustom.cpp:
+ (WebCore::getNamedItems):
+ * html/CollectionType.h:
+ * html/HTMLCollection.cpp:
+ (WebCore::HTMLCollection::shouldIncludeChildren):
+ (WebCore::HTMLCollection::isAcceptableElement):
+ * html/HTMLFormCollection.cpp:
+ (WebCore::HTMLFormCollection::HTMLFormCollection):
+ * html/RadioNodeList.cpp: Removed.
+ * html/RadioNodeList.h: Removed.
+ * html/RadioNodeList.idl: Removed.
+
2012-04-24 Chris Rogers <[email protected]>
WaveTable should normalize to 0dbFS instead of -6dbFS
Modified: trunk/Source/WebCore/DerivedSources.cpp (115111 => 115112)
--- trunk/Source/WebCore/DerivedSources.cpp 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/DerivedSources.cpp 2012-04-24 21:24:50 UTC (rev 115112)
@@ -265,7 +265,6 @@
#include "JSPositionErrorCallback.cpp"
#include "JSProcessingInstruction.cpp"
#include "JSProgressEvent.cpp"
-#include "JSRadioNodeList.cpp"
#include "JSRange.cpp"
#include "JSRangeException.cpp"
#include "JSRect.cpp"
Modified: trunk/Source/WebCore/DerivedSources.make (115111 => 115112)
--- trunk/Source/WebCore/DerivedSources.make 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/DerivedSources.make 2012-04-24 21:24:50 UTC (rev 115112)
@@ -335,7 +335,6 @@
$(WebCore)/html/ImageData.idl \
$(WebCore)/html/MediaController.idl \
$(WebCore)/html/MediaError.idl \
- $(WebCore)/html/RadioNodeList.idl \
$(WebCore)/html/TextMetrics.idl \
$(WebCore)/html/TimeRanges.idl \
$(WebCore)/html/ValidityState.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (115111 => 115112)
--- trunk/Source/WebCore/DerivedSources.pri 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-04-24 21:24:50 UTC (rev 115112)
@@ -383,7 +383,6 @@
$$PWD/html/ImageData.idl \
$$PWD/html/MediaController.idl \
$$PWD/html/MediaError.idl \
- $$PWD/html/RadioNodeList.idl \
$$PWD/html/TextMetrics.idl \
$$PWD/html/TimeRanges.idl \
$$PWD/html/ValidityState.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (115111 => 115112)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-04-24 21:24:50 UTC (rev 115112)
@@ -460,8 +460,6 @@
DerivedSources/WebCore/JSProcessingInstruction.h \
DerivedSources/WebCore/JSProgressEvent.cpp \
DerivedSources/WebCore/JSProgressEvent.h \
- DerivedSources/WebCore/JSRadioNodeList.cpp \
- DerivedSources/WebCore/JSRadioNodeList.h \
DerivedSources/WebCore/JSRange.cpp \
DerivedSources/WebCore/JSRangeException.cpp \
DerivedSources/WebCore/JSRangeException.h \
@@ -875,7 +873,6 @@
$(WebCore)/html/MediaError.idl \
$(WebCore)/html/MediaKeyError.idl \
$(WebCore)/html/MediaKeyEvent.idl \
- $(WebCore)/html/RadioNodeList.idl \
$(WebCore)/html/TextMetrics.idl \
$(WebCore)/html/TimeRanges.idl \
$(WebCore)/html/ValidityState.idl \
@@ -2527,8 +2524,6 @@
Source/WebCore/html/RadioInputType.h \
Source/WebCore/html/RangeInputType.cpp \
Source/WebCore/html/RangeInputType.h \
- Source/WebCore/html/RadioNodeList.cpp \
- Source/WebCore/html/RadioNodeList.h \
Source/WebCore/html/ResetInputType.cpp \
Source/WebCore/html/ResetInputType.h \
Source/WebCore/html/SearchInputType.cpp \
Modified: trunk/Source/WebCore/Target.pri (115111 => 115112)
--- trunk/Source/WebCore/Target.pri 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/Target.pri 2012-04-24 21:24:50 UTC (rev 115112)
@@ -826,7 +826,6 @@
html/PasswordInputType.cpp \
html/PluginDocument.cpp \
html/RadioInputType.cpp \
- html/RadioNodeList.cpp \
html/RangeInputType.cpp \
html/ResetInputType.cpp \
html/SearchInputType.cpp \
@@ -1968,7 +1967,6 @@
html/MicroDataItemValue.h \
html/PluginDocument.h \
html/PublicURLManager.h \
- html/RadioNodeList.h \
html/StepRange.h \
html/TextDocument.h \
html/TimeRanges.h \
Modified: trunk/Source/WebCore/WebCore.gypi (115111 => 115112)
--- trunk/Source/WebCore/WebCore.gypi 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/WebCore.gypi 2012-04-24 21:24:50 UTC (rev 115112)
@@ -1072,7 +1072,6 @@
'html/MediaError.idl',
'html/MediaKeyError.idl',
'html/MediaKeyEvent.idl',
- 'html/RadioNodeList.idl',
'html/TextMetrics.idl',
'html/TimeRanges.idl',
'html/ValidityState.idl',
@@ -5611,8 +5610,6 @@
'html/PublicURLManager.h',
'html/RadioInputType.cpp',
'html/RadioInputType.h',
- 'html/RadioNodeList.cpp',
- 'html/RadioNodeList.h',
'html/RangeInputType.cpp',
'html/RangeInputType.h',
'html/ResetInputType.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (115111 => 115112)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-04-24 21:24:50 UTC (rev 115112)
@@ -12658,62 +12658,6 @@
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSRadioNodeList.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSRadioNodeList.h"
- >
- </File>
- <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSRange.cpp"
>
<FileConfiguration
@@ -62158,14 +62102,6 @@
>
</File>
<File
- RelativePath="..\html\RadioNodeList.cpp"
- >
- </File>
- <File
- RelativePath="..\html\RadioNodeList.h"
- >
- </File>
- <File
RelativePath="..\html\RangeInputType.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (115111 => 115112)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-04-24 21:24:50 UTC (rev 115112)
@@ -5119,10 +5119,6 @@
B5D31DFB11CF610B009F22B4 /* ActiveDOMCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D31DF911CF610B009F22B4 /* ActiveDOMCallback.h */; };
B6566270120B1227006EA85C /* JSIDBTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = B656626E120B1227006EA85C /* JSIDBTransaction.h */; };
B6566271120B1227006EA85C /* JSIDBTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B656626F120B1227006EA85C /* JSIDBTransaction.cpp */; };
- B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B658FF9F1522EF3A00DD5595 /* JSRadioNodeList.cpp */; };
- B658FFA21522EF3A00DD5595 /* JSRadioNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = B658FFA01522EF3A00DD5595 /* JSRadioNodeList.h */; };
- B658FFA51522EFAA00DD5595 /* RadioNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B658FFA31522EFAA00DD5595 /* RadioNodeList.cpp */; };
- B658FFA61522EFAA00DD5595 /* RadioNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = B658FFA41522EFAA00DD5595 /* RadioNodeList.h */; };
B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */ = {isa = PBXBuildFile; fileRef = B776D43A1104525D00BEB0EC /* PrintContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
B734B181119B9911006587BD /* FontTranscoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B734B180119B9911006587BD /* FontTranscoder.cpp */; };
B734B183119B991D006587BD /* FontTranscoder.h in Headers */ = {isa = PBXBuildFile; fileRef = B734B182119B991D006587BD /* FontTranscoder.h */; };
@@ -12202,10 +12198,6 @@
B5D31DF911CF610B009F22B4 /* ActiveDOMCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActiveDOMCallback.h; path = generic/ActiveDOMCallback.h; sourceTree = "<group>"; };
B656626E120B1227006EA85C /* JSIDBTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBTransaction.h; sourceTree = "<group>"; };
B656626F120B1227006EA85C /* JSIDBTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBTransaction.cpp; sourceTree = "<group>"; };
- B658FF9F1522EF3A00DD5595 /* JSRadioNodeList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRadioNodeList.cpp; sourceTree = "<group>"; };
- B658FFA01522EF3A00DD5595 /* JSRadioNodeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRadioNodeList.h; sourceTree = "<group>"; };
- B658FFA31522EFAA00DD5595 /* RadioNodeList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RadioNodeList.cpp; sourceTree = "<group>"; };
- B658FFA41522EFAA00DD5595 /* RadioNodeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RadioNodeList.h; sourceTree = "<group>"; };
B734B180119B9911006587BD /* FontTranscoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontTranscoder.cpp; path = transcoder/FontTranscoder.cpp; sourceTree = "<group>"; };
B734B182119B991D006587BD /* FontTranscoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontTranscoder.h; path = transcoder/FontTranscoder.h; sourceTree = "<group>"; };
B776D43A1104525D00BEB0EC /* PrintContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintContext.h; sourceTree = "<group>"; };
@@ -16849,8 +16841,6 @@
93EEC1EC09C2877700C515D1 /* html */ = {
isa = PBXGroup;
children = (
- B658FFA31522EFAA00DD5595 /* RadioNodeList.cpp */,
- B658FFA41522EFAA00DD5595 /* RadioNodeList.h */,
49484FAE102CF01E00187DD3 /* canvas */,
97C1F5511228558800EDE616 /* parser */,
4150F9ED12B6E0990008C860 /* shadow */,
@@ -17755,8 +17745,6 @@
A83B79080CCAFF2B000B0825 /* HTML */ = {
isa = PBXGroup;
children = (
- B658FF9F1522EF3A00DD5595 /* JSRadioNodeList.cpp */,
- B658FFA01522EF3A00DD5595 /* JSRadioNodeList.h */,
49EECEF2105070C400099FAB /* JSArrayBuffer.cpp */,
49EECEF3105070C400099FAB /* JSArrayBuffer.h */,
49EECF19105072F300099FAB /* JSArrayBufferView.cpp */,
@@ -24828,8 +24816,6 @@
CECADFCE1537791D00E37068 /* TextInsertionBaseCommand.h in Headers */,
9831AE4A154225C900FE2644 /* ReferrerPolicy.h in Headers */,
50D10D9A1545F5760096D288 /* RenderLayerFilterInfo.h in Headers */,
- B658FFA21522EF3A00DD5595 /* JSRadioNodeList.h in Headers */,
- B658FFA61522EFAA00DD5595 /* RadioNodeList.h in Headers */,
E100EE761546EAC100BA11D1 /* StyleBuilder.h in Headers */,
51FA2D78152132B300C1BA0B /* DOMWindowExtension.h in Headers */,
);
@@ -27843,8 +27829,6 @@
CECADFC8153778FF00E37068 /* DictationCommand.cpp in Sources */,
CECADFCD1537791D00E37068 /* TextInsertionBaseCommand.cpp in Sources */,
50D10D991545F5760096D288 /* RenderLayerFilterInfo.cpp in Sources */,
- B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */,
- B658FFA51522EFAA00DD5595 /* RadioNodeList.cpp in Sources */,
E100EE751546EAC100BA11D1 /* StyleBuilder.cpp in Sources */,
517FBA1E151AB17C00B57959 /* DOMWindowExtension.cpp in Sources */,
);
Modified: trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp (115111 => 115112)
--- trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2012-04-24 21:24:50 UTC (rev 115112)
@@ -28,9 +28,7 @@
#include "JSHTMLOptionsCollection.h"
#include "JSNode.h"
#include "JSNodeList.h"
-#include "JSRadioNodeList.h"
#include "Node.h"
-#include "RadioNodeList.h"
#include "StaticNodeList.h"
#include <wtf/Vector.h>
#include <wtf/text/AtomicString.h>
@@ -47,17 +45,13 @@
static JSValue getNamedItems(ExecState* exec, JSHTMLCollection* collection, const Identifier& propertyName)
{
Vector<RefPtr<Node> > namedItems;
- const AtomicString& name = identifierToAtomicString(propertyName);
- collection->impl()->namedItems(name, namedItems);
+ collection->impl()->namedItems(identifierToAtomicString(propertyName), namedItems);
if (namedItems.isEmpty())
return jsUndefined();
if (namedItems.size() == 1)
return toJS(exec, collection->globalObject(), namedItems[0].get());
- if (collection->impl()->type() == FormControls)
- return toJS(exec, collection->globalObject(), RadioNodeList::create(name, toElement(collection->impl()->base())).get());
-
// FIXME: HTML5 specifies that this should be a DynamicNodeList.
// FIXME: HTML5 specifies that non-HTMLOptionsCollection collections should return
// the first matching item instead of a NodeList.
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (115111 => 115112)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-04-24 21:24:50 UTC (rev 115112)
@@ -2222,7 +2222,7 @@
push(@implContent, " return toJS(exec, thisObj->globalObject(), static_cast<$implClassName*>(thisObj->impl())->item(index));\n");
}
push(@implContent, "}\n\n");
- if ($interfaceName eq "HTMLCollection" or $interfaceName eq "HTMLAllCollection" or $interfaceName eq "RadioNodeList") {
+ if ($interfaceName eq "HTMLCollection" or $interfaceName eq "HTMLAllCollection") {
$implIncludes{"JSNode.h"} = 1;
$implIncludes{"Node.h"} = 1;
}
Modified: trunk/Source/WebCore/bindings/v8/custom/V8HTMLCollectionCustom.cpp (115111 => 115112)
--- trunk/Source/WebCore/bindings/v8/custom/V8HTMLCollectionCustom.cpp 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/bindings/v8/custom/V8HTMLCollectionCustom.cpp 2012-04-24 21:24:50 UTC (rev 115112)
@@ -32,14 +32,12 @@
#include "V8HTMLCollection.h"
#include "HTMLCollection.h"
-#include "RadioNodeList.h"
#include "V8Binding.h"
#include "V8HTMLAllCollection.h"
#include "V8NamedNodesCollection.h"
#include "V8Node.h"
#include "V8NodeList.h"
#include "V8Proxy.h"
-#include "V8RadioNodeList.h"
namespace WebCore {
@@ -54,9 +52,6 @@
if (namedItems.size() == 1)
return toV8(namedItems.at(0).release(), isolate);
- if (collection->type() == FormControls)
- return toV8(RadioNodeList::create(name, toElement(collection->base())).get());
-
return toV8(V8NamedNodesCollection::create(namedItems), isolate);
}
Modified: trunk/Source/WebCore/html/CollectionType.h (115111 => 115112)
--- trunk/Source/WebCore/html/CollectionType.h 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/html/CollectionType.h 2012-04-24 21:24:50 UTC (rev 115112)
@@ -59,7 +59,6 @@
ItemProperties, // Microdata item properties in the document
#endif
- FormControls,
OtherCollection
};
Modified: trunk/Source/WebCore/html/HTMLCollection.cpp (115111 => 115112)
--- trunk/Source/WebCore/html/HTMLCollection.cpp 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/html/HTMLCollection.cpp 2012-04-24 21:24:50 UTC (rev 115112)
@@ -67,7 +67,6 @@
#if ENABLE(MICRODATA)
case ItemProperties:
#endif
- case FormControls:
return true;
case NodeChildren:
case TRCells:
@@ -149,7 +148,6 @@
case ItemProperties:
return element->isHTMLElement() && element->fastHasAttribute(itempropAttr);
#endif
- case FormControls:
case DocumentNamedItems:
case OtherCollection:
case WindowNamedItems:
Modified: trunk/Source/WebCore/html/HTMLFormCollection.cpp (115111 => 115112)
--- trunk/Source/WebCore/html/HTMLFormCollection.cpp 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/html/HTMLFormCollection.cpp 2012-04-24 21:24:50 UTC (rev 115112)
@@ -36,7 +36,7 @@
// calculation every time if anything has changed.
HTMLFormCollection::HTMLFormCollection(HTMLFormElement* form)
- : HTMLCollection(form, FormControls)
+ : HTMLCollection(form, OtherCollection)
, currentPos(0)
{
}
Deleted: trunk/Source/WebCore/html/RadioNodeList.cpp (115111 => 115112)
--- trunk/Source/WebCore/html/RadioNodeList.cpp 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/html/RadioNodeList.cpp 2012-04-24 21:24:50 UTC (rev 115112)
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2012 Motorola Mobility, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY MOTOROLA MOBILITY, INC. AND ITS CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MOTOROLA MOBILITY, INC. OR ITS
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "RadioNodeList.h"
-
-#include "Element.h"
-#include "HTMLFormElement.h"
-#include "HTMLInputElement.h"
-#include "HTMLNames.h"
-
-namespace WebCore {
-
-using namespace HTMLNames;
-
-RadioNodeList::RadioNodeList(const AtomicString& name, Element* formElement)
- : DynamicSubtreeNodeList(formElement->document())
- , m_name(name)
- , m_formElement(formElement)
-{
- m_formElement->document()->registerDynamicSubtreeNodeList(this);
-}
-
-RadioNodeList::~RadioNodeList()
-{
- m_formElement->document()->unregisterDynamicSubtreeNodeList(this);
-}
-
-static HTMLInputElement* toRadioButtonInputElement(Node* node)
-{
- ASSERT(node->isElementNode());
- HTMLInputElement* inputElement = node->toInputElement();
- if (!inputElement || !inputElement->isRadioButton() || inputElement->value().isEmpty())
- return 0;
- return inputElement;
-}
-
-String RadioNodeList::value() const
-{
- for (unsigned i = 0; i < length(); ++i) {
- Node* node = item(i);
- const HTMLInputElement* inputElement = toRadioButtonInputElement(node);
- if (!inputElement || !inputElement->checked())
- continue;
- return inputElement->value();
- }
- return String();
-}
-
-void RadioNodeList::setValue(const String& value)
-{
- for (unsigned i = 0; i < length(); ++i) {
- Node* node = item(i);
- HTMLInputElement* inputElement = toRadioButtonInputElement(node);
- if (!inputElement || inputElement->value() != value)
- continue;
- inputElement->setChecked(true);
- }
-}
-
-bool RadioNodeList::nodeMatches(Element* testElement) const
-{
- if (!testElement->isFormControlElement())
- return false;
-
- HTMLFormElement* formElement = static_cast<HTMLFormControlElement*>(testElement)->form();
- if (!formElement || formElement != m_formElement)
- return false;
-
- if (HTMLInputElement* inputElement = testElement->toInputElement())
- if (inputElement->isImageButton())
- return false;
-
- return equalIgnoringCase(testElement->getIdAttribute(), m_name) || equalIgnoringCase(testElement->getNameAttribute(), m_name);
-}
-
-} // namspace
-
Deleted: trunk/Source/WebCore/html/RadioNodeList.h (115111 => 115112)
--- trunk/Source/WebCore/html/RadioNodeList.h 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/html/RadioNodeList.h 2012-04-24 21:24:50 UTC (rev 115112)
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2012 Motorola Mobility, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY MOTOROLA MOBILITY, INC. AND ITS CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MOTOROLA MOBILITY, INC. OR ITS
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RadioNodeList_h
-#define RadioNodeList_h
-
-#include "DynamicNodeList.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-class RadioNodeList : public DynamicSubtreeNodeList {
-public:
- static PassRefPtr<RadioNodeList> create(const AtomicString& name, Element* formElement)
- {
- return adoptRef(new RadioNodeList(name, formElement));
- }
-
- ~RadioNodeList();
-
- String value() const;
- void setValue(const String&);
-
-protected:
- virtual bool nodeMatches(Element*) const;
-
-private:
- RadioNodeList(const AtomicString& name, Element*);
-
- AtomicString m_name;
- RefPtr<Element> m_formElement;
-};
-
-} // namepsace
-
-#endif
-
Deleted: trunk/Source/WebCore/html/RadioNodeList.idl (115111 => 115112)
--- trunk/Source/WebCore/html/RadioNodeList.idl 2012-04-24 21:20:09 UTC (rev 115111)
+++ trunk/Source/WebCore/html/RadioNodeList.idl 2012-04-24 21:24:50 UTC (rev 115112)
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012 Motorola Mobility, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY MOTOROLA MOBILITY, INC. AND ITS CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MOTOROLA MOBILITY, INC. OR ITS
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module html {
-
- interface [
- JSGenerateToJSObject,
- IndexedGetter,
- ] RadioNodeList : NodeList {
- attribute DOMString value;
- };
-}
-
