Fixing mapping conflicts for required html attribute and aria-required

Source/modules/accessibility/AXNodeObject.cpp

 /*
 * Copyright (C) 2012, Google 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
@@ skipping 781 matching lines @@
         HTMLInputElement& input = toHTMLInputElement(*node);
         if (input.isTextField())
             return input.isReadOnly();
     }
 
     return !node->hasEditableStyle();
 }
 
 bool AXNodeObject::isRequired() const
 {
-    if (equalIgnoringCase(getAttribute(aria_requiredAttr), "true"))
-        return true;
-
     Node* n = this->node();
     if (n && (n->isElementNode() && toElement(n)->isFormControlElement()))
         return toHTMLFormControlElement(n)->isRequired();
 
+    if (equalIgnoringCase(getAttribute(aria_requiredAttr), "true"))
+        return true;
+
     return false;
 }
 
 bool AXNodeObject::canSetFocusAttribute() const
 {
     Node* node = this->node();
     if (!node)
         return false;
 
     if (isWebArea())
@@ skipping 1036 matching lines @@
     float range = maxValueForRange() - minValueForRange();
     float value = valueForRange();
 
     value += range * (percentChange / 100);
     setValue(String::number(value));
 
     axObjectCache()->postNotification(node(), AXObjectCacheImpl::AXValueChanged, true);
 }
 
 } // namespace blink