| Index: content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java
|
| index 912e9b6dfac0f29f72bd57a40d54609c737beef9..8de6adea10a9918720e32d561705eb96d057134d 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java
|
| @@ -123,18 +123,18 @@ public class ImeAdapter {
|
| private boolean mIsConnected;
|
|
|
| /**
|
| + * @param initialConfiguration The initial configuration of the embedder's attached view.
|
| * @param webContents WebContents instance with which this ImeAdapter is associated.
|
| * @param wrapper InputMethodManagerWrapper that should receive all the call directed to
|
| * InputMethodManager.
|
| * @param embedder The view that is used for callbacks from ImeAdapter.
|
| */
|
| - public ImeAdapter(WebContents webContents, InputMethodManagerWrapper wrapper,
|
| - ImeAdapterDelegate embedder) {
|
| + public ImeAdapter(Configuration initialConfiguration, WebContents webContents,
|
| + InputMethodManagerWrapper wrapper, ImeAdapterDelegate embedder) {
|
| mInputMethodManagerWrapper = wrapper;
|
| mViewEmbedder = embedder;
|
| // Deep copy newConfig so that we can notice the difference.
|
| - mCurrentConfig = new Configuration(
|
| - mViewEmbedder.getAttachedView().getResources().getConfiguration());
|
| + mCurrentConfig = new Configuration(initialConfiguration);
|
| // CursorAnchroInfo is supported only after L.
|
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
| mCursorAnchorInfoController = CursorAnchorInfoController.create(wrapper,
|
|
|