Skip to content

Commit

Permalink
Remove flaky webview-only cc_unittest that shouldnt run single-thread
Browse files Browse the repository at this point in the history
LayerTreeHostFreesWorkerContextResourcesOnZeroMemoryLimitSynchronous
test was set to run with SINGLE_AND_MULTI_THREAD_TEST_F but since it
is testing webview-only things, this caused DCHECKs to fail, in single-
threaded compositor code that does not expect to be called. Disable
the single-threaded version of the test, as WebView only uses/supports
multi-threaded cc.

R=enne@chromium.org

Bug: 778404
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ie4076509ed550977acd61f1958165636e6265122
Reviewed-on: https://chromium-review.googlesource.com/1028186
Commit-Queue: enne <enne@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554096}
  • Loading branch information
danakj authored and Commit Bot committed Apr 26, 2018
1 parent 4d98e23 commit a5df537
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion cc/trees/layer_tree_host_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,8 @@ class LayerTreeHostFreesWorkerContextResourcesOnZeroMemoryLimitSynchronous
}
};

SINGLE_AND_MULTI_THREAD_TEST_F(
// Android Webview only runs in multi-threaded compositing mode.
MULTI_THREAD_TEST_F(
LayerTreeHostFreesWorkerContextResourcesOnZeroMemoryLimitSynchronous);

// Test if the LTH successfully frees main and worker resources when the
Expand Down
4 changes: 3 additions & 1 deletion cc/trees/single_thread_proxy.cc
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,9 @@ void SingleThreadProxy::ScheduledActionPrepareTiles() {
}

void SingleThreadProxy::ScheduledActionInvalidateLayerTreeFrameSink() {
NOTREACHED();
// This is an Android WebView codepath, which only uses multi-thread
// compositor. So this should not occur in single-thread mode.
NOTREACHED() << "Android Webview use-case, so multi-thread only";
}

void SingleThreadProxy::ScheduledActionPerformImplSideInvalidation() {
Expand Down

0 comments on commit a5df537

Please sign in to comment.