Diff
Modified: trunk/Source/WebCore/ChangeLog (136849 => 136850)
--- trunk/Source/WebCore/ChangeLog 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/ChangeLog 2012-12-06 17:52:50 UTC (rev 136850)
@@ -1,3 +1,61 @@
+2012-12-06 Ryosuke Niwa <[email protected]>
+
+ Use ownerNode() instead of base() in HTMLCollection
+ https://bugs.webkit.org/show_bug.cgi?id=104244
+
+ Reviewed by Adam Barth.
+
+ Use ownerNode() instead of base() in HTMLCollection to match LiveNodeList.
+ Notice that the definition of base(), which this patch removes, is "return ownerNode()".
+
+ * bindings/js/JSHTMLFormControlsCollectionCustom.cpp:
+ (WebCore::getNamedItems):
+ * bindings/js/JSHTMLOptionsCollectionCustom.cpp:
+ (WebCore::JSHTMLOptionsCollection::indexSetter):
+ (WebCore::JSHTMLOptionsCollection::remove):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateOpaqueRootForGC):
+ * bindings/scripts/IDLAttributes.txt:
+ * bindings/v8/custom/V8HTMLFormControlsCollectionCustom.cpp:
+ (WebCore::getNamedItems):
+ * bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp:
+ (WebCore::V8HTMLOptionsCollection::removeCallback):
+ (WebCore::V8HTMLOptionsCollection::indexedPropertySetter):
+ * dom/WebKitNamedFlow.cpp:
+ (WebCore::WebKitNamedFlow::ownerNode):
+ * dom/WebKitNamedFlow.h:
+ (WebKitNamedFlow):
+ * dom/WebKitNamedFlow.idl:
+ * html/HTMLAllCollection.idl:
+ * html/HTMLCollection.h:
+ (HTMLCollection):
+ * html/HTMLCollection.idl:
+ * html/HTMLFormControlsCollection.cpp:
+ (WebCore::HTMLFormControlsCollection::HTMLFormControlsCollection):
+ (WebCore::HTMLFormControlsCollection::create):
+ (WebCore::HTMLFormControlsCollection::formControlElements):
+ (WebCore::HTMLFormControlsCollection::formImageElements):
+ (WebCore::HTMLFormControlsCollection::namedItem):
+ (WebCore::HTMLFormControlsCollection::updateNameCache):
+ * html/HTMLFormControlsCollection.idl:
+ * html/HTMLNameCollection.cpp:
+ (WebCore::HTMLNameCollection::~HTMLNameCollection):
+ (WebCore::HTMLNameCollection::virtualItemAfter):
+ * html/HTMLOptionsCollection.cpp:
+ (WebCore::HTMLOptionsCollection::add):
+ (WebCore::HTMLOptionsCollection::remove):
+ (WebCore::HTMLOptionsCollection::selectedIndex):
+ (WebCore::HTMLOptionsCollection::setSelectedIndex):
+ (WebCore::HTMLOptionsCollection::setLength):
+ * html/HTMLOptionsCollection.idl:
+ * html/HTMLPropertiesCollection.cpp:
+ (WebCore::HTMLPropertiesCollection::updateRefElements):
+ (WebCore::HTMLPropertiesCollection::namedItem):
+ * html/HTMLTableRowsCollection.cpp:
+ (WebCore::HTMLTableRowsCollection::virtualItemAfter):
+
2012-12-06 Tommy Widenflycht <[email protected]>
Speech Recognition API: Change the error code to a string on SpeechRecognitionError
Modified: trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp (136849 => 136850)
--- trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -49,7 +49,7 @@
return toJS(exec, collection->globalObject(), namedItems[0].get());
ASSERT(collection->impl()->type() == FormControls);
- return toJS(exec, collection->globalObject(), collection->impl()->base()->radioNodeList(name).get());
+ return toJS(exec, collection->globalObject(), collection->impl()->ownerNode()->radioNodeList(name).get());
}
bool JSHTMLFormControlsCollection::canGetItemsForName(ExecState*, HTMLFormControlsCollection* collection, PropertyName propertyName)
Modified: trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp (136849 => 136850)
--- trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -90,7 +90,7 @@
void JSHTMLOptionsCollection::indexSetter(ExecState* exec, unsigned index, JSValue value)
{
HTMLOptionsCollection* imp = static_cast<HTMLOptionsCollection*>(impl());
- HTMLSelectElement* base = toHTMLSelectElement(imp->base());
+ HTMLSelectElement* base = toHTMLSelectElement(imp->ownerNode());
selectIndexSetter(base, exec, index, value);
}
@@ -118,7 +118,7 @@
JSValue JSHTMLOptionsCollection::remove(ExecState* exec)
{
HTMLOptionsCollection* imp = static_cast<HTMLOptionsCollection*>(impl());
- JSHTMLSelectElement* base = jsCast<JSHTMLSelectElement*>(asObject(toJS(exec, globalObject(), imp->base())));
+ JSHTMLSelectElement* base = jsCast<JSHTMLSelectElement*>(asObject(toJS(exec, globalObject(), imp->ownerNode())));
return base->remove(exec);
}
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (136849 => 136850)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-12-06 17:52:50 UTC (rev 136850)
@@ -2510,8 +2510,8 @@
$rootString .= " void* root = WebCore::root(element);\n";
} elsif ($interfaceName eq "CanvasRenderingContext") {
$rootString = " void* root = WebCore::root(js${interfaceName}->impl()->canvas());\n";
- } elsif (GetGenerateIsReachable($interface) eq "ImplBaseRoot") {
- $rootString = " void* root = WebCore::root(js${interfaceName}->impl()->base());\n";
+ } elsif (GetGenerateIsReachable($interface) eq "ImplOwnerNodeRoot") {
+ $rootString = " void* root = WebCore::root(js${interfaceName}->impl()->ownerNode());\n";
} else {
$rootString = " void* root = WebCore::root(js${interfaceName}->impl());\n";
}
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (136849 => 136850)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-12-06 17:52:50 UTC (rev 136850)
@@ -195,8 +195,7 @@
if (GetGenerateIsReachable($interface) eq "ImplDocument" ||
GetGenerateIsReachable($interface) eq "ImplElementRoot" ||
GetGenerateIsReachable($interface) eq "ImplOwnerRoot" ||
- GetGenerateIsReachable($interface) eq "ImplOwnerNodeRoot" ||
- GetGenerateIsReachable($interface) eq "ImplBaseRoot") {
+ GetGenerateIsReachable($interface) eq "ImplOwnerNodeRoot") {
$implIncludes{"V8GCController.h"} = 1;
@@ -205,7 +204,6 @@
$methodName = "element" if (GetGenerateIsReachable($interface) eq "ImplElementRoot");
$methodName = "owner" if (GetGenerateIsReachable($interface) eq "ImplOwnerRoot");
$methodName = "ownerNode" if (GetGenerateIsReachable($interface) eq "ImplOwnerNodeRoot");
- $methodName = "base" if (GetGenerateIsReachable($interface) eq "ImplBaseRoot");
push(@implContent, <<END);
if (Node* owner = impl->${methodName}())
Modified: trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt (136849 => 136850)
--- trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt 2012-12-06 17:52:50 UTC (rev 136850)
@@ -53,7 +53,7 @@
DoNotCheckSecurityOnSetter
EventTarget
ExtendsDOMGlobalObject
-GenerateIsReachable=ImplDocument|ImplElementRoot|ImplBaseRoot
+GenerateIsReachable=ImplDocument|ImplElementRoot|ImplOwnerNodeRoot
Immutable
ImplementedAs=*
IndexedGetter
@@ -76,7 +76,7 @@
JSCustomSetter
JSCustomToJSObject
JSCustomToNativeObject
-JSGenerateIsReachable=|Impl|ImplContext|ImplDocument|ImplElementRoot|ImplFrame|ImplBaseRoot
+JSGenerateIsReachable=|Impl|ImplContext|ImplDocument|ImplElementRoot|ImplFrame|ImplOwnerNodeRoot
JSGenerateToJSObject
JSGenerateToNativeObject
JSInlineGetOwnPropertySlot
@@ -118,7 +118,7 @@
V8DoNotCheckSignature
V8EnabledAtRuntime=*
V8EnabledPerContext=*
-V8GenerateIsReachable=ImplDocument|ImplElementRoot|ImplOwnerRoot|ImplOwnerNodeRoot|ImplBaseRoot
+V8GenerateIsReachable=ImplDocument|ImplElementRoot|ImplOwnerRoot|ImplOwnerNodeRoot
V8NoWrapperCache
V8MeasureAs=*
V8ReadOnly
Modified: trunk/Source/WebCore/bindings/v8/custom/V8HTMLFormControlsCollectionCustom.cpp (136849 => 136850)
--- trunk/Source/WebCore/bindings/v8/custom/V8HTMLFormControlsCollectionCustom.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/bindings/v8/custom/V8HTMLFormControlsCollectionCustom.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -50,7 +50,7 @@
if (namedItems.size() == 1)
return toV8(namedItems.at(0).release(), creationContext, isolate);
- return toV8(collection->base()->radioNodeList(name).get(), creationContext, isolate);
+ return toV8(collection->ownerNode()->radioNodeList(name).get(), creationContext, isolate);
}
v8::Handle<v8::Value> V8HTMLFormControlsCollection::namedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
Modified: trunk/Source/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp (136849 => 136850)
--- trunk/Source/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -88,7 +88,7 @@
{
INC_STATS("DOM.HTMLOptionsCollection.remove()");
HTMLOptionsCollection* imp = V8HTMLOptionsCollection::toNative(args.Holder());
- HTMLSelectElement* base = static_cast<HTMLSelectElement*>(imp->base());
+ HTMLSelectElement* base = static_cast<HTMLSelectElement*>(imp->ownerNode());
return removeElement(base, args);
}
@@ -155,7 +155,7 @@
{
INC_STATS("DOM.HTMLOptionsCollection.IndexedPropertySetter");
HTMLOptionsCollection* collection = V8HTMLOptionsCollection::toNative(info.Holder());
- HTMLSelectElement* base = static_cast<HTMLSelectElement*>(collection->base());
+ HTMLSelectElement* base = static_cast<HTMLSelectElement*>(collection->ownerNode());
return toOptionsCollectionSetter(index, value, base, info.GetIsolate());
}
Modified: trunk/Source/WebCore/dom/WebKitNamedFlow.cpp (136849 => 136850)
--- trunk/Source/WebCore/dom/WebKitNamedFlow.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/dom/WebKitNamedFlow.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -216,7 +216,7 @@
return m_flowManager->document();
}
-Node* WebKitNamedFlow::base() const
+Node* WebKitNamedFlow::ownerNode() const
{
return m_flowManager->document();
}
Modified: trunk/Source/WebCore/dom/WebKitNamedFlow.h (136849 => 136850)
--- trunk/Source/WebCore/dom/WebKitNamedFlow.h 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/dom/WebKitNamedFlow.h 2012-12-06 17:52:50 UTC (rev 136850)
@@ -67,7 +67,7 @@
// This function is called from the JS binding code to determine if the NamedFlow object is reachable or not.
// If the object has listeners, the object should only be discarded if the parent Document is not reachable.
- Node* base() const;
+ Node* ownerNode() const;
void setRenderer(RenderNamedFlowThread* parentFlowThread);
Modified: trunk/Source/WebCore/dom/WebKitNamedFlow.idl (136849 => 136850)
--- trunk/Source/WebCore/dom/WebKitNamedFlow.idl 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/dom/WebKitNamedFlow.idl 2012-12-06 17:52:50 UTC (rev 136850)
@@ -30,7 +30,7 @@
[
EventTarget,
JSGenerateToJSObject,
- GenerateIsReachable=ImplBaseRoot
+ GenerateIsReachable=ImplOwnerNodeRoot
] interface WebKitNamedFlow {
readonly attribute DOMString name;
readonly attribute boolean overset;
Modified: trunk/Source/WebCore/html/HTMLAllCollection.idl (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLAllCollection.idl 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLAllCollection.idl 2012-12-06 17:52:50 UTC (rev 136850)
@@ -28,7 +28,7 @@
NamedGetter,
CustomCall,
MasqueradesAsUndefined,
- GenerateIsReachable=ImplBaseRoot,
+ GenerateIsReachable=ImplOwnerNodeRoot,
V8DependentLifetime
] interface HTMLAllCollection {
readonly attribute unsigned long length;
Modified: trunk/Source/WebCore/html/HTMLCollection.h (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLCollection.h 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2012-12-06 17:52:50 UTC (rev 136850)
@@ -62,7 +62,6 @@
return item(0) && !item(1);
}
- Node* base() const { return ownerNode(); }
virtual Element* virtualItemAfter(unsigned& offsetInArray, Element*) const;
protected:
Modified: trunk/Source/WebCore/html/HTMLCollection.idl (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLCollection.idl 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLCollection.idl 2012-12-06 17:52:50 UTC (rev 136850)
@@ -22,7 +22,7 @@
IndexedGetter,
NamedGetter,
CustomToJSObject,
- GenerateIsReachable=ImplBaseRoot,
+ GenerateIsReachable=ImplOwnerNodeRoot,
V8DependentLifetime,
ObjCPolymorphic
] interface HTMLCollection {
Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -36,15 +36,15 @@
// Since the collections are to be "live", we have to do the
// calculation every time if anything has changed.
-HTMLFormControlsCollection::HTMLFormControlsCollection(Node* base)
- : HTMLCollection(base, FormControls, OverridesItemAfter)
+HTMLFormControlsCollection::HTMLFormControlsCollection(Node* ownerNode)
+ : HTMLCollection(ownerNode, FormControls, OverridesItemAfter)
{
- ASSERT(base->hasTagName(formTag) || base->hasTagName(fieldsetTag));
+ ASSERT(ownerNode->hasTagName(formTag) || ownerNode->hasTagName(fieldsetTag));
}
-PassRefPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(Node* base, CollectionType)
+PassRefPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(Node* ownerNode, CollectionType)
{
- return adoptRef(new HTMLFormControlsCollection(base));
+ return adoptRef(new HTMLFormControlsCollection(ownerNode));
}
HTMLFormControlsCollection::~HTMLFormControlsCollection()
@@ -53,18 +53,18 @@
const Vector<FormAssociatedElement*>& HTMLFormControlsCollection::formControlElements() const
{
- ASSERT(base());
- ASSERT(base()->hasTagName(formTag) || base()->hasTagName(fieldsetTag));
- if (base()->hasTagName(formTag))
- return static_cast<HTMLFormElement*>(base())->associatedElements();
- return static_cast<HTMLFieldSetElement*>(base())->associatedElements();
+ ASSERT(ownerNode());
+ ASSERT(ownerNode()->hasTagName(formTag) || ownerNode()->hasTagName(fieldsetTag));
+ if (ownerNode()->hasTagName(formTag))
+ return static_cast<HTMLFormElement*>(ownerNode())->associatedElements();
+ return static_cast<HTMLFieldSetElement*>(ownerNode())->associatedElements();
}
const Vector<HTMLImageElement*>& HTMLFormControlsCollection::formImageElements() const
{
- ASSERT(base());
- ASSERT(base()->hasTagName(formTag));
- return static_cast<HTMLFormElement*>(base())->imageElements();
+ ASSERT(ownerNode());
+ ASSERT(ownerNode()->hasTagName(formTag));
+ return static_cast<HTMLFormElement*>(ownerNode())->imageElements();
}
Element* HTMLFormControlsCollection::virtualItemAfter(unsigned& offset, Element* previousItem) const
@@ -111,7 +111,7 @@
// attribute. If a match is not found, the method then searches for an
// object with a matching name attribute, but only on those elements
// that are allowed a name attribute.
- const Vector<HTMLImageElement*>* imagesElements = base()->hasTagName(fieldsetTag) ? 0 : &formImageElements();
+ const Vector<HTMLImageElement*>* imagesElements = ownerNode()->hasTagName(fieldsetTag) ? 0 : &formImageElements();
if (HTMLElement* item = firstNamedItem(formControlElements(), imagesElements, idAttr, name))
return item;
@@ -144,7 +144,7 @@
}
}
- if (base()->hasTagName(formTag)) {
+ if (ownerNode()->hasTagName(formTag)) {
const Vector<HTMLImageElement*>& imageElementsArray = formImageElements();
for (unsigned i = 0; i < imageElementsArray.size(); ++i) {
HTMLImageElement* element = imageElementsArray[i];
Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.idl (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLFormControlsCollection.idl 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.idl 2012-12-06 17:52:50 UTC (rev 136850)
@@ -21,7 +21,7 @@
[
IndexedGetter,
NamedGetter,
- GenerateIsReachable=ImplBaseRoot,
+ GenerateIsReachable=ImplOwnerNodeRoot,
V8DependentLifetime,
] interface HTMLFormControlsCollection : HTMLCollection {
[Custom] Node namedItem(in [Optional=DefaultIsUndefined] DOMString name);
Modified: trunk/Source/WebCore/html/HTMLNameCollection.cpp (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLNameCollection.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLNameCollection.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -41,8 +41,8 @@
HTMLNameCollection::~HTMLNameCollection()
{
- ASSERT(base());
- ASSERT(base()->isDocumentNode());
+ ASSERT(ownerNode());
+ ASSERT(ownerNode()->isDocumentNode());
ASSERT(type() == WindowNamedItems || type() == DocumentNamedItems);
ownerNode()->nodeLists()->removeCacheWithAtomicName(this, type(), m_name);
@@ -51,15 +51,15 @@
Element* HTMLNameCollection::virtualItemAfter(unsigned& offsetInArray, Element* previous) const
{
ASSERT_UNUSED(offsetInArray, !offsetInArray);
- ASSERT(previous != base());
+ ASSERT(previous != ownerNode());
Node* current;
if (!previous)
- current = base()->firstChild();
+ current = ownerNode()->firstChild();
else
- current = previous->traverseNextNode(base());
+ current = previous->traverseNextNode(ownerNode());
- for (; current; current = current->traverseNextNode(base())) {
+ for (; current; current = current->traverseNextNode(ownerNode())) {
if (!current->isElementNode())
continue;
Element* e = static_cast<Element*>(current);
Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.cpp (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -58,7 +58,7 @@
}
ec = 0;
- HTMLSelectElement* select = toHTMLSelectElement(base());
+ HTMLSelectElement* select = toHTMLSelectElement(ownerNode());
if (index == -1 || unsigned(index) >= length())
select->add(newOption, 0, ec);
@@ -70,22 +70,22 @@
void HTMLOptionsCollection::remove(int index)
{
- toHTMLSelectElement(base())->remove(index);
+ toHTMLSelectElement(ownerNode())->remove(index);
}
int HTMLOptionsCollection::selectedIndex() const
{
- return toHTMLSelectElement(base())->selectedIndex();
+ return toHTMLSelectElement(ownerNode())->selectedIndex();
}
void HTMLOptionsCollection::setSelectedIndex(int index)
{
- toHTMLSelectElement(base())->setSelectedIndex(index);
+ toHTMLSelectElement(ownerNode())->setSelectedIndex(index);
}
void HTMLOptionsCollection::setLength(unsigned length, ExceptionCode& ec)
{
- toHTMLSelectElement(base())->setLength(length, ec);
+ toHTMLSelectElement(ownerNode())->setLength(length, ec);
}
} //namespace
Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.idl (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2012-12-06 17:52:50 UTC (rev 136850)
@@ -22,7 +22,7 @@
JSGenerateToNativeObject,
CustomIndexedSetter,
NamedGetter,
- GenerateIsReachable=ImplBaseRoot,
+ GenerateIsReachable=ImplOwnerNodeRoot,
V8DependentLifetime,
] interface HTMLOptionsCollection : HTMLCollection {
attribute long selectedIndex;
Modified: trunk/Source/WebCore/html/HTMLPropertiesCollection.cpp (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLPropertiesCollection.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLPropertiesCollection.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -66,7 +66,7 @@
m_itemRefElements.clear();
setItemRefElementsCacheValid();
- toHTMLElement(base())->getItemRefElements(m_itemRefElements);
+ toHTMLElement(ownerNode())->getItemRefElements(m_itemRefElements);
}
static Node* nextNodeWithProperty(Node* rootNode, Node* previous, Node* ownerNode)
@@ -137,7 +137,7 @@
PassRefPtr<PropertyNodeList> HTMLPropertiesCollection::namedItem(const String& name) const
{
- return base()->propertyNodeList(name);
+ return ownerNode()->propertyNodeList(name);
}
bool HTMLPropertiesCollection::hasNamedItem(const AtomicString& name) const
Modified: trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp (136849 => 136850)
--- trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp 2012-12-06 17:49:46 UTC (rev 136849)
+++ trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp 2012-12-06 17:52:50 UTC (rev 136850)
@@ -166,7 +166,7 @@
{
ASSERT_UNUSED(offsetInArray, !offsetInArray);
ASSERT(!previous || (previous->isHTMLElement() && toHTMLElement(previous)->hasLocalName(trTag)));
- return rowAfter(static_cast<HTMLTableElement*>(base()), static_cast<HTMLTableRowElement*>(previous));
+ return rowAfter(static_cast<HTMLTableElement*>(ownerNode()), static_cast<HTMLTableRowElement*>(previous));
}
}
