| Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
|
| index 593dcc21fc9088298390485bc03d42a99b9b974d..cd859b8ede1da95bd108d60dc1ca485a2cfd3c98 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
|
| @@ -57,7 +57,7 @@ import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content.browser.SPenSupport;
|
| import org.chromium.ui.UiUtils;
|
| import org.chromium.ui.base.DeviceFormFactor;
|
| -import org.chromium.ui.base.WindowAndroid;
|
| +import org.chromium.ui.base.ViewRoot;
|
| import org.chromium.ui.resources.ResourceManager;
|
| import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
|
|
|
| @@ -293,8 +293,7 @@ public class CompositorViewHolder extends FrameLayout
|
| /**
|
| * This is called when the native library are ready.
|
| */
|
| - public void onNativeLibraryReady(
|
| - WindowAndroid windowAndroid, TabContentManager tabContentManager) {
|
| + public void onNativeLibraryReady(ViewRoot viewRoot, TabContentManager tabContentManager) {
|
| assert mLayerTitleCache == null : "Should be called once";
|
|
|
| if (DeviceClassManager.enableLayerDecorationCache()) {
|
| @@ -302,7 +301,7 @@ public class CompositorViewHolder extends FrameLayout
|
| }
|
|
|
| mCompositorView.initNativeCompositor(
|
| - SysUtils.isLowEndDevice(), windowAndroid, mLayerTitleCache, tabContentManager);
|
| + SysUtils.isLowEndDevice(), viewRoot, mLayerTitleCache, tabContentManager);
|
|
|
| if (mLayerTitleCache != null) {
|
| mLayerTitleCache.setResourceManager(getResourceManager());
|
| @@ -826,6 +825,7 @@ public class CompositorViewHolder extends FrameLayout
|
| // Claim focus for the new view unless the user is currently using the URL bar.
|
| if (mUrlBar == null || !mUrlBar.hasFocus()) mView.requestFocus();
|
| }
|
| + content.moveToFrontInViewHierarchy();
|
| } else {
|
| if (mView.getParent() == this) {
|
| setFocusable(true);
|
|
|