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

Side by Side Diff: cc/layer_tree_host_unittest.cc

Issue 11467019: Marking LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers test as flaky (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layer_tree_host.h" 5 #include "cc/layer_tree_host.h"
6 6
7 #include "base/synchronization/lock.h" 7 #include "base/synchronization/lock.h"
8 #include "cc/content_layer.h" 8 #include "cc/content_layer.h"
9 #include "cc/content_layer_client.h" 9 #include "cc/content_layer_client.h"
10 #include "cc/layer_impl.h" 10 #include "cc/layer_impl.h"
(...skipping 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 m_rootLayer = NULL; 1369 m_rootLayer = NULL;
1370 m_childLayer = NULL; 1370 m_childLayer = NULL;
1371 } 1371 }
1372 1372
1373 private: 1373 private:
1374 FakeContentLayerClient m_client; 1374 FakeContentLayerClient m_client;
1375 scoped_refptr<NoScaleContentLayer> m_rootLayer; 1375 scoped_refptr<NoScaleContentLayer> m_rootLayer;
1376 scoped_refptr<ContentLayer> m_childLayer; 1376 scoped_refptr<ContentLayer> m_childLayer;
1377 }; 1377 };
1378 1378
1379 TEST_F(LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers, runMultiThread ) 1379 // http://crbug.com/164851.
1380 TEST_F(LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers, FLAKY_runMulti Thread)
1380 { 1381 {
1381 runTest(true); 1382 runTest(true);
1382 } 1383 }
1383 1384
1384 // Verify atomicity of commits and reuse of textures. 1385 // Verify atomicity of commits and reuse of textures.
1385 class LayerTreeHostTestAtomicCommit : public LayerTreeHostTest { 1386 class LayerTreeHostTestAtomicCommit : public LayerTreeHostTest {
1386 public: 1387 public:
1387 LayerTreeHostTestAtomicCommit() 1388 LayerTreeHostTestAtomicCommit()
1388 : m_layer(ContentLayerWithUpdateTracking::create(&m_client)) 1389 : m_layer(ContentLayerWithUpdateTracking::create(&m_client))
1389 { 1390 {
(...skipping 1962 matching lines...) Expand 10 before | Expand all | Expand 10 after
3352 LayerTreeSettings settings; 3353 LayerTreeSettings settings;
3353 settings.maxPartialTextureUpdates = 4; 3354 settings.maxPartialTextureUpdates = 4;
3354 3355
3355 scoped_ptr<LayerTreeHost> host = LayerTreeHost::create(&client, settings, sc oped_ptr<Thread>()); 3356 scoped_ptr<LayerTreeHost> host = LayerTreeHost::create(&client, settings, sc oped_ptr<Thread>());
3356 EXPECT_TRUE(host->initializeRendererIfNeeded()); 3357 EXPECT_TRUE(host->initializeRendererIfNeeded());
3357 EXPECT_EQ(4u, host->settings().maxPartialTextureUpdates); 3358 EXPECT_EQ(4u, host->settings().maxPartialTextureUpdates);
3358 } 3359 }
3359 3360
3360 } // namespace 3361 } // namespace
3361 } // namespace cc 3362 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698