Chromium Code Reviews| Index: Source/modules/accessibility/AXObject.h |
| diff --git a/Source/modules/accessibility/AXObject.h b/Source/modules/accessibility/AXObject.h |
| index d3182fd4f02bdb7b9aee7bfb125e619efc32f8d8..8f86a7f1733f26321c6f663cb3e5830045bd8e67 100644 |
| --- a/Source/modules/accessibility/AXObject.h |
| +++ b/Source/modules/accessibility/AXObject.h |
| @@ -213,21 +213,36 @@ enum AccessibilityState { |
| AXVisitedState |
| }; |
| -struct AccessibilityText { |
| - String text; |
| - AccessibilityTextSource textSource; |
| - RefPtr<AXObject> textElement; |
| - |
| - AccessibilityText(const String& t, const AccessibilityTextSource& s) |
| - : text(t) |
| - , textSource(s) |
| - { } |
| +class AccessibilityText final : public NoBaseWillBeGarbageCollectedFinalized<AccessibilityText> { |
| +public: |
| + static PassOwnPtrWillBeRawPtr<AccessibilityText> create(const String& text, const AccessibilityTextSource& source) |
| + { |
| + return adoptPtrWillBeNoop(new AccessibilityText(text, source, nullptr)); |
| + } |
| + static PassOwnPtrWillBeRawPtr<AccessibilityText> create(const String& t, const AccessibilityTextSource& s, const RefPtrWillBeRawPtr<AXObject> element) |
|
haraken
2015/06/11 11:10:55
t => text
s => textSource
keishi
2015/06/22 16:52:07
Done.
|
| + { |
| + return adoptPtrWillBeNoop(new AccessibilityText(t, s, nullptr)); |
| + } |
| + |
| + String text() const { return m_text; } |
| + AccessibilityTextSource textSource() const { return m_textSource; } |
| + AXObject* textElement() const { return m_textElement.get(); } |
| + |
| + DEFINE_INLINE_TRACE() |
| + { |
| + visitor->trace(m_textElement); |
| + } |
| - AccessibilityText(const String& t, const AccessibilityTextSource& s, const RefPtr<AXObject> element) |
| - : text(t) |
| - , textSource(s) |
| - , textElement(element) |
| +private: |
| + AccessibilityText(const String& t, const AccessibilityTextSource& s, const PassRefPtrWillBeRawPtr<AXObject> element) |
| + : m_text(t) |
| + , m_textSource(s) |
|
haraken
2015/06/11 11:10:55
Ditto.
keishi
2015/06/22 16:52:07
Done.
|
| + , m_textElement(element) |
| { } |
| + |
| + String m_text; |
| + AccessibilityTextSource m_textSource; |
| + RefPtr<AXObject> m_textElement; |
| }; |
| enum AccessibilityOrientation { |