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

Side by Side Diff: cc/texture_uploader_unittest.cc

Issue 11369109: cc: Rename PrioritizedTexture to PrioritizedResource. (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') | cc/thread_proxy.h » ('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_resource.h"
10 #include "cc/test/fake_web_graphics_context_3d.h" 10 #include "cc/test/fake_web_graphics_context_3d.h"
11 #include "testing/gmock/include/gmock/gmock.h" 11 #include "testing/gmock/include/gmock/gmock.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "third_party/khronos/GLES2/gl2.h" 13 #include "third_party/khronos/GLES2/gl2.h"
14 #include "third_party/khronos/GLES2/gl2ext.h" 14 #include "third_party/khronos/GLES2/gl2ext.h"
15 15
16 using namespace cc; 16 using namespace cc;
17 using namespace WebKit; 17 using namespace WebKit;
18 18
19 namespace { 19 namespace {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 } // anonymous namespace 100 } // anonymous namespace
OLDNEW
« no previous file with comments | « cc/texture_uploader.cc ('k') | cc/thread_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698