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

Unified Diff: cc/layers/tiled_layer_unittest.cc

Issue 13206004: cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months 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/layers/tiled_layer_impl.cc ('k') | cc/layers/video_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/tiled_layer_unittest.cc
diff --git a/cc/layers/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc
index dab98f566f11e56234df6de966a0c32acdb17a83..650f1cbad07f61e288898c5e1d03ec9542ead2cb 100644
--- a/cc/layers/tiled_layer_unittest.cc
+++ b/cc/layers/tiled_layer_unittest.cc
@@ -578,8 +578,9 @@ TEST_F(TiledLayerTest, PaintSmallAnimatedLayersImmediately) {
int layer_width = 5 * FakeTiledLayer::tile_size().width();
int layer_height = 5 * FakeTiledLayer::tile_size().height();
int memory_for_layer = layer_width * layer_height * 4;
- layer_tree_host_->SetViewportSize(gfx::Size(layer_width, layer_height),
- gfx::Size(layer_width, layer_height));
+ layer_tree_host_->SetViewportSize(
+ gfx::Size(viewport_width, viewport_height),
+ gfx::Size(viewport_width, viewport_height));
// Use 10x5 tiles to run out of memory.
if (run_out_of_memory[i])
@@ -958,8 +959,8 @@ TEST_F(TiledLayerPartialUpdateTest, PartialUpdates) {
{
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
- EXPECT_EQ(6, queue_->FullUploadSize());
- EXPECT_EQ(0, queue_->PartialUploadSize());
+ EXPECT_EQ(6u, queue_->FullUploadSize());
+ EXPECT_EQ(0u, queue_->PartialUploadSize());
UpdateTextures();
EXPECT_EQ(6, layer->fake_layer_updater()->update_count());
EXPECT_FALSE(queue_->HasMoreUpdates());
@@ -975,8 +976,8 @@ TEST_F(TiledLayerPartialUpdateTest, PartialUpdates) {
{
scoped_ptr<FakeTiledLayerImpl> layer_impl =
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
- EXPECT_EQ(3, queue_->FullUploadSize());
- EXPECT_EQ(3, queue_->PartialUploadSize());
+ EXPECT_EQ(3u, queue_->FullUploadSize());
+ EXPECT_EQ(3u, queue_->PartialUploadSize());
UpdateTextures();
EXPECT_EQ(6, layer->fake_layer_updater()->update_count());
EXPECT_FALSE(queue_->HasMoreUpdates());
@@ -992,8 +993,8 @@ TEST_F(TiledLayerPartialUpdateTest, PartialUpdates) {
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
layer_tree_host_->UpdateLayers(queue_.get(),
std::numeric_limits<size_t>::max());
- EXPECT_EQ(2, queue_->FullUploadSize());
- EXPECT_EQ(4, queue_->PartialUploadSize());
+ EXPECT_EQ(2u, queue_->FullUploadSize());
+ EXPECT_EQ(4u, queue_->PartialUploadSize());
UpdateTextures();
EXPECT_EQ(6, layer->fake_layer_updater()->update_count());
EXPECT_FALSE(queue_->HasMoreUpdates());
@@ -1018,8 +1019,8 @@ TEST_F(TiledLayerPartialUpdateTest, PartialUpdates) {
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
layer_tree_host_->UpdateLayers(queue_.get(),
std::numeric_limits<size_t>::max());
- EXPECT_EQ(6, queue_->FullUploadSize());
- EXPECT_EQ(0, queue_->PartialUploadSize());
+ EXPECT_EQ(6u, queue_->FullUploadSize());
+ EXPECT_EQ(0u, queue_->PartialUploadSize());
UpdateTextures();
EXPECT_EQ(6, layer->fake_layer_updater()->update_count());
EXPECT_FALSE(queue_->HasMoreUpdates());
@@ -1035,8 +1036,8 @@ TEST_F(TiledLayerPartialUpdateTest, PartialUpdates) {
make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
layer_tree_host_->UpdateLayers(queue_.get(),
std::numeric_limits<size_t>::max());
- EXPECT_EQ(0, queue_->FullUploadSize());
- EXPECT_EQ(4, queue_->PartialUploadSize());
+ EXPECT_EQ(0u, queue_->FullUploadSize());
+ EXPECT_EQ(4u, queue_->PartialUploadSize());
UpdateTextures();
EXPECT_EQ(4, layer->fake_layer_updater()->update_count());
EXPECT_FALSE(queue_->HasMoreUpdates());
« no previous file with comments | « cc/layers/tiled_layer_impl.cc ('k') | cc/layers/video_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698