chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js - Issue 2093753002: Reland: Make ChromeVox Next a setting in options page

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js

Issue 2093753002: Reland: Make ChromeVox Next a setting in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/chromeos/chromevox/cvox2/background/chromevox_state.js ('k') | chrome/browser/resources/chromeos/chromevox/cvox2/background/desktop_automation_handler.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js

diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js

index 82dec9cf54646f73909d11158ed5ceca74dd3fbd..af31d1710163a1a298ccdb96be15fd8a6ef05481 100644

--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js

+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js

@@ -314,7 +314,7 @@ cursors.Cursor.prototype = {

* @return {boolean}

isValid: function() {

- return !!this.node && !!this.node.root;

+ return this.node != null;

}

};

@@ -555,10 +555,13 @@ cursors.Range.prototype = {

// Find the most common root.

var uniqueAncestors = AutomationUtil.getUniqueAncestors(start, end);

var mcr = start.root;

- if (uniqueAncestors)

- mcr = uniqueAncestors.pop().parent.root;

+ if (uniqueAncestors) {

+ var common = uniqueAncestors.pop().parent;

+ if (common)

+ mcr = common.root;

+ }

- if (mcr.role == RoleType.desktop)

+ if (!mcr || mcr.role == RoleType.desktop)

return;

if (mcr === start.root && mcr === end.root) {