Diff
Modified: trunk/Source/WebCore/ChangeLog (175277 => 175278)
--- trunk/Source/WebCore/ChangeLog 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/ChangeLog 2014-10-28 22:42:37 UTC (rev 175278)
@@ -1,3 +1,47 @@
+2014-10-28 Chris Dumez <[email protected]>
+
+ Clean up virtual functions in accessibility/
+ https://bugs.webkit.org/show_bug.cgi?id=138148
+
+ Reviewed by Chris Fleizach.
+
+ Clean up virtual functions in accessibility/ by:
+ - Marking classes as final when suitable
+ - Marking virtual functions as final when suitable
+ - Dropping final on virtual functions in classes that are already final
+ - Make isXXX() virtual type checking functions in XXX classes to avoid
+ useless type checks
+
+ No new tests, no behavior change.
+
+ * accessibility/AccessibilityARIAGrid.h:
+ * accessibility/AccessibilityARIAGridCell.h:
+ * accessibility/AccessibilityARIAGridRow.h:
+ * accessibility/AccessibilityImageMapLink.h:
+ * accessibility/AccessibilityList.h:
+ * accessibility/AccessibilityListBox.h:
+ * accessibility/AccessibilityListBoxOption.h:
+ * accessibility/AccessibilityMediaControls.h:
+ * accessibility/AccessibilityMenuList.h:
+ * accessibility/AccessibilityMenuListOption.h:
+ * accessibility/AccessibilityMenuListPopup.h:
+ * accessibility/AccessibilityMockObject.h:
+ (WebCore::AccessibilityMockObject::setParent):
+ * accessibility/AccessibilityNodeObject.h:
+ * accessibility/AccessibilityProgressIndicator.h:
+ * accessibility/AccessibilityRenderObject.h:
+ * accessibility/AccessibilitySVGRoot.h:
+ * accessibility/AccessibilityScrollView.h:
+ * accessibility/AccessibilityScrollbar.h:
+ * accessibility/AccessibilitySearchFieldButtons.h:
+ * accessibility/AccessibilitySlider.h:
+ * accessibility/AccessibilitySpinButton.h:
+ * accessibility/AccessibilityTable.h:
+ * accessibility/AccessibilityTableCell.h:
+ * accessibility/AccessibilityTableColumn.h:
+ * accessibility/AccessibilityTableHeaderContainer.h:
+ * accessibility/AccessibilityTableRow.h:
+
2014-10-24 Jeffrey Pfau <[email protected]>
FrameProgressTracker expects Page to not have detached
Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -37,23 +37,21 @@
class AccessibilityTableCell;
class AccessibilityTableHeaderContainer;
-class AccessibilityARIAGrid : public AccessibilityTable {
-
-private:
- explicit AccessibilityARIAGrid(RenderObject*);
+class AccessibilityARIAGrid final : public AccessibilityTable {
public:
static PassRefPtr<AccessibilityARIAGrid> create(RenderObject*);
virtual ~AccessibilityARIAGrid();
-
- virtual bool isAriaTable() const override { return true; }
virtual void addChildren() override;
private:
+ explicit AccessibilityARIAGrid(RenderObject*);
+
// ARIA treegrids and grids support selected rows.
virtual bool supportsSelectedRows() override { return true; }
virtual bool isMultiSelectable() const override { return true; }
virtual bool computeIsTableExposableThroughAccessibility() const override { return true; }
+ virtual bool isAriaTable() const override { return true; }
void addRowDescendant(AccessibilityObject*, HashSet<AccessibilityObject*>& appendedRows, unsigned& columnCount);
bool addTableCellChild(AccessibilityObject*, HashSet<AccessibilityObject*>& appendedRows, unsigned& columnCount);
Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -33,10 +33,7 @@
namespace WebCore {
-class AccessibilityARIAGridCell : public AccessibilityTableCell {
-
-private:
- explicit AccessibilityARIAGridCell(RenderObject*);
+class AccessibilityARIAGridCell final : public AccessibilityTableCell {
public:
static PassRefPtr<AccessibilityARIAGridCell> create(RenderObject*);
virtual ~AccessibilityARIAGridCell();
@@ -46,7 +43,9 @@
// fills in the start location and column span of cell
virtual void columnIndexRange(std::pair<unsigned, unsigned>& columnRange) const override;
-protected:
+private:
+ explicit AccessibilityARIAGridCell(RenderObject*);
+
virtual AccessibilityTable* parentTable() const override;
};
Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -35,10 +35,7 @@
class AccessibilityTable;
-class AccessibilityARIAGridRow : public AccessibilityTableRow {
-
-private:
- explicit AccessibilityARIAGridRow(RenderObject*);
+class AccessibilityARIAGridRow final : public AccessibilityTableRow {
public:
static PassRefPtr<AccessibilityARIAGridRow> create(RenderObject*);
virtual ~AccessibilityARIAGridRow();
@@ -49,6 +46,8 @@
virtual AccessibilityObject* headerObject() override;
private:
+ explicit AccessibilityARIAGridRow(RenderObject*);
+
virtual bool isARIATreeGridRow() const override;
virtual AccessibilityTable* parentTable() const override;
};
Modified: trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -35,10 +35,7 @@
namespace WebCore {
-class AccessibilityImageMapLink : public AccessibilityMockObject {
-
-private:
- AccessibilityImageMapLink();
+class AccessibilityImageMapLink final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilityImageMapLink> create();
virtual ~AccessibilityImageMapLink();
@@ -68,17 +65,18 @@
virtual LayoutRect elementRect() const override;
-private:
- RefPtr<HTMLAreaElement> m_areaElement;
- RefPtr<HTMLMapElement> m_mapElement;
+private:
+ AccessibilityImageMapLink();
virtual void detachFromParent() override;
-
virtual 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; }
+
+ RefPtr<HTMLAreaElement> m_areaElement;
+ RefPtr<HTMLMapElement> m_mapElement;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityList.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityList.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityList.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -33,21 +33,20 @@
namespace WebCore {
-class AccessibilityList : public AccessibilityRenderObject {
-
-private:
- explicit AccessibilityList(RenderObject*);
+class AccessibilityList final : public AccessibilityRenderObject {
public:
static PassRefPtr<AccessibilityList> create(RenderObject*);
virtual ~AccessibilityList();
- virtual bool isList() const override { return true; }
bool isUnorderedList() const;
bool isOrderedList() const;
bool isDescriptionList() const;
- virtual AccessibilityRole roleValue() const override final;
+ virtual AccessibilityRole roleValue() const override;
+
private:
+ explicit AccessibilityList(RenderObject*);
+ virtual bool isList() const override { return true; }
virtual bool computeAccessibilityIsIgnored() const override;
virtual AccessibilityRole determineAccessibilityRole() override;
};
Modified: trunk/Source/WebCore/accessibility/AccessibilityListBox.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityListBox.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityListBox.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -33,16 +33,11 @@
namespace WebCore {
-class AccessibilityListBox : public AccessibilityRenderObject {
-
-private:
- explicit AccessibilityListBox(RenderObject*);
+class AccessibilityListBox final : public AccessibilityRenderObject {
public:
static PassRefPtr<AccessibilityListBox> create(RenderObject*);
virtual ~AccessibilityListBox();
- virtual bool isListBox() const override { return true; }
-
virtual bool canSetSelectedChildrenAttribute() const override;
void setSelectedChildren(const AccessibilityChildrenVector&);
virtual AccessibilityRole roleValue() const override { return ListBoxRole; }
@@ -52,7 +47,10 @@
virtual void addChildren() override;
-private:
+private:
+ explicit AccessibilityListBox(RenderObject*);
+
+ virtual bool isListBox() const override { return true; }
AccessibilityObject* listBoxOptionAccessibilityObject(HTMLElement*) const;
virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const override;
};
Modified: trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -40,10 +40,7 @@
class HTMLElement;
class HTMLSelectElement;
-class AccessibilityListBoxOption : public AccessibilityObject {
-
-private:
- AccessibilityListBoxOption();
+class AccessibilityListBoxOption final : public AccessibilityObject {
public:
static PassRefPtr<AccessibilityListBoxOption> create();
virtual ~AccessibilityListBoxOption();
@@ -62,17 +59,19 @@
virtual LayoutRect elementRect() const override;
virtual AccessibilityObject* parentObject() const override;
- virtual bool isListBoxOption() const override final { return true; }
private:
- HTMLElement* m_optionElement;
-
+ AccessibilityListBoxOption();
+
+ virtual bool isListBoxOption() const override { return true; }
virtual bool canHaveChildren() const override { return false; }
HTMLSelectElement* listBoxOptionParentNode() const;
int listBoxOptionIndex() const;
IntRect listBoxOptionRect() const;
AccessibilityObject* listBoxOptionAccessibilityObject(HTMLElement*) const;
virtual bool computeAccessibilityIsIgnored() const override;
+
+ HTMLElement* m_optionElement;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityMediaControls.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityMediaControls.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityMediaControls.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -60,24 +60,24 @@
};
-class AccessibilityMediaTimeline : public AccessibilitySlider {
+class AccessibilityMediaTimeline final : public AccessibilitySlider {
public:
static PassRefPtr<AccessibilityObject> create(RenderObject*);
virtual ~AccessibilityMediaTimeline() { }
- virtual bool isMediaTimeline() const override { return true; }
-
virtual String helpText() const override;
virtual String valueDescription() const override;
const AtomicString& getAttribute(const QualifiedName& attribute) const;
private:
explicit AccessibilityMediaTimeline(RenderObject*);
+
+ virtual bool isMediaTimeline() const override { return true; }
};
-class AccessibilityMediaControlsContainer : public AccessibilityMediaControl {
+class AccessibilityMediaControlsContainer final : public AccessibilityMediaControl {
public:
static PassRefPtr<AccessibilityObject> create(RenderObject*);
@@ -96,7 +96,7 @@
};
-class AccessibilityMediaTimeDisplay : public AccessibilityMediaControl {
+class AccessibilityMediaTimeDisplay final : public AccessibilityMediaControl {
public:
static PassRefPtr<AccessibilityObject> create(RenderObject*);
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuList.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuList.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuList.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -35,7 +35,7 @@
class HTMLOptionElement;
class RenderMenuList;
-class AccessibilityMenuList : public AccessibilityRenderObject {
+class AccessibilityMenuList final : public AccessibilityRenderObject {
public:
static PassRefPtr<AccessibilityMenuList> create(RenderMenuList* renderer);
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -33,7 +33,7 @@
class AccessibilityMenuListPopup;
class HTMLElement;
-class AccessibilityMenuListOption : public AccessibilityMockObject {
+class AccessibilityMenuListOption final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilityMenuListOption> create() { return adoptRef(new AccessibilityMenuListOption); }
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -35,7 +35,7 @@
class HTMLElement;
class HTMLSelectElement;
-class AccessibilityMenuListPopup : public AccessibilityMockObject {
+class AccessibilityMenuListPopup final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilityMenuListPopup> create() { return adoptRef(new AccessibilityMenuListPopup); }
@@ -44,7 +44,6 @@
void didUpdateActiveOption(int optionIndex);
-
private:
AccessibilityMenuListPopup();
Modified: trunk/Source/WebCore/accessibility/AccessibilityMockObject.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityMockObject.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityMockObject.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -38,7 +38,7 @@
virtual ~AccessibilityMockObject();
virtual AccessibilityObject* parentObject() const override { return m_parent; }
- virtual void setParent(AccessibilityObject* parent) { m_parent = parent; };
+ virtual void setParent(AccessibilityObject* parent) { m_parent = parent; }
virtual bool isEnabled() const override { return true; }
protected:
@@ -48,7 +48,7 @@
virtual void detachFromParent() override { m_parent = nullptr; }
private:
- virtual bool isMockObject() const override { return true; }
+ virtual bool isMockObject() const override final { return true; }
virtual bool computeAccessibilityIsIgnored() const override;
};
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -61,15 +61,11 @@
};
class AccessibilityNodeObject : public AccessibilityObject {
-protected:
- explicit AccessibilityNodeObject(Node*);
public:
static PassRefPtr<AccessibilityNodeObject> create(Node*);
virtual ~AccessibilityNodeObject();
virtual void init() override;
-
- virtual bool isAccessibilityNodeObject() const override { return true; }
virtual bool canvasHasFallbackContent() const override;
@@ -158,6 +154,8 @@
virtual LayoutRect elementRect() const override;
protected:
+ explicit AccessibilityNodeObject(Node*);
+
AccessibilityRole m_ariaRole;
bool m_childrenDirty;
mutable AccessibilityRole m_roleForMSAA;
@@ -193,8 +191,7 @@
AccessibilityObject* menuButtonForMenu() const;
private:
- Node* m_node;
-
+ virtual bool isAccessibilityNodeObject() const override final { return true; }
virtual void accessibilityText(Vector<AccessibilityText>&) override;
virtual void titleElementText(Vector<AccessibilityText>&) const;
void alternativeText(Vector<AccessibilityText>&) const;
@@ -204,6 +201,8 @@
void ariaLabeledByText(Vector<AccessibilityText>&) const;
virtual bool computeAccessibilityIsIgnored() const override;
bool usesAltTagForTextComputation() const;
+
+ Node* m_node;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -33,7 +33,7 @@
class HTMLProgressElement;
class RenderProgress;
-class AccessibilityProgressIndicator : public AccessibilityRenderObject {
+class AccessibilityProgressIndicator final : public AccessibilityRenderObject {
public:
static PassRefPtr<AccessibilityProgressIndicator> create(RenderProgress*);
#if ENABLE(METER_ELEMENT)
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -57,13 +57,9 @@
class Widget;
class AccessibilityRenderObject : public AccessibilityNodeObject {
-protected:
- explicit AccessibilityRenderObject(RenderObject*);
public:
static PassRefPtr<AccessibilityRenderObject> create(RenderObject*);
virtual ~AccessibilityRenderObject();
-
- virtual bool isAccessibilityRenderObject() const override { return true; }
virtual void init() override;
@@ -214,8 +210,7 @@
virtual String passwordFieldValue() const override;
protected:
- RenderObject* m_renderer;
-
+ explicit AccessibilityRenderObject(RenderObject*);
void setRenderObject(RenderObject* renderer) { m_renderer = renderer; }
void ariaElementsFromAttribute(AccessibilityChildrenVector&, const QualifiedName&) const;
bool needsToUpdateChildren() const { return m_childrenDirty; }
@@ -227,7 +222,10 @@
virtual AccessibilityRole determineAccessibilityRole() override;
virtual bool computeAccessibilityIsIgnored() const override;
+ RenderObject* m_renderer;
+
private:
+ virtual bool isAccessibilityRenderObject() const override final { return true; }
void ariaListboxSelectedChildren(AccessibilityChildrenVector&);
void ariaListboxVisibleChildren(AccessibilityChildrenVector&);
bool isAllowedChildOfTree() const;
Modified: trunk/Source/WebCore/accessibility/AccessibilitySVGRoot.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilitySVGRoot.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilitySVGRoot.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -33,21 +33,20 @@
namespace WebCore {
-class AccessibilitySVGRoot : public AccessibilityRenderObject {
-
-protected:
- explicit AccessibilitySVGRoot(RenderObject*);
+class AccessibilitySVGRoot final : public AccessibilityRenderObject {
public:
static PassRefPtr<AccessibilitySVGRoot> create(RenderObject*);
virtual ~AccessibilitySVGRoot();
void setParent(AccessibilityObject* parent) { m_parent = parent; }
-
+
private:
- AccessibilityObject* m_parent;
+ explicit AccessibilitySVGRoot(RenderObject*);
virtual AccessibilityObject* parentObject() const override;
virtual bool isAccessibilitySVGRoot() const override { return true; }
+
+ AccessibilityObject* m_parent;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -34,7 +34,7 @@
class Scrollbar;
class ScrollView;
-class AccessibilityScrollView : public AccessibilityObject {
+class AccessibilityScrollView final : public AccessibilityObject {
public:
static PassRefPtr<AccessibilityScrollView> create(ScrollView*);
virtual AccessibilityRole roleValue() const override { return ScrollAreaRole; }
@@ -43,13 +43,11 @@
virtual ~AccessibilityScrollView();
virtual void detach(AccessibilityDetachmentType, AXObjectCache*) override;
-protected:
- virtual ScrollableArea* getScrollableAreaIfScrollable() const override;
- virtual void scrollTo(const IntPoint&) const override;
-
private:
explicit AccessibilityScrollView(ScrollView*);
+ virtual ScrollableArea* getScrollableAreaIfScrollable() const override;
+ virtual void scrollTo(const IntPoint&) const override;
virtual bool computeAccessibilityIsIgnored() const override;
virtual bool isAccessibilityScrollView() const override { return true; }
virtual bool isEnabled() const override { return true; }
Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollbar.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityScrollbar.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollbar.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -35,7 +35,7 @@
class Scrollbar;
-class AccessibilityScrollbar : public AccessibilityMockObject {
+class AccessibilityScrollbar final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilityScrollbar> create(Scrollbar*);
Modified: trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -39,11 +39,10 @@
virtual bool press() override;
virtual AccessibilityRole roleValue() const override { return ButtonRole; }
-protected:
- virtual bool computeAccessibilityIsIgnored() const override;
-
private:
explicit AccessibilitySearchFieldCancelButton(RenderObject*);
+
+ virtual bool computeAccessibilityIsIgnored() const override;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilitySlider.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilitySlider.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilitySlider.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -37,7 +37,6 @@
class HTMLInputElement;
class AccessibilitySlider : public AccessibilityRenderObject {
-
public:
static PassRefPtr<AccessibilitySlider> create(RenderObject*);
virtual ~AccessibilitySlider() { }
@@ -50,7 +49,7 @@
virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const override;
virtual AccessibilityRole roleValue() const override { return SliderRole; }
- virtual bool isSlider() const override { return true; }
+ virtual bool isSlider() const override final { return true; }
virtual bool isInputSlider() const override { return true; }
virtual bool isControl() const override { return true; }
@@ -66,21 +65,18 @@
virtual AccessibilityOrientation orientation() const override;
};
-class AccessibilitySliderThumb : public AccessibilityMockObject {
-
+class AccessibilitySliderThumb final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilitySliderThumb> create();
virtual ~AccessibilitySliderThumb() { }
- virtual bool isSliderThumb() const override final { return true; }
-
virtual AccessibilityRole roleValue() const override { return SliderThumbRole; }
-
virtual LayoutRect elementRect() const override;
private:
AccessibilitySliderThumb();
+ virtual bool isSliderThumb() const override { return true; }
virtual bool computeAccessibilityIsIgnored() const override;
};
Modified: trunk/Source/WebCore/accessibility/AccessibilitySpinButton.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilitySpinButton.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilitySpinButton.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -32,7 +32,7 @@
namespace WebCore {
-class AccessibilitySpinButton : public AccessibilityMockObject {
+class AccessibilitySpinButton final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilitySpinButton> create();
virtual ~AccessibilitySpinButton();
@@ -56,7 +56,7 @@
SpinButtonElement* m_spinButtonElement;
};
-class AccessibilitySpinButtonPart : public AccessibilityMockObject {
+class AccessibilitySpinButtonPart final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilitySpinButtonPart> create();
virtual ~AccessibilitySpinButtonPart() { }
@@ -66,12 +66,13 @@
private:
AccessibilitySpinButtonPart();
- bool m_isIncrementor : 1;
virtual bool press() override;
virtual AccessibilityRole roleValue() const override { return ButtonRole; }
virtual bool isSpinButtonPart() const override { return true; }
virtual LayoutRect elementRect() const override;
+
+ unsigned m_isIncrementor : 1;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityTable.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityTable.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -39,20 +39,17 @@
class RenderTableSection;
class AccessibilityTable : public AccessibilityRenderObject {
-
-protected:
- explicit AccessibilityTable(RenderObject*);
public:
static PassRefPtr<AccessibilityTable> create(RenderObject*);
virtual ~AccessibilityTable();
- virtual void init() override;
+ virtual void init() override final;
- virtual AccessibilityRole roleValue() const override;
+ virtual AccessibilityRole roleValue() const override final;
virtual bool isAriaTable() const { return false; }
virtual void addChildren() override;
- virtual void clearChildren() override;
+ virtual void clearChildren() override final;
const AccessibilityChildrenVector& columns();
const AccessibilityChildrenVector& rows();
@@ -62,7 +59,7 @@
unsigned rowCount();
virtual int tableLevel() const override final;
- virtual String title() const override;
+ virtual String title() const override final;
// all the cells in the table
void cells(AccessibilityChildrenVector&);
@@ -79,6 +76,8 @@
bool isExposableThroughAccessibility() const;
protected:
+ explicit AccessibilityTable(RenderObject*);
+
AccessibilityChildrenVector m_rows;
AccessibilityChildrenVector m_columns;
@@ -88,15 +87,15 @@
bool hasARIARole() const;
// isTable is whether it's an AccessibilityTable object.
- virtual bool isTable() const override { return true; }
+ virtual bool isTable() const override final { return true; }
// isDataTable is whether it is exposed as an AccessibilityTable because the heuristic
// think this "looks" like a data-based table (instead of a table used for layout).
- virtual bool isDataTable() const override;
- virtual bool computeAccessibilityIsIgnored() const override;
+ virtual bool isDataTable() const override final;
+ virtual bool computeAccessibilityIsIgnored() const override final;
private:
virtual bool computeIsTableExposableThroughAccessibility() const;
- virtual void titleElementText(Vector<AccessibilityText>&) const override;
+ virtual void titleElementText(Vector<AccessibilityText>&) const override final;
HTMLTableElement* tableElement() const;
void addChildrenFromSection(RenderTableSection*, unsigned& maxColumnCount);
};
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -36,14 +36,11 @@
class AccessibilityTable;
class AccessibilityTableCell : public AccessibilityRenderObject {
-
-protected:
- explicit AccessibilityTableCell(RenderObject*);
public:
static PassRefPtr<AccessibilityTableCell> create(RenderObject*);
virtual ~AccessibilityTableCell();
- virtual bool isTableCell() const override;
+ virtual bool isTableCell() const override final;
bool isTableHeaderCell() const;
bool isColumnHeaderCell() const;
bool isRowHeaderCell() const;
@@ -57,17 +54,20 @@
void rowHeaders(AccessibilityChildrenVector&);
protected:
+ explicit AccessibilityTableCell(RenderObject*);
+
virtual AccessibilityTable* parentTable() const;
+ virtual AccessibilityRole determineAccessibilityRole() override final;
+
int m_rowIndex;
- virtual AccessibilityRole determineAccessibilityRole() override;
private:
// If a table cell is not exposed as a table cell, a TH element can serve as its title UI element.
- virtual AccessibilityObject* titleUIElement() const override;
- virtual bool exposesTitleUIElement() const override { return true; }
- virtual bool computeAccessibilityIsIgnored() const override;
- virtual String expandedTextValue() const;
- virtual bool supportsExpandedTextValue() const;
+ virtual AccessibilityObject* titleUIElement() const override final;
+ virtual bool exposesTitleUIElement() const override final { return true; }
+ virtual bool computeAccessibilityIsIgnored() const override final;
+ virtual String expandedTextValue() const override final;
+ virtual bool supportsExpandedTextValue() const override final;
bool isTableCellInSameRowGroup(AccessibilityTableCell*);
bool isTableCellInSameColGroup(AccessibilityTableCell*);
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -37,10 +37,7 @@
class RenderTableSection;
-class AccessibilityTableColumn : public AccessibilityMockObject {
-
-private:
- AccessibilityTableColumn();
+class AccessibilityTableColumn final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilityTableColumn> create();
virtual ~AccessibilityTableColumn();
@@ -48,7 +45,6 @@
AccessibilityObject* headerObject();
virtual AccessibilityRole roleValue() const override { return ColumnRole; }
- virtual bool isTableColumn() const override { return true; }
void setColumnIndex(int columnIndex) { m_columnIndex = columnIndex; }
int columnIndex() const { return m_columnIndex; }
@@ -58,12 +54,15 @@
virtual LayoutRect elementRect() const override;
-private:
- unsigned m_columnIndex;
- LayoutRect m_columnRect;
+private:
+ AccessibilityTableColumn();
AccessibilityObject* headerObjectForSection(RenderTableSection*, bool thTagRequired);
virtual bool computeAccessibilityIsIgnored() const override;
+ virtual bool isTableColumn() const override { return true; }
+
+ unsigned m_columnIndex;
+ LayoutRect m_columnRect;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -35,10 +35,7 @@
namespace WebCore {
-class AccessibilityTableHeaderContainer : public AccessibilityMockObject {
-
-private:
- AccessibilityTableHeaderContainer();
+class AccessibilityTableHeaderContainer final : public AccessibilityMockObject {
public:
static PassRefPtr<AccessibilityTableHeaderContainer> create();
virtual ~AccessibilityTableHeaderContainer();
@@ -50,9 +47,11 @@
virtual LayoutRect elementRect() const override;
private:
- LayoutRect m_headerRect;
+ AccessibilityTableHeaderContainer();
virtual bool computeAccessibilityIsIgnored() const override;
+
+ LayoutRect m_headerRect;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableRow.h (175277 => 175278)
--- trunk/Source/WebCore/accessibility/AccessibilityTableRow.h 2014-10-28 22:38:44 UTC (rev 175277)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableRow.h 2014-10-28 22:42:37 UTC (rev 175278)
@@ -36,14 +36,9 @@
class AccessibilityTable;
class AccessibilityTableRow : public AccessibilityRenderObject {
-
-protected:
- explicit AccessibilityTableRow(RenderObject*);
public:
static PassRefPtr<AccessibilityTableRow> create(RenderObject*);
virtual ~AccessibilityTableRow();
-
- virtual bool isTableRow() const override;
// retrieves the "row" header (a th tag in the rightmost column)
virtual AccessibilityObject* headerObject();
@@ -57,13 +52,16 @@
void appendChild(AccessibilityObject*);
protected:
- virtual AccessibilityRole determineAccessibilityRole() override;
+ explicit AccessibilityTableRow(RenderObject*);
+ virtual AccessibilityRole determineAccessibilityRole() override final;
+
private:
+ virtual bool isTableRow() const override final;
+ virtual AccessibilityObject* observableObject() const override final;
+ virtual bool computeAccessibilityIsIgnored() const override final;
+
int m_rowIndex;
-
- virtual AccessibilityObject* observableObject() const override;
- virtual bool computeAccessibilityIsIgnored() const override;
};
} // namespace WebCore
