cl format

ui/accessibility/platform/text_marker_helper_mac.mm

 // Copyright 2017 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.
 
 #import "ui/accessibility/platform/text_marker_helper_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/mac/scoped_nsobject.h"
 #include "ui/accessibility/ax_position.h"
 #include "ui/accessibility/ax_range.h"
 
 using ui::AXPositionPointer;
 using ui::AXRangePointer;
 using ui::AXPositionData;
 
 extern "C" {
 
 // The following are private accessibility APIs required for cursor navigation
@@ skipping 75 matching lines @@
   std::unique_ptr<ui::PositionFactory> factory_;
 }
 
 - (instancetype)initWithFactory:(std::unique_ptr<ui::PositionFactory>)factory {
   if ((self = [super init])) {
     factory_ = std::move(factory);
   }
   return self;
 }
 
-- (id)startTextMarker {
-  AXPositionPointer root = factory_->GetRoot();
-  return root ? CreateTextMarker(root->PositionAtStartOfAnchor()) : nil;
++ (NSArray*)getSupportedAttributes {
+  return @[
+    @"AXEndTextMarker",
+    @"AXSelectedTextMarkerRange",
+    @"AXStartTextMarker",
+  ];
 }
 
-- (id)endTextMarker {
-  AXPositionPointer root = factory_->GetRoot();
-  return root ? CreateTextMarker(root->PositionAtEndOfAnchor()) : nil;
++ (NSArray*)getSupportedParameterizedAttributesExtended:(BOOL)extended {
+  static NSArray* const generalAttributes = [@[
+    @"AXAttributedStringForTextMarkerRange",
+    @"AXBoundsForTextMarkerRange",
+    @"AXEndTextMarkerForBounds",
+    @"AXLeftLineTextMarkerRangeForTextMarker",  // Done.
+    @"AXLeftWordTextMarkerRangeForTextMarker",  // Done.
+    @"AXLengthForTextMarkerRange",
+    @"AXLineForTextMarker",
+    @"AXLineTextMarkerRangeForTextMarker",    // Done.
+    @"AXNextLineEndTextMarkerForTextMarker",  // Done.
+    @"AXNextParagraphEndTextMarkerForTextMarker",
+    @"AXNextSentenceEndTextMarkerForTextMarker",
+    @"AXNextTextMarkerForTextMarker",         // Done.
+    @"AXNextWordEndTextMarkerForTextMarker",  // Done.
+    @"AXParagraphTextMarkerRangeForTextMarker",
+    @"AXPreviousLineStartTextMarkerForTextMarker",  // Done.
+    @"AXPreviousParagraphStartTextMarkerForTextMarker",
+    @"AXPreviousSentenceStartTextMarkerForTextMarker",
+    @"AXPreviousTextMarkerForTextMarker",           // Done.
+    @"AXPreviousWordStartTextMarkerForTextMarker",  // Done.
+    @"AXRightLineTextMarkerRangeForTextMarker",     // Done.
+    @"AXRightWordTextMarkerRangeForTextMarker",     // Done.
+    @"AXSentenceTextMarkerRangeForTextMarker",
+    @"AXStartTextMarkerForBounds",
+    @"AXStringForTextMarkerRange",
+    @"AXStyleTextMarkerRangeForTextMarker",
+    @"AXTextMarkerForPosition",
+    @"AXTextMarkerRangeForLine",                  // Done.
+    @"AXTextMarkerRangeForUIElement",             // Done.
+    @"AXTextMarkerRangeForUnorderedTextMarkers",  // Done.
+    @"AXUIElementForTextMarker",                  // Done.
+  ] retain];
+  static NSArray* const extendedAttributes = [@[
+    @"AXTextMarkerIsValid",
+    @"AXIndexForTextMarker",
+    @"AXTextMarkerForIndex",
+  ] retain];
+  base::scoped_nsobject<NSMutableArray> ret([[NSMutableArray alloc] init]);
+  [ret addObjectsFromArray:generalAttributes];
+  if (extended)
+    [ret addObjectsFromArray:extendedAttributes];
+  return ret.autorelease();
 }
 
-- (id)selectedTextMarkerRange {
-  AXRangePointer selection = factory_->GetSelection();
-  if (!selection.first || !selection.second)
-    return nil;
-  return CreateTextMarkerRange(std::move(selection));
++ (BOOL)getRangeDataFromMarkerRange:(id)parameter
+                              start:(ui::AXPositionData*)start
+                                end:(ui::AXPositionData*)end {
+  AXTextMarkerRangeRef markerRange =
+      base::mac::CFCastStrict<AXTextMarkerRangeRef>(parameter);
+  DCHECK(markerRange);
+
+  base::ScopedCFTypeRef<AXTextMarkerRef> startMarker(
+      AXTextMarkerRangeCopyStartMarker(markerRange));
+  base::ScopedCFTypeRef<AXTextMarkerRef> endMarker(
+      AXTextMarkerRangeCopyEndMarker(markerRange));
+  if (!startMarker || !endMarker)
+    return NO;
+
+  return ExtractData(startMarker, start) && ExtractData(endMarker, end);
 }
 
 - (AXPositionPointer)extractFrom:(id)parameter {
   AXPositionData data;
   if (ExtractData(base::mac::CFCastStrict<AXTextMarkerRef>(parameter), &data))
     return factory_->GetFromData(data);
   return factory_->GetFromData(ui::AXAbstractPosition::kNullData);
 }
 
+// Non-parameterized attributes. Keep sorted.
+
+// Returns a text marker that points to the last character in the document that
+// can be selected with VoiceOver.
+- (id)AXEndTextMarker {
+  AXPositionPointer root = factory_->GetRoot();
+  return root ? CreateTextMarker(root->PositionAtEndOfAnchor()) : nil;
+}
+
+// Returns a text marker range corresponding to the current selection.
+- (id)AXSelectedTextMarkerRange {
+  AXRangePointer selection = factory_->GetSelection();
+  if (!selection.first || !selection.second)
+    return nil;
+  return CreateTextMarkerRange(std::move(selection));
+}
+
+// Returns a text marker that points to the first character in the document that
+// can be selected with VoiceOver.
+- (id)AXStartTextMarker {
+  AXPositionPointer root = factory_->GetRoot();
+  return root ? CreateTextMarker(root->PositionAtStartOfAnchor()) : nil;
+}
+
+// Parameterized attributes. TOOD(tapted): Sort these.
+
 - (id)AXTextMarkerRangeForUIElement:(id)parameter {
   AXPositionPointer startPosition = factory_->GetRoot();
   AXPositionPointer endPosition = startPosition->PositionAtEndOfAnchor();
   AXRangePointer range =
       AXRangePointer(std::move(startPosition), std::move(endPosition));
   return CreateTextMarkerRange(std::move(range));
 }
 
 - (id)AXUIElementForTextMarker:(id)parameter {
   AXPositionData data;
@@ skipping 126 matching lines @@
   AXPositionPointer endPosition =
       [self extractFrom:[textMarkerArray objectAtIndex:1]];
   if (endPosition->Compare(startPosition)) {
     return CreateTextMarkerRange(
         AXRangePointer(std::move(endPosition), std::move(startPosition)));
   }
   return CreateTextMarkerRange(
       AXRangePointer(std::move(startPosition), std::move(endPosition)));
 }
 
-+ (BOOL)getRangeDataFromMarkerRange:(id)parameter
-                              start:(ui::AXPositionData*)start
-                                end:(ui::AXPositionData*)end {
-  AXTextMarkerRangeRef markerRange =
-      base::mac::CFCastStrict<AXTextMarkerRangeRef>(parameter);
-  DCHECK(markerRange);
-
-  base::ScopedCFTypeRef<AXTextMarkerRef> startMarker(
-      AXTextMarkerRangeCopyStartMarker(markerRange));
-  base::ScopedCFTypeRef<AXTextMarkerRef> endMarker(
-      AXTextMarkerRangeCopyEndMarker(markerRange));
-  if (!startMarker || !endMarker)
-    return NO;
-
-  return ExtractData(startMarker, start) && ExtractData(endMarker, end);
-}
-
 @end