Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / public / android / java / src / org / chromium / content / browser / accessibility / JellyBeanAccessibilityInjector.java

diff --git a/src/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java b/src/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
index 172541f..c4b92d0 100644 (file)
--- a/src/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
+++ b/src/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
@@ -15,6 +15,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -76,7 +77,7 @@ class JellyBeanAccessibilityInjector extends AccessibilityInjector {
 
         boolean actionSuccessful = sendActionToAndroidVox(action, arguments);
 
-        if (actionSuccessful) mContentViewCore.showImeIfNeeded();
+        if (actionSuccessful) mContentViewCore.getWebContents().showImeIfNeeded();
 
         return actionSuccessful;
     }
@@ -127,8 +128,8 @@ class JellyBeanAccessibilityInjector extends AccessibilityInjector {
             if (arguments != null) {
                 if (action == AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY ||
                         action == AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY) {
-                    final int granularity = arguments.getInt(AccessibilityNodeInfo.
-                            ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT);
+                    final int granularity = arguments.getInt(
+                            AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT);
                     mAccessibilityJSONObject.accumulate("granularity", granularity);
                 } else if (action == AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT ||
                         action == AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT) {
@@ -142,7 +143,8 @@ class JellyBeanAccessibilityInjector extends AccessibilityInjector {
         }
 
         final String jsonString = mAccessibilityJSONObject.toString();
-        final String jsCode = String.format(ACCESSIBILITY_ANDROIDVOX_TEMPLATE, jsonString);
+        final String jsCode = String.format(Locale.US, ACCESSIBILITY_ANDROIDVOX_TEMPLATE,
+                jsonString);
         return mCallback.performAction(mContentViewCore, jsCode);
     }
 
@@ -181,9 +183,9 @@ class JellyBeanAccessibilityInjector extends AccessibilityInjector {
          */
         private boolean performAction(ContentViewCore contentView, String code) {
             final int resultId = mResultIdCounter.getAndIncrement();
-            final String js = String.format(JAVASCRIPT_ACTION_TEMPLATE, code, mInterfaceName,
-                    resultId);
-            contentView.evaluateJavaScript(js, null);
+            final String js = String.format(Locale.US, JAVASCRIPT_ACTION_TEMPLATE, code,
+                    mInterfaceName, resultId);
+            contentView.getWebContents().evaluateJavaScript(js, null);
 
             return getResultAndClear(resultId);
         }