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

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

Issue 986963002: Allow fullscreen manager and control container to be null (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed more comments from tedchoc Created 5 years, 9 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/scene_layer/StaticTabSceneLayer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
index 5a0f42f83ffad1241aeb3822a5ed03542fceec56..a0903c774bc0c4465c88df6838090f1d9998ac68 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
@@ -44,13 +44,16 @@ public class StaticTabSceneLayer extends SceneLayer {
return;
}
+ float contentOffset =
+ fullscreenManager != null ? fullscreenManager.getContentOffset() : 0.f;
+
// TODO(dtrainor, clholgat): remove "* dpToPx" once the native part is fully supporting dp.
nativeUpdateTabLayer(mNativePtr, contentViewport.left, contentViewport.top,
contentViewport.width(), contentViewport.height(), tabContentManager,
layoutTab.getId(), mResToolbarControlContainer, layoutTab.canUseLiveTexture(),
false, layoutTab.getBackgroundColor(), layoutTab.getRenderX() * dpToPx,
layoutTab.getRenderY() * dpToPx, layoutTab.getScaledContentWidth() * dpToPx,
- layoutTab.getScaledContentHeight() * dpToPx, fullscreenManager.getContentOffset(),
+ layoutTab.getScaledContentHeight() * dpToPx, contentOffset,
layoutTab.getStaticToViewBlend(), layoutTab.getSaturation());
}

Powered by Google App Engine
This is Rietveld 408576698