-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Tab Content Manager] Fetch live layer only when requested
Change the GetLiveLayer call to fetch via TabId rather than caching all the ContentLayers in the TabContentManager. This addresses this TODO which can be removed once the flag lands: https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManagerHandler.java;drc=0c1da58afce2ab7b22754e0e6ae0b72631a27812;l=58 Unfortunately, unit testing for this is infeasible due to JNI dependencies for TabContentManager and Tab in C++ that aren't feasible to create. However, I was able to write a test to readback the GPU buffer to confirm the live layer is attached to the Compositor via a render test. Bug: 1402843 Change-Id: I4079fa17059d35be8fa679f42026b9d04d6638f0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4247157 Reviewed-by: David Trainor <dtrainor@chromium.org> Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org> Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#1108683}
- Loading branch information
1 parent
a552aef
commit 6feb2c9
Showing
5 changed files
with
171 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
140 changes: 140 additions & 0 deletions
140
...sts/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManagerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| // Copyright 2023 The Chromium Authors | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package org.chromium.chrome.browser.compositor.layouts.content; | ||
|
|
||
| import android.graphics.Bitmap; | ||
| import android.os.Handler; | ||
| import android.view.PixelCopy; | ||
| import android.view.SurfaceView; | ||
|
|
||
| import androidx.test.filters.MediumTest; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import org.chromium.base.test.util.Batch; | ||
| import org.chromium.base.test.util.CallbackHelper; | ||
| import org.chromium.base.test.util.CommandLineFlags; | ||
| import org.chromium.base.test.util.Feature; | ||
| import org.chromium.chrome.R; | ||
| import org.chromium.chrome.browser.compositor.CompositorView; | ||
| import org.chromium.chrome.browser.compositor.CompositorViewHolder; | ||
| import org.chromium.chrome.browser.flags.ChromeFeatureList; | ||
| import org.chromium.chrome.browser.flags.ChromeSwitches; | ||
| import org.chromium.chrome.test.ChromeJUnit4ClassRunner; | ||
| import org.chromium.chrome.test.ChromeTabbedActivityTestRule; | ||
| import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule; | ||
| import org.chromium.chrome.test.util.browser.Features; | ||
| import org.chromium.content_public.browser.test.util.TestThreadUtils; | ||
| import org.chromium.ui.test.util.RenderTestRule; | ||
|
|
||
| /** | ||
| * Tests for the {@link TabContentManager}. | ||
| * TODO(crbug.com/1402843): Tests are being added in the process of refactoring | ||
| * and optimizing the TabContentManager for modern usage. Add more tests here. | ||
| */ | ||
| @RunWith(ChromeJUnit4ClassRunner.class) | ||
| @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) | ||
| @Batch(Batch.PER_CLASS) | ||
| @Features.EnableFeatures(ChromeFeatureList.THUMBNAIL_CACHE_REFACTOR) | ||
| public class TabContentManagerTest { | ||
| @ClassRule | ||
| public static ChromeTabbedActivityTestRule sActivityTestRule = | ||
| new ChromeTabbedActivityTestRule(); | ||
|
|
||
| @Rule | ||
| public BlankCTATabInitialStateRule mBlankCTATabInitialStateRule = | ||
| new BlankCTATabInitialStateRule(sActivityTestRule, false); | ||
|
|
||
| @Rule | ||
| public RenderTestRule mRenderTestRule = | ||
| new RenderTestRule.Builder() | ||
| .setCorpus(RenderTestRule.Corpus.ANDROID_RENDER_TESTS_PUBLIC) | ||
| .setBugComponent(RenderTestRule.Component.UI_BROWSER_THUMBNAIL) | ||
| .setRevision(1) | ||
| .setDescription("Initial test creation") | ||
| .build(); | ||
|
|
||
| /** | ||
| * With {@link ChromeFeatureList.THUMBNAIL_CACHE_REFACTOR} enabled the live layer is vended | ||
| * to the compositor via a pull mechanism rather than a push mechanism. Ensure the tab still | ||
| * draws its live layer. | ||
| */ | ||
| @Test | ||
| @MediumTest | ||
| @Feature({"RenderTest"}) | ||
| public void testLiveLayerDraws() throws Exception { | ||
| final String testHttpsUrl1 = | ||
| sActivityTestRule.getTestServer().getURL("/chrome/test/data/android/test.html"); | ||
| sActivityTestRule.loadUrlInNewTab(testHttpsUrl1); | ||
| mRenderTestRule.compareForResult(captureBitmap(), "contentViewTab1"); | ||
|
|
||
| final String testHttpsUrl2 = | ||
| sActivityTestRule.getTestServer().getURL("/chrome/test/data/android/google.html"); | ||
| sActivityTestRule.loadUrlInNewTab(testHttpsUrl2); | ||
| mRenderTestRule.compareForResult(captureBitmap(), "contentViewTab2"); | ||
| } | ||
|
|
||
| /** | ||
| * Generate a bitmap of the {@link SurfaceView} using {@link PixelCopy} as the normal path for | ||
| * capturing bitmaps doesn't work for GPU accelerated content. | ||
| */ | ||
| private Bitmap captureBitmap() throws Exception { | ||
| CallbackHelper helper = new CallbackHelper(); | ||
| Bitmap[] bitmapHolder = new Bitmap[1]; | ||
| CompositorView compositorView = | ||
| ((CompositorViewHolder) sActivityTestRule.getActivity().findViewById( | ||
| R.id.compositor_view_holder)) | ||
| .getCompositorView(); | ||
| Assert.assertNotNull(compositorView); | ||
| // Put the compositor view in a mode that supports readback (this is used by the magnifier | ||
| // normally). Note that this might fail if surface control isn't supported by the GPU under | ||
| // test. | ||
| TestThreadUtils.runOnUiThreadBlocking( | ||
| () -> { compositorView.onSelectionHandlesStateChanged(true); }); | ||
| // TODO(crbug.com/1402843): It unfortunately may take time for the SurfaceView buffer to | ||
| // contain anything and there is no signal to listen to. | ||
| Thread.sleep(1000); | ||
| // Capture the surface using PixelCopy repeating until it works. | ||
| TestThreadUtils.runOnUiThreadBlocking(() -> { | ||
| SurfaceView surfaceView = (SurfaceView) compositorView.getActiveSurfaceView(); | ||
| Assert.assertNotNull(surfaceView); | ||
| // Assume surface view size will be constant and only allocate the bitmap once. | ||
| bitmapHolder[0] = Bitmap.createBitmap( | ||
| surfaceView.getWidth(), surfaceView.getHeight(), Bitmap.Config.ARGB_8888); | ||
| captureBitmapInner(compositorView, bitmapHolder, helper, new Handler()); | ||
| }); | ||
| helper.waitForFirst(); | ||
| Assert.assertNotNull(bitmapHolder[0]); | ||
| TestThreadUtils.runOnUiThreadBlocking( | ||
| () -> { compositorView.onSelectionHandlesStateChanged(false); }); | ||
| return bitmapHolder[0]; | ||
| } | ||
|
|
||
| private void captureBitmapInner(CompositorView compositorView, Bitmap[] bitmapHolder, | ||
| CallbackHelper helper, Handler handler) { | ||
| SurfaceView surfaceView = (SurfaceView) compositorView.getActiveSurfaceView(); | ||
| Assert.assertNotNull(surfaceView); | ||
| PixelCopy.OnPixelCopyFinishedListener listener = | ||
| new PixelCopy.OnPixelCopyFinishedListener() { | ||
| @Override | ||
| public void onPixelCopyFinished(int copyResult) { | ||
| if (copyResult == PixelCopy.SUCCESS) { | ||
| helper.notifyCalled(); | ||
| return; | ||
| } | ||
| // Backoff if the surface buffer isn't working yet. The test will time out | ||
| // if this takes too long. | ||
| handler.postDelayed(() -> { | ||
| captureBitmapInner(compositorView, bitmapHolder, helper, handler); | ||
| }, 500); | ||
| } | ||
| }; | ||
| PixelCopy.request(surfaceView, bitmapHolder[0], listener, handler); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters