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

Side by Side Diff: cc/resource_update_controller_unittest.cc

Issue 11450019: Finish the rename from cc::GraphicsContext to cc::OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
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 "cc/resource_update_controller.h" 5 #include "cc/resource_update_controller.h"
6 6
7 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread 7 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
8 #include "cc/test/fake_proxy.h" 8 #include "cc/test/fake_proxy.h"
9 #include "cc/test/fake_web_compositor_output_surface.h" 9 #include "cc/test/fake_web_compositor_output_surface.h"
10 #include "cc/test/fake_web_graphics_context_3d.h" 10 #include "cc/test/fake_web_graphics_context_3d.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 if (!m_queryResultsAvailable) 114 if (!m_queryResultsAvailable)
115 return false; 115 return false;
116 116
117 m_queryResultsAvailable--; 117 m_queryResultsAvailable--;
118 return true; 118 return true;
119 } 119 }
120 120
121 protected: 121 protected:
122 virtual void SetUp() 122 virtual void SetUp()
123 { 123 {
124 m_context = FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::We bGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this))); 124 m_outputSurface = FakeWebCompositorOutputSurface::create(scoped_ptr<WebK it::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this)));
125 m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 300, 150); 125 m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 300, 150);
126 m_bitmap.allocPixels(); 126 m_bitmap.allocPixels();
127 127
128 for (int i = 0; i < 4; i++) { 128 for (int i = 0; i < 4; i++) {
129 m_textures[i] = PrioritizedResource::create( 129 m_textures[i] = PrioritizedResource::create(
130 m_resourceManager.get(), gfx::Size(300, 150), GL_RGBA); 130 m_resourceManager.get(), gfx::Size(300, 150), GL_RGBA);
131 m_textures[i]->setRequestPriority( 131 m_textures[i]->setRequestPriority(
132 PriorityCalculator::visiblePriority(true)); 132 PriorityCalculator::visiblePriority(true));
133 } 133 }
134 m_resourceManager->prioritizeTextures(); 134 m_resourceManager->prioritizeTextures();
135 135
136 m_resourceProvider = ResourceProvider::create(m_context.get()); 136 m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
137 } 137 }
138 138
139 139
140 void appendFullUploadsOfIndexedTextureToUpdateQueue(int count, int textureIn dex) 140 void appendFullUploadsOfIndexedTextureToUpdateQueue(int count, int textureIn dex)
141 { 141 {
142 m_fullUploadCountExpected += count; 142 m_fullUploadCountExpected += count;
143 m_totalUploadCountExpected += count; 143 m_totalUploadCountExpected += count;
144 144
145 const gfx::Rect rect(0, 0, 300, 150); 145 const gfx::Rect rect(0, 0, 300, 150);
146 const ResourceUpdate upload = ResourceUpdate::Create( 146 const ResourceUpdate upload = ResourceUpdate::Create(
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 } 191 }
192 192
193 void makeQueryResultAvailable() 193 void makeQueryResultAvailable()
194 { 194 {
195 m_queryResultsAvailable++; 195 m_queryResultsAvailable++;
196 } 196 }
197 197
198 protected: 198 protected:
199 // Classes required to interact and test the ResourceUpdateController 199 // Classes required to interact and test the ResourceUpdateController
200 FakeProxy m_proxy; 200 FakeProxy m_proxy;
201 scoped_ptr<GraphicsContext> m_context; 201 scoped_ptr<OutputSurface> m_outputSurface;
202 scoped_ptr<ResourceProvider> m_resourceProvider; 202 scoped_ptr<ResourceProvider> m_resourceProvider;
203 scoped_ptr<ResourceUpdateQueue> m_queue; 203 scoped_ptr<ResourceUpdateQueue> m_queue;
204 scoped_ptr<PrioritizedResource> m_textures[4]; 204 scoped_ptr<PrioritizedResource> m_textures[4];
205 scoped_ptr<PrioritizedResourceManager> m_resourceManager; 205 scoped_ptr<PrioritizedResourceManager> m_resourceManager;
206 SkBitmap m_bitmap; 206 SkBitmap m_bitmap;
207 int m_queryResultsAvailable; 207 int m_queryResultsAvailable;
208 208
209 // Properties / expectations of this test 209 // Properties / expectations of this test
210 int m_fullUploadCountExpected; 210 int m_fullUploadCountExpected;
211 int m_partialCountExpected; 211 int m_partialCountExpected;
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 runPendingTask(&thread, controller.get()); 497 runPendingTask(&thread, controller.get());
498 } 498 }
499 499
500 EXPECT_FALSE(thread.hasPendingTask()); 500 EXPECT_FALSE(thread.hasPendingTask());
501 EXPECT_TRUE(client.readyToFinalizeCalled()); 501 EXPECT_TRUE(client.readyToFinalizeCalled());
502 EXPECT_EQ(2, m_numTotalUploads); 502 EXPECT_EQ(2, m_numTotalUploads);
503 } 503 }
504 504
505 } // namespace 505 } // namespace
506 } // namespace cc 506 } // namespace cc
OLDNEW
« cc/layer_tree_host.cc ('K') | « cc/resource_provider_unittest.cc ('k') | cc/scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698