summaryrefslogtreecommitdiffstats
path: root/chrome/browser/accessibility/browser_accessibility_win.cc
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 18:01:38 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 18:01:38 +0000
commitd1fdc6f83a75e316aafef3ff0f84f30a132f08c3 (patch)
tree0bb8fa503fcdc9ff4e73cdcef887e1f3054edd6d /chrome/browser/accessibility/browser_accessibility_win.cc
parente6025de05d4f747edb3f638ed99b95b1b08360b2 (diff)
downloadchromium_src-d1fdc6f83a75e316aafef3ff0f84f30a132f08c3.zip
chromium_src-d1fdc6f83a75e316aafef3ff0f84f30a132f08c3.tar.gz
chromium_src-d1fdc6f83a75e316aafef3ff0f84f30a132f08c3.tar.bz2
Implement additional IAccessibleText methods to return the nearest
character, word, line, sentence, or paragraph within a text field. These methods are needed by SAToGo. BUG=36217 TEST=Added new unit test. Review URL: http://codereview.chromium.org/3550017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/accessibility/browser_accessibility_win.cc')
-rw-r--r--chrome/browser/accessibility/browser_accessibility_win.cc232
1 files changed, 189 insertions, 43 deletions
diff --git a/chrome/browser/accessibility/browser_accessibility_win.cc b/chrome/browser/accessibility/browser_accessibility_win.cc
index 432eb1a..8817dfa 100644
--- a/chrome/browser/accessibility/browser_accessibility_win.cc
+++ b/chrome/browser/accessibility/browser_accessibility_win.cc
@@ -54,7 +54,7 @@ HRESULT BrowserAccessibilityWin::accDoDefaultAction(VARIANT var_id) {
}
STDMETHODIMP BrowserAccessibilityWin::accHitTest(LONG x_left, LONG y_top,
- VARIANT* child) {
+ VARIANT* child) {
if (!instance_active_)
return E_FAIL;
@@ -65,8 +65,8 @@ STDMETHODIMP BrowserAccessibilityWin::accHitTest(LONG x_left, LONG y_top,
}
STDMETHODIMP BrowserAccessibilityWin::accLocation(LONG* x_left, LONG* y_top,
- LONG* width, LONG* height,
- VARIANT var_id) {
+ LONG* width, LONG* height,
+ VARIANT var_id) {
if (!instance_active_)
return E_FAIL;
@@ -534,45 +534,6 @@ STDMETHODIMP BrowserAccessibilityWin::get_nCharacters(LONG* n_characters) {
return S_OK;
}
-STDMETHODIMP BrowserAccessibilityWin::get_text(
- LONG start_offset, LONG end_offset, BSTR* text) {
- if (!instance_active_)
- return E_FAIL;
-
- if (!text)
- return E_INVALIDARG;
-
- string16 text_str;
- if (role_ == WebAccessibility::ROLE_TEXT_FIELD) {
- text_str = value_;
- } else {
- text_str = name_;
- }
-
- // The spec allows the arguments to be reversed.
- if (start_offset > end_offset) {
- LONG tmp = start_offset;
- start_offset = end_offset;
- end_offset = tmp;
- }
-
- // The spec does not allow the start or end offsets to be out or range;
- // we must return an error if so.
- LONG len = text_str.length();
- if (start_offset < 0)
- return E_INVALIDARG;
- if (end_offset > len)
- return E_INVALIDARG;
-
- string16 substr = text_str.substr(start_offset, end_offset - start_offset);
- if (substr.empty())
- return S_FALSE;
-
- *text = SysAllocString(substr.c_str());
- DCHECK(*text);
- return S_OK;
-}
-
STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(LONG* offset) {
if (!instance_active_)
return E_FAIL;
@@ -585,7 +546,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(LONG* offset) {
if (GetAttributeAsInt(WebAccessibility::ATTR_TEXT_SEL_START, &sel_start)) {
*offset = sel_start;
} else {
- *offset = 0;
+ *offset = 0;
}
} else {
*offset = 0;
@@ -646,6 +607,121 @@ STDMETHODIMP BrowserAccessibilityWin::get_selection(LONG selection_index,
return S_OK;
}
+STDMETHODIMP BrowserAccessibilityWin::get_text(
+ LONG start_offset, LONG end_offset, BSTR* text) {
+ if (!instance_active_)
+ return E_FAIL;
+
+ if (!text)
+ return E_INVALIDARG;
+
+ const string16& text_str = TextForIAccessibleText();
+
+ // The spec allows the arguments to be reversed.
+ if (start_offset > end_offset) {
+ LONG tmp = start_offset;
+ start_offset = end_offset;
+ end_offset = tmp;
+ }
+
+ // The spec does not allow the start or end offsets to be out or range;
+ // we must return an error if so.
+ LONG len = text_str.length();
+ if (start_offset < 0)
+ return E_INVALIDARG;
+ if (end_offset > len)
+ return E_INVALIDARG;
+
+ string16 substr = text_str.substr(start_offset, end_offset - start_offset);
+ if (substr.empty())
+ return S_FALSE;
+
+ *text = SysAllocString(substr.c_str());
+ DCHECK(*text);
+ return S_OK;
+}
+
+STDMETHODIMP BrowserAccessibilityWin::get_textAtOffset(
+ LONG offset,
+ enum IA2TextBoundaryType boundary_type,
+ LONG* start_offset, LONG* end_offset,
+ BSTR* text) {
+ if (!instance_active_)
+ return E_FAIL;
+
+ if (!start_offset || !end_offset || !text)
+ return E_INVALIDARG;
+
+ // The IAccessible2 spec says we don't have to implement the "sentence"
+ // boundary type, we can just let the screenreader handle it.
+ if (boundary_type == IA2_TEXT_BOUNDARY_SENTENCE) {
+ *start_offset = 0;
+ *end_offset = 0;
+ *text = NULL;
+ return S_FALSE;
+ }
+
+ const string16& text_str = TextForIAccessibleText();
+
+ *start_offset = FindBoundary(text_str, boundary_type, offset, -1);
+ *end_offset = FindBoundary(text_str, boundary_type, offset, 1);
+ return get_text(*start_offset, *end_offset, text);
+}
+
+STDMETHODIMP BrowserAccessibilityWin::get_textBeforeOffset(
+ LONG offset,
+ enum IA2TextBoundaryType boundary_type,
+ LONG* start_offset, LONG* end_offset,
+ BSTR* text) {
+ if (!instance_active_)
+ return E_FAIL;
+
+ if (!start_offset || !end_offset || !text)
+ return E_INVALIDARG;
+
+ // The IAccessible2 spec says we don't have to implement the "sentence"
+ // boundary type, we can just let the screenreader handle it.
+ if (boundary_type == IA2_TEXT_BOUNDARY_SENTENCE) {
+ *start_offset = 0;
+ *end_offset = 0;
+ *text = NULL;
+ return S_FALSE;
+ }
+
+ const string16& text_str = TextForIAccessibleText();
+
+ *start_offset = FindBoundary(text_str, boundary_type, offset, -1);
+ *end_offset = offset;
+ return get_text(*start_offset, *end_offset, text);
+}
+
+STDMETHODIMP BrowserAccessibilityWin::get_textAfterOffset(
+ LONG offset,
+ enum IA2TextBoundaryType boundary_type,
+ LONG* start_offset, LONG* end_offset,
+ BSTR* text) {
+ if (!instance_active_)
+ return E_FAIL;
+
+ if (!start_offset || !end_offset || !text)
+ return E_INVALIDARG;
+
+ // The IAccessible2 spec says we don't have to implement the "sentence"
+ // boundary type, we can just let the screenreader handle it.
+ if (boundary_type == IA2_TEXT_BOUNDARY_SENTENCE) {
+ *start_offset = 0;
+ *end_offset = 0;
+ *text = NULL;
+ return S_FALSE;
+ }
+
+ const string16& text_str = TextForIAccessibleText();
+
+ *start_offset = offset;
+ *end_offset = FindBoundary(text_str, boundary_type, offset, 1);
+ return get_text(*start_offset, *end_offset, text);
+}
+
//
// ISimpleDOMDocument methods.
//
@@ -1129,6 +1205,76 @@ string16 BrowserAccessibilityWin::Escape(string16 str) {
return EscapeQueryParamValueUTF8(str, false);
}
+const string16& BrowserAccessibilityWin::TextForIAccessibleText() {
+ if (role_ == WebAccessibility::ROLE_TEXT_FIELD) {
+ return value_;
+ } else {
+ return name_;
+ }
+}
+
+LONG BrowserAccessibilityWin::FindBoundary(
+ const string16& text,
+ IA2TextBoundaryType boundary,
+ LONG start_offset,
+ LONG direction) {
+ LONG text_size = static_cast<LONG>(text.size());
+ DCHECK(start_offset >= 0 && start_offset <= text_size);
+ DCHECK(direction == 1 || direction == -1);
+
+ if (boundary == IA2_TEXT_BOUNDARY_CHAR) {
+ if (direction == 1 && start_offset < text_size)
+ return start_offset + 1;
+ else
+ return start_offset;
+ }
+
+ LONG result = start_offset;
+ for (;;) {
+ LONG pos;
+ if (direction == 1) {
+ if (result >= text_size)
+ return text_size;
+ pos = result;
+ } else {
+ if (result <= 0)
+ return 0;
+ pos = result - 1;
+ }
+
+ switch (boundary) {
+ case IA2_TEXT_BOUNDARY_WORD:
+ if (IsWhitespace(text[pos]))
+ return result;
+ break;
+ case IA2_TEXT_BOUNDARY_LINE:
+ case IA2_TEXT_BOUNDARY_PARAGRAPH:
+ if (text[pos] == '\n')
+ return result;
+ case IA2_TEXT_BOUNDARY_SENTENCE:
+ // Note that we don't actually have to implement sentence support;
+ // currently IAccessibleText functions return S_FALSE so that
+ // screenreaders will handle it on their own.
+ if ((text[pos] == '.' || text[pos] == '!' || text[pos] == '?') &&
+ (pos == text_size - 1 || IsWhitespace(text[pos + 1]))) {
+ return result;
+ }
+ case IA2_TEXT_BOUNDARY_ALL:
+ default:
+ break;
+ }
+
+ if (direction > 0) {
+ result++;
+ } else if (direction < 0) {
+ result--;
+ } else {
+ NOTREACHED();
+ return result;
+ }
+ }
+}
+
void BrowserAccessibilityWin::InitRoleAndState() {
ia_state_ = 0;
ia2_state_ = IA2_STATE_OPAQUE;
generated by cgit v1.1 at 2025-03-26 02:00:58 +0000