Merge 121003

Source/WebCore/html/RadioNodeList.cpp

 /*
  * 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
@@ skipping 28 matching lines @@
 
 RadioNodeList::RadioNodeList(Node* rootNode, const AtomicString& name)
     : DynamicSubtreeNodeList(rootNode, rootNode->hasTagName(formTag) ? RootedAtDocument : RootedAtNode)
     , m_name(name)
 {
     document()->registerDynamicSubtreeNodeList(this);
 }
 
 RadioNodeList::~RadioNodeList()
 {
-    m_node->nodeLists()->removeCacheWithAtomicName(this, DynamicNodeList::RadioNodeListType, m_name);
+    ownerNode()->nodeLists()->removeCacheWithAtomicName(this, DynamicNodeList::RadioNodeListType, m_name);
     document()->unregisterDynamicSubtreeNodeList(this);
 }
 
 static inline HTMLInputElement* toRadioButtonInputElement(Node* node)
 {
     ASSERT(node->isElementNode());
     HTMLInputElement* inputElement = node->toInputElement();
     if (!inputElement || !inputElement->isRadioButton() || inputElement->value().isEmpty())
         return 0;
     return inputElement;
@@ skipping 19 matching lines @@
         if (!inputElement || inputElement->value() != value)
             continue;
         inputElement->setChecked(true);
         return;
     }
 }
 
 bool RadioNodeList::checkElementMatchesRadioNodeListFilter(Element* testElement) const
 {
     ASSERT(testElement->hasTagName(objectTag) || testElement->isFormControlElement());
-    if (m_node->hasTagName(formTag)) {
+    if (ownerNode()->hasTagName(formTag)) {
         HTMLFormElement* formElement = 0;
         if (testElement->hasTagName(objectTag))
             formElement = static_cast<HTMLObjectElement*>(testElement)->form();
         else
             formElement = static_cast<HTMLFormControlElement*>(testElement)->form();
-        if (!formElement || formElement != m_node)
+        if (!formElement || formElement != ownerNode())
             return false;
     }
 
     return testElement->getIdAttribute() == m_name || testElement->getNameAttribute() == m_name;
 }
 
 bool RadioNodeList::nodeMatches(Element* testElement) const
 {
     if (!testElement->hasTagName(objectTag) && !testElement->isFormControlElement())
         return false;
 
     if (HTMLInputElement* inputElement = testElement->toInputElement()) {
         if (inputElement->isImageButton())
             return false;
     }
 
     return checkElementMatchesRadioNodeListFilter(testElement);
 }
 
 } // namspace