Initial support for native accessibility in ARC

components/exo/surface.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_EXO_SURFACE_H_
 #define COMPONENTS_EXO_SURFACE_H_
 
 #include <list>
 #include <memory>
 #include <set>
@@ skipping 24 matching lines @@
 
 namespace cc {
 class SurfaceIdAllocator;
 }
 
 namespace gfx {
 class Path;
 }
 
 namespace exo {
+class AXTreeSourceSurface;
 class Buffer;
 class Pointer;
 class SurfaceDelegate;
 class SurfaceObserver;
 class Surface;
 
 template <typename T>
 struct SurfaceProperty;
 
 namespace subtle {
@@ skipping 176 matching lines @@
 
   // Sets the |property| to its default value. Useful for avoiding a cast when
   // setting to NULL.
   template <typename T>
   void ClearProperty(const SurfaceProperty<T>* property);
 
   bool HasPendingDamageForTesting(const gfx::Rect& damage) const {
     return pending_damage_.contains(gfx::RectToSkIRect(damage));
   }
 
+  // Sets the accessible tree source for this surface.
+  void set_ax_tree_source(AXTreeSourceSurface* tree) { ax_tree_source_ = tree; }
+  AXTreeSourceSurface* ax_tree_source() { return ax_tree_source_; }
+
  private:
   struct State {
     State();
     ~State();
 
     bool operator==(const State& other);
     bool operator!=(const State& other) { return !(*this == other); }
 
     SkRegion opaque_region;
     SkRegion input_region;
@@ skipping 159 matching lines @@
 
   // Surface observer list. Surface does not own the observers.
   base::ObserverList<SurfaceObserver, true> observers_;
 
   // A reference factory that uses the compositor frame sink holder provided
   // to this class to construct surface references. This object is passed to
   // ui::Layer::SetShowSurface because the layer needs to know how to add
   // references to surfaces.
   scoped_refptr<cc::SurfaceReferenceFactory> surface_reference_factory_;
 
+  AXTreeSourceSurface* ax_tree_source_;

[dmazzoni, 2017/01/19 19:48:16]

Comment who owns this. If this is owned by this class, maybe unique_ptr?

[David Tseng, 2017/01/20 23:00:56]

Not owned by this class (commented).

+
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_SURFACE_H_