Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flutter/third_party/accessibility/ax/ax_active_popup.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#ifndef UI_ACCESSIBILITY_AX_ACTIVE_POPUP_H_
#define UI_ACCESSIBILITY_AX_ACTIVE_POPUP_H_

#include <cstdint>
#include <optional>

#include "ax/ax_export.h"
Expand Down
8 changes: 6 additions & 2 deletions flutter/third_party/accessibility/ax/ax_event_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,13 @@ class AX_EXPORT AXEventGenerator : public AXTreeObserver {
const EventParams& event_params;
};

class AX_EXPORT Iterator
: public std::iterator<std::input_iterator_tag, TargetedEvent> {
class AX_EXPORT Iterator {
public:
using iterator_category = std::input_iterator_tag;
using value_type = TargetedEvent;
using difference_type = std::ptrdiff_t;
using pointer = TargetedEvent*;
using reference = TargetedEvent&;
Iterator(
const std::map<AXNode*, std::set<EventParams>>& map,
const std::map<AXNode*, std::set<EventParams>>::const_iterator& head);
Expand Down
8 changes: 7 additions & 1 deletion flutter/third_party/accessibility/ax/ax_range.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,14 @@ class AXRange {
//
// This class allows AXRange to be iterated through all "leaf text ranges"
// contained between its endpoints, composing the entire range.
class Iterator : public std::iterator<std::input_iterator_tag, AXRange> {
class Iterator {
public:
using iterator_category = std::input_iterator_tag;
using value_type = AXRange;
using difference_type = std::ptrdiff_t;
using pointer = AXRange*;
using reference = AXRange&;

Iterator()
: current_start_(AXPositionType::CreateNullPosition()),
iterator_end_(AXPositionType::CreateNullPosition()) {}
Expand Down
Loading