Merge 72969

WebCore/accessibility/AccessibilityImageMapLink.cpp

 /*
  * Copyright (C) 2008 Apple 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 41 matching lines @@
 PassRefPtr<AccessibilityImageMapLink> AccessibilityImageMapLink::create()
 {
     return adoptRef(new AccessibilityImageMapLink());
 }
 
 AccessibilityObject* AccessibilityImageMapLink::parentObject() const
 {
     if (m_parent)
         return m_parent;
     
-    if (!m_mapElement || !m_mapElement->renderer())
+    if (!m_mapElement.get() || !m_mapElement->renderer())
         return 0;
     
     return m_mapElement->document()->axObjectCache()->getOrCreate(m_mapElement->renderer());
 }
     
 AccessibilityRole AccessibilityImageMapLink::roleValue() const
 {
     if (!m_areaElement)
         return WebCoreLinkRole;
     
     const AtomicString& ariaRole = getAttribute(roleAttr);
     if (!ariaRole.isEmpty())
         return AccessibilityObject::ariaRoleToWebCoreRole(ariaRole);
 
     return WebCoreLinkRole;
 }
     
 Element* AccessibilityImageMapLink::actionElement() const
 {
     return anchorElement();
 }
     
 Element* AccessibilityImageMapLink::anchorElement() const
 {
-    return m_areaElement;
+    return m_areaElement.get();
 }
 
 KURL AccessibilityImageMapLink::url() const
 {
-    if (!m_areaElement)
+    if (!m_areaElement.get())
         return KURL();
     
     return m_areaElement->href();
 }
     
 String AccessibilityImageMapLink::accessibilityDescription() const
 {
     const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
     if (!ariaLabel.isEmpty())
         return ariaLabel;
@@ skipping 11 matching lines @@
         return title;
     const AtomicString& summary = getAttribute(summaryAttr);
     if (!summary.isEmpty())
         return summary;
 
     return String();
 }
     
 IntRect AccessibilityImageMapLink::elementRect() const
 {
-    if (!m_mapElement || !m_areaElement)
+    if (!m_mapElement.get() || !m_areaElement.get())
         return IntRect();
 
     RenderObject* renderer;
     if (m_parent && m_parent->isAccessibilityRenderObject())
         renderer = static_cast<AccessibilityRenderObject*>(m_parent)->renderer();
     else
         renderer = m_mapElement->renderer();
     
     if (!renderer)
         return IntRect();
@@ skipping 10 matching lines @@
 {
     return url();
 }
 
 String AccessibilityImageMapLink::nameForMSAA() const
 {
     return accessibilityDescription();
 }
 
 } // namespace WebCore