Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3145)

Unified Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 99553002: cc: Prevent ResourceUpdateContoller from uploading textures after lost context (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/single_thread_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_context.cc
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 44347d3e88493e6e617298c1b1cda2ac18812b4d..eb7f0d94c54525cb2a23e5a6b5653288ccad0b49 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -937,10 +937,10 @@ TEST_F(LayerTreeHostContextTestLostContextAndEvictTextures,
RunTest(true, true, true);
}
-class DISABLED_LayerTreeHostContextTestLostContextWhileUpdatingResources
+class LayerTreeHostContextTestLostContextWhileUpdatingResources
: public LayerTreeHostContextTest {
public:
- DISABLED_LayerTreeHostContextTestLostContextWhileUpdatingResources()
+ LayerTreeHostContextTestLostContextWhileUpdatingResources()
: parent_(FakeContentLayer::Create(&client_)),
num_children_(50),
times_to_lose_on_end_query_(3) {}
@@ -974,8 +974,8 @@ class DISABLED_LayerTreeHostContextTestLostContextWhileUpdatingResources
PostSetNeedsCommitToMainThread();
}
- virtual void CommitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE {
- LayerTreeHostContextTest::CommitCompleteOnThread(impl);
+ virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+ EXPECT_EQ(0, times_to_lose_on_end_query_);
EndTest();
}
@@ -994,9 +994,8 @@ class DISABLED_LayerTreeHostContextTestLostContextWhileUpdatingResources
int times_to_lose_on_end_query_;
};
-// Disabled (crbug.com/313790)
SINGLE_AND_MULTI_THREAD_NOIMPL_TEST_F(
- DISABLED_LayerTreeHostContextTestLostContextWhileUpdatingResources);
+ LayerTreeHostContextTestLostContextWhileUpdatingResources);
class LayerTreeHostContextTestLayersNotified
: public LayerTreeHostContextTest {
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/single_thread_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698