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

Side by Side Diff: cc/texture_uploader_unittest.cc

Issue 11266030: Use gfx:: Geometry types for the resource provider and layer updater classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: uint8 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') | cc/tiled_layer.cc » ('j') | 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 26 matching lines...) Expand all
37 } 37 }
38 38
39 void setResultAvailable(unsigned resultAvailable) { m_resultAvailable = resu ltAvailable; } 39 void setResultAvailable(unsigned resultAvailable) { m_resultAvailable = resu ltAvailable; }
40 40
41 private: 41 private:
42 unsigned m_resultAvailable; 42 unsigned m_resultAvailable;
43 }; 43 };
44 44
45 void uploadTexture(TextureUploader* uploader) 45 void uploadTexture(TextureUploader* uploader)
46 { 46 {
47 IntSize size(256, 256); 47 gfx::Size size(256, 256);
48 uploader->upload(NULL, 48 uploader->upload(NULL,
49 IntRect(IntPoint(0, 0), size), 49 gfx::Rect(gfx::Point(0, 0), size),
50 IntRect(IntPoint(0, 0), size), 50 gfx::Rect(gfx::Point(0, 0), size),
51 IntSize(), 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);
60 60
61 fakeContext->setResultAvailable(0); 61 fakeContext->setResultAvailable(0);
(...skipping 29 matching lines...) Expand all
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') | cc/tiled_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698