webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 15 insertions, 20 deletions

diff --git a/Source/WebCore/accessibility/AccessibilityTableColumn.h b/Source/WebCore/accessibility/AccessibilityTableColumn.h
index 65ed020a2..6b27f907c 100644
--- a/Source/WebCore/accessibility/AccessibilityTableColumn.h
+++ b/Source/WebCore/accessibility/AccessibilityTableColumn.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 AccessibilityTableColumn_h
-#define AccessibilityTableColumn_h
+#pragma once
 
 #include "AccessibilityMockObject.h"
 #include "AccessibilityTable.h"
@@ -37,37 +36,33 @@ namespace WebCore {
     
 class RenderTableSection;
 
-class AccessibilityTableColumn : public AccessibilityMockObject {
-    
-private:
-    AccessibilityTableColumn();
+class AccessibilityTableColumn final : public AccessibilityMockObject {
 public:
-    static PassRefPtr<AccessibilityTableColumn> create();
+    static Ref<AccessibilityTableColumn> create();
     virtual ~AccessibilityTableColumn();
     
     AccessibilityObject* headerObject();
         
-    virtual AccessibilityRole roleValue() const override { return ColumnRole; }
-    virtual bool isTableColumn() const override { return true; }
+    AccessibilityRole roleValue() const override { return ColumnRole; }
     
     void setColumnIndex(int columnIndex) { m_columnIndex = columnIndex; }
     int columnIndex() const { return m_columnIndex; }    
     
-    virtual void addChildren() override;
-    virtual void setParent(AccessibilityObject*) override;
+    void addChildren() override;
+    void setParent(AccessibilityObject*) override;
     
-    virtual LayoutRect elementRect() const override;
+    LayoutRect elementRect() const override;
     
-private:    
-    unsigned m_columnIndex;
-    LayoutRect m_columnRect;
+private:
+    AccessibilityTableColumn();
     
     AccessibilityObject* headerObjectForSection(RenderTableSection*, bool thTagRequired);
-    virtual bool computeAccessibilityIsIgnored() const override;
-};
+    bool computeAccessibilityIsIgnored() const override;
+    bool isTableColumn() const override { return true; }
 
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityTableColumn, isTableColumn())
+    unsigned m_columnIndex;
+};
 
 } // namespace WebCore 
 
-#endif // AccessibilityTableColumn_h
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityTableColumn, isTableColumn())