Oilpan: Prepare moving AccessibilityText to the heap

Source/modules/accessibility/AXObject.h

 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * 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.
@@ skipping 195 matching lines @@
     AXPressedState,
     AXProtectedState,
     AXReadonlyState,
     AXRequiredState,
     AXSelectableState,
     AXSelectedState,
     AXVerticalState,
     AXVisitedState
 };
 
-struct AccessibilityText {
-    String text;
-    AccessibilityTextSource textSource;
-    RefPtr<AXObject> textElement;
+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));
+    }
 
-    AccessibilityText(const String& t, const AccessibilityTextSource& s)
-    : text(t)
-    , textSource(s)
+    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);
+    }
+
+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)
     { }
 
-    AccessibilityText(const String& t, const AccessibilityTextSource& s, const RefPtr<AXObject> element)
-    : text(t)
-    , textSource(s)
-    , textElement(element)
-    { }
+    String m_text;
+    AccessibilityTextSource m_textSource;
+    RefPtr<AXObject> m_textElement;
 };
 
 enum AccessibilityOrientation {
     AccessibilityOrientationUndefined = 0,
     AccessibilityOrientationVertical,
     AccessibilityOrientationHorizontal,
 };
 
 enum AXObjectInclusion {
     IncludeObject,
@@ skipping 553 matching lines @@
     static bool includesARIAWidgetRole(const String&);
     static bool hasInteractiveARIAAttribute(const Element&);
 };
 
 #define DEFINE_AX_OBJECT_TYPE_CASTS(thisType, predicate) \
     DEFINE_TYPE_CASTS(thisType, AXObject, object, object->predicate, object.predicate)
 
 } // namespace blink
 
 #endif // AXObject_h