1 files changed, 29 insertions, 34 deletions

diff --git a/Source/WebCore/accessibility/AccessibilityImageMapLink.h b/Source/WebCore/accessibility/AccessibilityImageMapLink.h
index d28ff6bfb..d74e30cff 100644
--- a/Source/WebCore/accessibility/AccessibilityImageMapLink.h
+++ b/Source/WebCore/accessibility/AccessibilityImageMapLink.h
@@ -10,7 +10,7 @@
  * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -26,8 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AccessibilityImageMapLink_h
-#define AccessibilityImageMapLink_h
+#pragma once
 
 #include "AccessibilityMockObject.h"
 #include "HTMLAreaElement.h"
@@ -35,12 +34,9 @@
 
 namespace WebCore {
     
-class AccessibilityImageMapLink : public AccessibilityMockObject {
-        
-private:
-    AccessibilityImageMapLink();
+class AccessibilityImageMapLink final : public AccessibilityMockObject {
 public:
-    static PassRefPtr<AccessibilityImageMapLink> create();
+    static Ref<AccessibilityImageMapLink> create();
     virtual ~AccessibilityImageMapLink();
     
     void setHTMLAreaElement(HTMLAreaElement* element) { m_areaElement = element; }
@@ -49,40 +45,39 @@ public:
     void setHTMLMapElement(HTMLMapElement* element) { m_mapElement = element; }    
     HTMLMapElement* mapElement() const { return m_mapElement.get(); }
     
-    virtual Node* node() const override { return m_areaElement.get(); }
+    Node* node() const override { return m_areaElement.get(); }
         
-    virtual AccessibilityRole roleValue() const override;
-    virtual bool isEnabled() const override { return true; }
+    AccessibilityRole roleValue() const override;
+    bool isEnabled() const override { return true; }
     
-    virtual Element* anchorElement() const override;
-    virtual Element* actionElement() const override;
-    virtual URL url() const override;
-    virtual bool isLink() const override { return true; }
-    virtual bool isLinked() const override { return true; }
-    virtual String title() const override;
-    virtual String accessibilityDescription() const override;
-    virtual AccessibilityObject* parentObject() const override;
+    Element* anchorElement() const override;
+    Element* actionElement() const override;
+    URL url() const override;
+    bool isLink() const override { return true; }
+    bool isLinked() const override { return true; }
+    String title() const override;
+    String accessibilityDescription() const override;
+    AccessibilityObject* parentObject() const override;
     
-    virtual String stringValueForMSAA() const override;
-    virtual String nameForMSAA() const override;
+    String stringValueForMSAA() const override;
+    String nameForMSAA() const override;
 
-    virtual LayoutRect elementRect() const override;
-
-private:    
-    RefPtr<HTMLAreaElement> m_areaElement;
-    RefPtr<HTMLMapElement> m_mapElement;
+    LayoutRect elementRect() const override;
 
-    virtual void detachFromParent() override;
+private:
+    AccessibilityImageMapLink();
 
-    virtual Path elementPath() const override;
+    void detachFromParent() override;
+    Path elementPath() const override;
     RenderElement* imageMapLinkRenderer() const;
-    virtual void accessibilityText(Vector<AccessibilityText>&) override;
-    virtual bool isImageMapLink() const override { return true; }
-    virtual bool supportsPath() const override { return true; }
-};
+    void accessibilityText(Vector<AccessibilityText>&) override;
+    bool isImageMapLink() const override { return true; }
+    bool supportsPath() const override { return true; }
 
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityImageMapLink, isImageMapLink())
+    RefPtr<HTMLAreaElement> m_areaElement;
+    RefPtr<HTMLMapElement> m_mapElement;
+};
     
 } // namespace WebCore
 
-#endif // AccessibilityImageMapLink_h
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityImageMapLink, isImageMapLink())