Commit c0aeeeb9 authored by Mario Bianucci's avatar Mario Bianucci Committed by Commit Bot

De-flake LayerTreeHostTestDelegatedInkMetadataOnAndOff.RunSingleThread*

SetNeedsDisplay() was being called many times, when every other test
limits it to a certain number of times. This test should only call it
once, and doing so prevents it from running wildly and flaking on the
single threaded versions.

Bug: 1111302, 1112507
Change-Id: I2038c89e73b7b92b03133a4cf8487a9a54467fb0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2343221Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Commit-Queue: Mario Bianucci <mabian@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#796523}
parent 642d7582
...@@ -8986,7 +8986,10 @@ class LayerTreeHostTestDelegatedInkMetadataOnAndOff ...@@ -8986,7 +8986,10 @@ class LayerTreeHostTestDelegatedInkMetadataOnAndOff
void DidCommitAndDrawFrame() override { void DidCommitAndDrawFrame() override {
// Cause a redraw to occur. // Cause a redraw to occur.
layer_->SetNeedsDisplay(); if (set_needs_display_) {
layer_->SetNeedsDisplay();
set_needs_display_ = false;
}
} }
void DrawLayersOnThread(LayerTreeHostImpl* impl) override { void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
...@@ -9014,8 +9017,6 @@ class LayerTreeHostTestDelegatedInkMetadataOnAndOff ...@@ -9014,8 +9017,6 @@ class LayerTreeHostTestDelegatedInkMetadataOnAndOff
} }
} }
void AfterTest() override {}
// RenderFrameMetadataObserver implementation. // RenderFrameMetadataObserver implementation.
void BindToCurrentThread() override {} void BindToCurrentThread() override {}
void OnRenderFrameSubmission( void OnRenderFrameSubmission(
...@@ -9030,6 +9031,7 @@ class LayerTreeHostTestDelegatedInkMetadataOnAndOff ...@@ -9030,6 +9031,7 @@ class LayerTreeHostTestDelegatedInkMetadataOnAndOff
base::Optional<viz::DelegatedInkMetadata> expected_metadata_; base::Optional<viz::DelegatedInkMetadata> expected_metadata_;
FakeContentLayerClient client_; FakeContentLayerClient client_;
scoped_refptr<Layer> layer_; scoped_refptr<Layer> layer_;
bool set_needs_display_ = true;
}; };
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDelegatedInkMetadataOnAndOff); SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDelegatedInkMetadataOnAndOff);
......
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