diff options
Diffstat (limited to 'content')
2 files changed, 5 insertions, 5 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java index 8965192..1e20730 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java @@ -44,7 +44,6 @@ import android.view.accessibility.AccessibilityNodeProvider; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputMethodManager; -import android.widget.AbsoluteLayout; import android.widget.FrameLayout; import com.google.common.annotations.VisibleForTesting; @@ -524,7 +523,7 @@ public class ContentViewCore } @Override - @SuppressWarnings("deprecation") // AbsoluteLayout.LayoutParams + @SuppressWarnings("deprecation") // AbsoluteLayout public void setAnchorViewPosition( View view, float x, float y, float width, float height) { assert view.getParent() == mContainerView; @@ -545,7 +544,7 @@ public class ContentViewCore lp.leftMargin = leftMargin; lp.topMargin = topMargin; view.setLayoutParams(lp); - } else if (mContainerView instanceof AbsoluteLayout) { + } else if (mContainerView instanceof android.widget.AbsoluteLayout) { // This fixes the offset due to a difference in // scrolling model of WebView vs. Chrome. // TODO(sgurun) fix this to use mContainerView.getScroll[X/Y]() diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java index d6a80ea..76cf1d9 100644 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java @@ -25,6 +25,7 @@ import org.chromium.content.browser.RenderCoordinates; import java.util.ArrayList; import java.util.List; +import java.util.Locale; /** * Native accessibility for a {@link ContentViewCore}. @@ -202,7 +203,7 @@ public class BrowserAccessibilityManager { AccessibilityNodeInfo.ACTION_ARGUMENT_HTML_ELEMENT_STRING); if (elementType == null) return false; - elementType = elementType.toUpperCase(); + elementType = elementType.toUpperCase(Locale.US); return jumpToElementType(elementType, true); } case AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT: { @@ -212,7 +213,7 @@ public class BrowserAccessibilityManager { AccessibilityNodeInfo.ACTION_ARGUMENT_HTML_ELEMENT_STRING); if (elementType == null) return false; - elementType = elementType.toUpperCase(); + elementType = elementType.toUpperCase(Locale.US); return jumpToElementType(elementType, false); } |