diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 16:41:25 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 16:41:25 +0000 |
| commit | 23868f8519f2d60285758ad1cbca4d57ef8944b4 (patch) | |
| tree | 3b8b717837f80e7ae27769cd174b352d6f39f7c0 /content | |
| parent | 444e245cb4e3e4d5bbd2f3e878fd2a0eced20308 (diff) | |
| download | chromium_src-23868f8519f2d60285758ad1cbca4d57ef8944b4.zip chromium_src-23868f8519f2d60285758ad1cbca4d57ef8944b4.tar.gz chromium_src-23868f8519f2d60285758ad1cbca4d57ef8944b4.tar.bz2 | |
[Android WebView] Plumb across window focus changes to ContentViewCore.
Motivated by getting accessibility support in WebView working. ChromeVox
requires that the window has focus before functioning as expected, so
we plumb that through to ContentViewCore from AwContents.
R=bulach@chromium.org, mkosiba@chromium.org
Review URL: https://codereview.chromium.org/15167006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentView.java | 2 | ||||
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java index 844b9cce..0e6e381 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java @@ -445,7 +445,7 @@ public class ContentView extends FrameLayout protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) { TraceEvent.begin(); super.onFocusChanged(gainFocus, direction, previouslyFocusedRect); - mContentViewCore.onFocusChanged(gainFocus, direction, previouslyFocusedRect); + mContentViewCore.onFocusChanged(gainFocus); TraceEvent.end(); } 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 6c3c83c..9afef644 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 @@ -1543,9 +1543,17 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient { /** * @see View#onFocusedChanged(boolean, int, Rect) + * TODO(benm): Remove once downstream usages have been updated to use single + * parameter version */ + @Deprecated @SuppressWarnings("javadoc") public void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) { + onFocusChanged(gainFocus); + } + + + public void onFocusChanged(boolean gainFocus) { if (!gainFocus) getContentViewClient().onImeStateChangeRequested(false); if (mNativeContentViewCore != 0) nativeSetFocus(mNativeContentViewCore, gainFocus); } |