Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1502)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)
Patch Set: comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e4c3de2f19ed3e6e771db2b15dafb49048585158..9e1fe460ddfe78dce8ee6fa669c961b8fac55e62 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
@@ -58,7 +58,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;
@@ -306,8 +306,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()) {
@@ -315,7 +314,7 @@ public class CompositorViewHolder extends FrameLayout
}
mCompositorView.initNativeCompositor(
- SysUtils.isLowEndDevice(), windowAndroid, mLayerTitleCache, tabContentManager);
+ SysUtils.isLowEndDevice(), viewRoot, mLayerTitleCache, tabContentManager);
if (mLayerTitleCache != null) {
mLayerTitleCache.setResourceManager(getResourceManager());

Powered by Google App Engine
This is Rietveld 408576698