Commit b84c367d authored by Matt Jones's avatar Matt Jones Committed by Commit Bot

Migrate CompositorModelChangeProcessor to Layouts module

Bug: 1070281
Change-Id: I19100a2ab284f430ce50247bb62e85352fb8343f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521283
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: default avatarMei Liang <meiliang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825324}
parent 3f485e99
...@@ -285,7 +285,6 @@ chrome_java_sources = [ ...@@ -285,7 +285,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMetrics.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMetrics.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java",
"java/src/org/chromium/chrome/browser/compositor/layouts/CompositorModelChangeProcessor.java",
"java/src/org/chromium/chrome/browser/compositor/layouts/EmptyOverviewModeObserver.java", "java/src/org/chromium/chrome/browser/compositor/layouts/EmptyOverviewModeObserver.java",
"java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java", "java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java",
"java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java", "java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java",
......
...@@ -42,7 +42,6 @@ chrome_junit_test_java_sources = [ ...@@ -42,7 +42,6 @@ chrome_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/browserservices/ui/view/DisclosureSnackbarTest.java", "junit/src/org/chromium/chrome/browser/browserservices/ui/view/DisclosureSnackbarTest.java",
"junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerImplTest.java", "junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerImplTest.java",
"junit/src/org/chromium/chrome/browser/compositor/CompositorViewHolderUnitTest.java", "junit/src/org/chromium/chrome/browser/compositor/CompositorViewHolderUnitTest.java",
"junit/src/org/chromium/chrome/browser/compositor/layouts/CompositorModelChangeProcessorUnitTest.java",
"junit/src/org/chromium/chrome/browser/compositor/layouts/SceneOverlayTest.java", "junit/src/org/chromium/chrome/browser/compositor/layouts/SceneOverlayTest.java",
"junit/src/org/chromium/chrome/browser/compositor/layouts/StaticLayoutUnitTest.java", "junit/src/org/chromium/chrome/browser/compositor/layouts/StaticLayoutUnitTest.java",
"junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java", "junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java",
......
...@@ -37,6 +37,7 @@ import org.chromium.chrome.browser.compositor.overlays.toolbar.TopToolbarOverlay ...@@ -37,6 +37,7 @@ import org.chromium.chrome.browser.compositor.overlays.toolbar.TopToolbarOverlay
import org.chromium.chrome.browser.compositor.scene_layer.ScrollingBottomViewSceneLayer; import org.chromium.chrome.browser.compositor.scene_layer.ScrollingBottomViewSceneLayer;
import org.chromium.chrome.browser.fullscreen.BrowserControlsManager; import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
import org.chromium.chrome.browser.gesturenav.HistoryNavigationCoordinator; import org.chromium.chrome.browser.gesturenav.HistoryNavigationCoordinator;
import org.chromium.chrome.browser.layouts.CompositorModelChangeProcessor;
import org.chromium.chrome.browser.layouts.EventFilter; import org.chromium.chrome.browser.layouts.EventFilter;
import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.layouts.LayoutStateProvider;
import org.chromium.chrome.browser.layouts.LayoutType; import org.chromium.chrome.browser.layouts.LayoutType;
......
...@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.compositor.LayerTitleCache; ...@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.compositor.LayerTitleCache;
import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab; import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
import org.chromium.chrome.browser.compositor.scene_layer.StaticTabSceneLayer; import org.chromium.chrome.browser.compositor.scene_layer.StaticTabSceneLayer;
import org.chromium.chrome.browser.layouts.CompositorModelChangeProcessor;
import org.chromium.chrome.browser.layouts.EventFilter; import org.chromium.chrome.browser.layouts.EventFilter;
import org.chromium.chrome.browser.layouts.LayoutType; import org.chromium.chrome.browser.layouts.LayoutType;
import org.chromium.chrome.browser.layouts.animation.CompositorAnimationHandler; import org.chromium.chrome.browser.layouts.animation.CompositorAnimationHandler;
......
...@@ -11,8 +11,8 @@ import org.chromium.base.Callback; ...@@ -11,8 +11,8 @@ import org.chromium.base.Callback;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
import org.chromium.chrome.browser.compositor.layouts.CompositorModelChangeProcessor;
import org.chromium.chrome.browser.compositor.layouts.LayoutManager; import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
import org.chromium.chrome.browser.layouts.CompositorModelChangeProcessor;
import org.chromium.chrome.browser.layouts.EventFilter; import org.chromium.chrome.browser.layouts.EventFilter;
import org.chromium.chrome.browser.layouts.SceneOverlay; import org.chromium.chrome.browser.layouts.SceneOverlay;
import org.chromium.chrome.browser.layouts.components.VirtualView; import org.chromium.chrome.browser.layouts.components.VirtualView;
......
...@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider ...@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider
import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab; import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
import org.chromium.chrome.browser.compositor.scene_layer.StaticTabSceneLayer; import org.chromium.chrome.browser.compositor.scene_layer.StaticTabSceneLayer;
import org.chromium.chrome.browser.layouts.CompositorModelChangeProcessor;
import org.chromium.chrome.browser.layouts.animation.CompositorAnimationHandler; import org.chromium.chrome.browser.layouts.animation.CompositorAnimationHandler;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabObserver; import org.chromium.chrome.browser.tab.TabObserver;
...@@ -87,10 +88,10 @@ public class StaticLayoutUnitTest { ...@@ -87,10 +88,10 @@ public class StaticLayoutUnitTest {
@Mock @Mock
private LayoutManagerHost mViewHost; private LayoutManagerHost mViewHost;
@Mock @Mock
private CompositorModelChangeProcessor.FrameRequestSupplier mRequestSupplier;
@Mock
StaticTabSceneLayer mStaticTabSceneLayer; StaticTabSceneLayer mStaticTabSceneLayer;
private CompositorModelChangeProcessor.FrameRequestSupplier mRequestSupplier;
@Mock @Mock
private TabContentManager mTabContentManager; private TabContentManager mTabContentManager;
...@@ -127,6 +128,8 @@ public class StaticLayoutUnitTest { ...@@ -127,6 +128,8 @@ public class StaticLayoutUnitTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mRequestSupplier = new CompositorModelChangeProcessor.FrameRequestSupplier(() -> {});
mCompositorAnimationHandler = new CompositorAnimationHandler(mUpdateHost::requestUpdate); mCompositorAnimationHandler = new CompositorAnimationHandler(mUpdateHost::requestUpdate);
CompositorAnimationHandler.setTestingMode(true); CompositorAnimationHandler.setTestingMode(true);
...@@ -151,7 +154,6 @@ public class StaticLayoutUnitTest { ...@@ -151,7 +154,6 @@ public class StaticLayoutUnitTest {
doReturn(Arrays.asList(mTabModel)).when(mTabModelSelector).getModels(); doReturn(Arrays.asList(mTabModel)).when(mTabModelSelector).getModels();
doNothing().when(mTabModel).addObserver(mTabModelObserverCaptor.capture()); doNothing().when(mTabModel).addObserver(mTabModelObserverCaptor.capture());
doNothing().when(mRequestSupplier).request();
doNothing() doNothing()
.when(mBrowserControlsStateProvider) .when(mBrowserControlsStateProvider)
.addObserver(mBrowserControlsStateProviderObserverCaptor.capture()); .addObserver(mBrowserControlsStateProviderObserverCaptor.capture());
......
...@@ -6,6 +6,7 @@ import("//build/config/android/rules.gni") ...@@ -6,6 +6,7 @@ import("//build/config/android/rules.gni")
android_library("java") { android_library("java") {
sources = [ sources = [
"java/src/org/chromium/chrome/browser/layouts/CompositorModelChangeProcessor.java",
"java/src/org/chromium/chrome/browser/layouts/EventFilter.java", "java/src/org/chromium/chrome/browser/layouts/EventFilter.java",
"java/src/org/chromium/chrome/browser/layouts/LayoutStateProvider.java", "java/src/org/chromium/chrome/browser/layouts/LayoutStateProvider.java",
"java/src/org/chromium/chrome/browser/layouts/LayoutType.java", "java/src/org/chromium/chrome/browser/layouts/LayoutType.java",
...@@ -53,6 +54,7 @@ java_library("junit") { ...@@ -53,6 +54,7 @@ java_library("junit") {
testonly = true testonly = true
sources = [ sources = [
"java/src/org/chromium/chrome/browser/layouts/CompositorModelChangeProcessorUnitTest.java",
"java/src/org/chromium/chrome/browser/layouts/animation/CompositorAnimationHandlerTest.java", "java/src/org/chromium/chrome/browser/layouts/animation/CompositorAnimationHandlerTest.java",
"java/src/org/chromium/chrome/browser/layouts/animation/CompositorAnimatorTest.java", "java/src/org/chromium/chrome/browser/layouts/animation/CompositorAnimatorTest.java",
] ]
...@@ -66,5 +68,6 @@ java_library("junit") { ...@@ -66,5 +68,6 @@ java_library("junit") {
"//third_party/android_support_test_runner:runner_java", "//third_party/android_support_test_runner:runner_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//ui/android:ui_java",
] ]
} }
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
package org.chromium.chrome.browser.compositor.layouts; package org.chromium.chrome.browser.layouts;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplier;
...@@ -39,7 +38,6 @@ public class CompositorModelChangeProcessor<V extends SceneLayer> { ...@@ -39,7 +38,6 @@ public class CompositorModelChangeProcessor<V extends SceneLayer> {
/** /**
* Request to generate a new frame. * Request to generate a new frame.
*/ */
@VisibleForTesting
void request() { void request() {
mRenderRequestRunnable.run(); mRenderRequestRunnable.run();
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
package org.chromium.chrome.browser.compositor.layouts; package org.chromium.chrome.browser.layouts;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment