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

Side by Side Diff: cc/texture_uploader_unittest.cc

Issue 11367054: cc: Move textureUploadFlushPeriod to TextureUploader. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | « cc/texture_uploader.cc ('k') | 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "config.h" 5 #include "config.h"
6 6
7 #include "cc/texture_uploader.h" 7 #include "cc/texture_uploader.h"
8 8
9 #include "cc/prioritized_texture.h" 9 #include "cc/prioritized_texture.h"
10 #include "cc/test/fake_web_graphics_context_3d.h" 10 #include "cc/test/fake_web_graphics_context_3d.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 gfx::Rect(gfx::Point(0, 0), size), 49 gfx::Rect(gfx::Point(0, 0), size),
50 gfx::Rect(gfx::Point(0, 0), size), 50 gfx::Rect(gfx::Point(0, 0), size),
51 gfx::Vector2d(), 51 gfx::Vector2d(),
52 GL_RGBA, 52 GL_RGBA,
53 size); 53 size);
54 } 54 }
55 55
56 TEST(TextureUploaderTest, NumBlockingUploads) 56 TEST(TextureUploaderTest, NumBlockingUploads)
57 { 57 {
58 scoped_ptr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(new FakeWeb GraphicsContext3DWithQueryTesting); 58 scoped_ptr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(new FakeWeb GraphicsContext3DWithQueryTesting);
59 scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.g et(), false); 59 scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.g et(), false, false);
60 60
61 fakeContext->setResultAvailable(0); 61 fakeContext->setResultAvailable(0);
62 EXPECT_EQ(0, uploader->numBlockingUploads()); 62 EXPECT_EQ(0, uploader->numBlockingUploads());
63 uploadTexture(uploader.get()); 63 uploadTexture(uploader.get());
64 EXPECT_EQ(1, uploader->numBlockingUploads()); 64 EXPECT_EQ(1, uploader->numBlockingUploads());
65 uploadTexture(uploader.get()); 65 uploadTexture(uploader.get());
66 EXPECT_EQ(2, uploader->numBlockingUploads()); 66 EXPECT_EQ(2, uploader->numBlockingUploads());
67 67
68 fakeContext->setResultAvailable(1); 68 fakeContext->setResultAvailable(1);
69 EXPECT_EQ(0, uploader->numBlockingUploads()); 69 EXPECT_EQ(0, uploader->numBlockingUploads());
70 uploadTexture(uploader.get()); 70 uploadTexture(uploader.get());
71 EXPECT_EQ(0, uploader->numBlockingUploads()); 71 EXPECT_EQ(0, uploader->numBlockingUploads());
72 uploadTexture(uploader.get()); 72 uploadTexture(uploader.get());
73 uploadTexture(uploader.get()); 73 uploadTexture(uploader.get());
74 EXPECT_EQ(0, uploader->numBlockingUploads()); 74 EXPECT_EQ(0, uploader->numBlockingUploads());
75 } 75 }
76 76
77 TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking) 77 TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking)
78 { 78 {
79 scoped_ptr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(new FakeWeb GraphicsContext3DWithQueryTesting); 79 scoped_ptr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(new FakeWeb GraphicsContext3DWithQueryTesting);
80 scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.g et(), false); 80 scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.g et(), false, false);
81 81
82 fakeContext->setResultAvailable(0); 82 fakeContext->setResultAvailable(0);
83 EXPECT_EQ(0, uploader->numBlockingUploads()); 83 EXPECT_EQ(0, uploader->numBlockingUploads());
84 uploadTexture(uploader.get()); 84 uploadTexture(uploader.get());
85 uploadTexture(uploader.get()); 85 uploadTexture(uploader.get());
86 EXPECT_EQ(2, uploader->numBlockingUploads()); 86 EXPECT_EQ(2, uploader->numBlockingUploads());
87 87
88 uploader->markPendingUploadsAsNonBlocking(); 88 uploader->markPendingUploadsAsNonBlocking();
89 EXPECT_EQ(0, uploader->numBlockingUploads()); 89 EXPECT_EQ(0, uploader->numBlockingUploads());
90 uploadTexture(uploader.get()); 90 uploadTexture(uploader.get());
91 EXPECT_EQ(1, uploader->numBlockingUploads()); 91 EXPECT_EQ(1, uploader->numBlockingUploads());
92 92
93 fakeContext->setResultAvailable(1); 93 fakeContext->setResultAvailable(1);
94 EXPECT_EQ(0, uploader->numBlockingUploads()); 94 EXPECT_EQ(0, uploader->numBlockingUploads());
95 uploadTexture(uploader.get()); 95 uploadTexture(uploader.get());
96 uploader->markPendingUploadsAsNonBlocking(); 96 uploader->markPendingUploadsAsNonBlocking();
97 EXPECT_EQ(0, uploader->numBlockingUploads()); 97 EXPECT_EQ(0, uploader->numBlockingUploads());
98 } 98 }
99 99
100 } // namespace 100 } // namespace
OLDNEW
« no previous file with comments | « cc/texture_uploader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698