Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / content / browser / resources / accessibility / accessibility.js

diff --git a/src/content/browser/resources/accessibility/accessibility.js b/src/content/browser/resources/accessibility/accessibility.js
index 035bc39..37af8e7 100644 (file)
--- a/src/content/browser/resources/accessibility/accessibility.js
+++ b/src/content/browser/resources/accessibility/accessibility.js
@@ -8,14 +8,19 @@ cr.define('accessibility', function() {
   // Keep in sync with view_message_enums.h
   var AccessibilityModeFlag = {
     Platform: 1 << 0,
-    PlatformFullTree: 1 << 1
+    FullTree: 1 << 1
   }
 
   var AccessibilityMode = {
     Off: 0,
     Complete:
-        AccessibilityModeFlag.Platform | AccessibilityModeFlag.PlatformFullTree,
-    EditableTextOnly: AccessibilityModeFlag.Platform
+        AccessibilityModeFlag.Platform | AccessibilityModeFlag.FullTree,
+    EditableTextOnly: AccessibilityModeFlag.Platform,
+    TreeOnly: AccessibilityModeFlag.FullTree
+  }
+
+  function isAccessibilityComplete(mode) {
+    return ((mode & AccessibilityMode.Complete) == AccessibilityMode.Complete);
   }
 
   function requestData() {
@@ -73,9 +78,8 @@ cr.define('accessibility', function() {
   }
 
   function addGlobalAccessibilityModeToggle(global_a11y_mode) {
-    var full_a11y_on = ((global_a11y_mode & AccessibilityMode.Complete)
-        == AccessibilityMode.Complete);
-    $('toggle_global').textContent = (full_a11y_on == 0 ? 'off' : 'on');
+    var full_a11y_on = isAccessibilityComplete(global_a11y_mode);
+    $('toggle_global').textContent = (full_a11y_on ? 'on' : 'off');
     $('toggle_global').addEventListener('click',
                                         toggleGlobalAccessibility);
   }
@@ -107,7 +111,7 @@ cr.define('accessibility', function() {
       row.appendChild(formatValue(data, properties[j]));
 
     row.appendChild(createToggleAccessibilityElement(data));
-    if (data['a11y_mode'] != 0) {
+    if (isAccessibilityComplete(data['a11y_mode'])) {
       row.appendChild(document.createTextNode(' | '));
       if ('tree' in data) {
         row.appendChild(createShowAccessibilityTreeElement(data, row, true));
@@ -147,8 +151,8 @@ cr.define('accessibility', function() {
   function createToggleAccessibilityElement(data) {
     var link = document.createElement('a');
     link.setAttribute('href', '#');
-    var a11y_mode = data['a11y_mode'];
-    link.textContent = 'accessibility ' + (a11y_mode == 0 ? 'off' : 'on');
+    var full_a11y_on = isAccessibilityComplete(data['a11y_mode']);
+    link.textContent = 'accessibility ' + (full_a11y_on ? 'on' : 'off');
     link.addEventListener('click',
                           toggleAccessibility.bind(this, data, link));
     return link;