chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java - Issue 2742133002: Revert of Improve transition between opaque and translucent compositor views.

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

Issue 2742133002: Revert of Improve transition between opaque and translucent compositor views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 3 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManager.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java

index 1d520a3c421d41c55847818c75fdebb86c94087f..8fb536635630804908b240569e364c7eb7b11c28 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -9,7 +9,6 @@

import android.graphics.Color;

import android.graphics.PixelFormat;

import android.graphics.Rect;

-import android.graphics.drawable.Drawable;

import android.os.Build;

import android.view.Display;

import android.view.MotionEvent;

@@ -18,9 +17,9 @@

import android.view.SurfaceView;

import android.view.View;

import android.view.WindowManager;

-import android.widget.FrameLayout;

import org.chromium.base.CommandLine;

+import org.chromium.base.Log;

import org.chromium.base.TraceEvent;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

@@ -48,21 +47,13 @@

* The is the {@link View} displaying the ui compositor results; including webpages and tabswitcher.

@JNINamespace("android")

-public class CompositorView extends FrameLayout implements SurfaceHolder.Callback2 {

+public class CompositorView extends SurfaceView implements SurfaceHolder.Callback2 {

private static final String TAG = "CompositorView";

private static final long NANOSECONDS_PER_MILLISECOND = 1000000;

// Cache objects that should not be created every frame

private final Rect mCacheAppRect = new Rect();

private final int[] mCacheViewPosition = new int[2];

- private CompositorSurfaceManager mCompositorSurfaceManager;

- private boolean mOverlayVideoEnabled;

- private boolean mAlwaysTranslucent;

- // Are we waiting to hide the outgoing surface until the foreground has something to display?

- // If == 0, then no. If > 0, then yes. We'll hide when it transitions from one to zero.

- private int mFramesUntilHideBackground;

private long mNativeCompositorView;

private final LayoutRenderHost mRenderHost;

@@ -82,8 +73,13 @@

private TabContentManager mTabContentManager;

private View mRootView;

+ private int mSurfaceWidth;

+ private int mSurfaceHeight;

private boolean mPreloadedResources;

private List<Runnable> mDrawingFinishedCallbacks;

+ // The current SurfaceView pixel format. Defaults to OPAQUE.

+ private int mCurrentPixelFormat = PixelFormat.OPAQUE;

/**

* Creates a {@link CompositorView}. This can be called only after the native library is

@@ -95,8 +91,8 @@

super(c);

mRenderHost = host;

resetFlags();

setVisibility(View.INVISIBLE);

+ setZOrderMediaOverlay(true);

}

/**

@@ -165,7 +161,7 @@

* Should be called for cleanup when the CompositorView instance is no longer used.

public void shutDown() {

- mCompositorSurfaceManager.shutDown();

+ getHolder().removeCallback(this);

if (mNativeCompositorView != 0) nativeDestroy(mNativeCompositorView);

mNativeCompositorView = 0;

}

@@ -186,23 +182,9 @@

mNativeCompositorView = nativeInit(lowMemDevice,

windowAndroid.getNativePointer(), layerTitleCache, tabContentManager);

- // compositor_impl_android.cc will use 565 EGL surfaces if and only if we're using a low

- // memory device, and no alpha channel is desired. Otherwise, it will use 8888. Since

- // SurfaceFlinger doesn't need the eOpaque flag to optimize out alpha blending during

- // composition if the buffer has no alpha channel, we can avoid using the extra background

- // surface (and the memory it requires) in the low memory case. The output buffer will

- // either have an alpha channel or not, depending on whether the compositor needs it. We

- // can keep the surface translucent all the times without worrying about the impact on power

- // usage during SurfaceFlinger composition. We might also want to set |mAlwaysTranslucent|

- // on non-low memory devices, if we are running on hardware that implements efficient alpha

- // blending.

- mAlwaysTranslucent = lowMemDevice;

- mCompositorSurfaceManager = new CompositorSurfaceManager(this, this);

- // In case the background drawable was set before now, update it.

- mCompositorSurfaceManager.setBackgroundDrawable(getBackground());

- mCompositorSurfaceManager.setWillNotDraw(willNotDraw());

- mCompositorSurfaceManager.requestSurface(getSurfacePixelFormat());

+ assert !getHolder().getSurface().isValid()

+ : "Surface created before native library loaded.";

+ getHolder().addCallback(this);

// Cover the black surface before it has valid content.

setBackgroundColor(Color.WHITE);

@@ -233,30 +215,13 @@

}

/**

- * @see SurfaceView#getHolder

- */

- SurfaceHolder getHolder() {

- return mCompositorSurfaceManager.getHolder();

- }

- /**

* Enables/disables overlay video mode. Affects alpha blending on this view.

* @param enabled Whether to enter or leave overlay video mode.

public void setOverlayVideoMode(boolean enabled) {

+ mCurrentPixelFormat = enabled ? PixelFormat.TRANSLUCENT : PixelFormat.OPAQUE;

+ getHolder().setFormat(mCurrentPixelFormat);

nativeSetOverlayVideoMode(mNativeCompositorView, enabled);

- mOverlayVideoEnabled = enabled;

- // Request the new surface, even if it's the same as the old one. We'll get a synthetic

- // destroy / create / changed callback in that case, possibly before this returns.

- mCompositorSurfaceManager.requestSurface(getSurfacePixelFormat());

- // Note that we don't know if we'll get a surfaceCreated / surfaceDestoyed for this surface.

- // We do know that if we do get one, then it will be for the surface that we just requested.

- }

- private int getSurfacePixelFormat() {

- return (mOverlayVideoEnabled || mAlwaysTranslucent) ? PixelFormat.TRANSLUCENT

- : PixelFormat.OPAQUE;

}

@Override

@@ -275,24 +240,22 @@

@Override

public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {

if (mNativeCompositorView == 0) return;

nativeSurfaceChanged(mNativeCompositorView, format, width, height, holder.getSurface());

mRenderHost.onPhysicalBackingSizeChanged(width, height);

+ mSurfaceWidth = width;

+ mSurfaceHeight = height;

}

@Override

public void surfaceCreated(SurfaceHolder holder) {

if (mNativeCompositorView == 0) return;

nativeSurfaceCreated(mNativeCompositorView);

- mFramesUntilHideBackground = 2;

mRenderHost.onSurfaceCreated();

}

@Override

public void surfaceDestroyed(SurfaceHolder holder) {

if (mNativeCompositorView == 0) return;

nativeSurfaceDestroyed(mNativeCompositorView);

}

@@ -321,7 +284,29 @@

@CalledByNative

private void onJellyBeanSurfaceDisconnectWorkaround(boolean inOverlayMode) {

- mCompositorSurfaceManager.recreateSurfaceForJellyBean();

+ // There is a bug in JellyBean because of which we will not be able to

+ // reconnect to the existing Surface after we launch a new GPU process.

+ // We simply trick the JB Android code to allocate a new Surface.

+ // It does a strict comparison between the current format and the requested

+ // one, even if they are the same in practice. Furthermore, the format

+ // does not matter here since the producer-side EGL config overwrites it

+ // (but transparency might matter).

+ switch (mCurrentPixelFormat) {

+ case PixelFormat.OPAQUE:

+ mCurrentPixelFormat = PixelFormat.RGBA_8888;

+ break;

+ case PixelFormat.RGBA_8888:

+ mCurrentPixelFormat = inOverlayMode

+ ? PixelFormat.TRANSLUCENT : PixelFormat.OPAQUE;

+ break;

+ case PixelFormat.TRANSLUCENT:

+ mCurrentPixelFormat = PixelFormat.RGBA_8888;

+ break;

+ default:

+ assert false;

+ Log.e(TAG, "Unknown current pixel format.");

+ }

+ getHolder().setFormat(mCurrentPixelFormat);

}

/**

@@ -348,20 +333,6 @@

@CalledByNative

private void didSwapBuffers() {

- // If we're in the middle of a surface swap, then see if we've received a new frame yet for

- // the new surface before hiding the outgoing surface.

- if (mFramesUntilHideBackground > 1) {

- // We need at least one more frame before we hide the outgoing surface. Make sure that

- // there will be a frame.

- mFramesUntilHideBackground--;

- requestRender();

- } else if (mFramesUntilHideBackground == 1) {

- // We can hide the outgoing surface, since the incoming one has a frame. It's okay if

- // we've don't have an unowned surface.

- mFramesUntilHideBackground = 0;

- mCompositorSurfaceManager.doneWithUnownedSurface();

- }

List<Runnable> runnables = mDrawingFinishedCallbacks;

mDrawingFinishedCallbacks = null;

if (runnables == null) return;

@@ -408,24 +379,6 @@

TabModelImpl.flushActualTabSwitchLatencyMetric();

nativeFinalizeLayers(mNativeCompositorView);

TraceEvent.end("CompositorView:finalizeLayers");

- }

- @Override

- public void setWillNotDraw(boolean willNotDraw) {

- if (mCompositorSurfaceManager != null) {

- mCompositorSurfaceManager.setWillNotDraw(willNotDraw);

- }

- @Override

- public void setBackgroundDrawable(Drawable background) {

- // We override setBackgroundDrawable since that's the common entry point from all the

- // setBackground* calls in View. We still call to setBackground on the SurfaceView because

- // SetBackgroundDrawable is deprecated, and the semantics are the same I think.

- super.setBackgroundDrawable(background);

- if (mCompositorSurfaceManager != null) {

- mCompositorSurfaceManager.setBackgroundDrawable(background);

- }

}

// Implemented in native