bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Windows: cefclient: Fix accessibility where TreeId type has changed from int to string

Browse Source
This commit is contained in:
Andrei Kurushin
2020-04-02 21:19:25 +00:00
committed by Marshall Greenblatt
parent 261a8899fc
commit ea1324a9f1
4 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/cefclient/browser/osr_accessibility_helper.h
View File

@@ -21,12 +21,12 @@ class OsrAXTree {
void EraseNode(int nodeId);
void UpdateTreeData(CefRefPtr<CefDictionaryValue> value);
void AddNode(OsrAXNode* node);
int GetParentTreeId() const { return parent_tree_id_; }
const CefString& GetParentTreeId() const { return parent_tree_id_; }
int GetRootNodeId() const { return root_node_id_; }
void SetRootNodeId(int nodeId) { root_node_id_ = nodeId; }
private:
int parent_tree_id_;
CefString parent_tree_id_;
int root_node_id_;
std::map<int, OsrAXNode*> node_map_;
};
@@ -53,26 +53,27 @@ class OsrAccessibilityHelper {
CefRefPtr<CefBrowser> GetBrowser() const { return browser_; }
OsrAXNode* GetNode(int treeId, int nodeId) const;
OsrAXNode* GetNode(const CefString& treeId, int nodeId) const;
OsrAXNode* GetTreeRootNode(int treeId) const;
OsrAXNode* GetTreeRootNode(const CefString& treeId) const;
static int CastToInt(CefRefPtr<CefValue> value);
private:
void Reset();
void UpdateLayout(int treeId, CefRefPtr<CefDictionaryValue> update);
void UpdateLayout(const CefString& treeId,
CefRefPtr<CefDictionaryValue> update);
void UpdateFocusedNode(int treeId, int nodeId);
void UpdateFocusedNode(const CefString& treeId, int nodeId);
// Destroy the node and remove from Map
void DestroyNode(OsrAXNode* node);
int root_tree_id_;
int focused_tree_id_;
CefString root_tree_id_;
CefString focused_tree_id_;
int focused_node_id_;
CefRefPtr<CefBrowser> browser_;
std::map<int, OsrAXTree> accessibility_node_map_;
std::map<CefString, OsrAXTree> accessibility_node_map_;
};
} // namespace client