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

Side by Side Diff: cc/resources/resource_update_controller_unittest.cc

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/resources/scoped_ui_resource.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 "cc/resources/resource_update_controller.h" 5 #include "cc/resources/resource_update_controller.h"
6 6
7 #include "base/test/test_simple_task_runner.h" 7 #include "base/test/test_simple_task_runner.h"
8 #include "cc/resources/prioritized_resource_manager.h" 8 #include "cc/resources/prioritized_resource_manager.h"
9 #include "cc/test/fake_output_surface.h" 9 #include "cc/test/fake_output_surface.h"
10 #include "cc/test/fake_output_surface_client.h" 10 #include "cc/test/fake_output_surface_client.h"
(...skipping 14 matching lines...) Expand all
25 const int kFlushPeriodFull = 4; 25 const int kFlushPeriodFull = 4;
26 const int kFlushPeriodPartial = kFlushPeriodFull; 26 const int kFlushPeriodPartial = kFlushPeriodFull;
27 27
28 class ResourceUpdateControllerTest; 28 class ResourceUpdateControllerTest;
29 29
30 class WebGraphicsContext3DForUploadTest : public TestWebGraphicsContext3D { 30 class WebGraphicsContext3DForUploadTest : public TestWebGraphicsContext3D {
31 public: 31 public:
32 explicit WebGraphicsContext3DForUploadTest(ResourceUpdateControllerTest* test) 32 explicit WebGraphicsContext3DForUploadTest(ResourceUpdateControllerTest* test)
33 : test_(test) {} 33 : test_(test) {}
34 34
35 virtual void flush() override; 35 void flush() override;
36 virtual void shallowFlushCHROMIUM() override; 36 void shallowFlushCHROMIUM() override;
37 virtual void texSubImage2D(GLenum target, 37 void texSubImage2D(GLenum target,
38 GLint level, 38 GLint level,
39 GLint xoffset, 39 GLint xoffset,
40 GLint yoffset, 40 GLint yoffset,
41 GLsizei width, 41 GLsizei width,
42 GLsizei height, 42 GLsizei height,
43 GLenum format, 43 GLenum format,
44 GLenum type, 44 GLenum type,
45 const void* pixels) override; 45 const void* pixels) override;
46 46
47 virtual void getQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* value) 47 void getQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* value) override;
48 override;
49 48
50 private: 49 private:
51 ResourceUpdateControllerTest* test_; 50 ResourceUpdateControllerTest* test_;
52 }; 51 };
53 52
54 class ResourceUpdateControllerTest : public Test { 53 class ResourceUpdateControllerTest : public Test {
55 public: 54 public:
56 ResourceUpdateControllerTest() 55 ResourceUpdateControllerTest()
57 : proxy_(), 56 : proxy_(),
58 queue_(make_scoped_ptr(new ResourceUpdateQueue)), 57 queue_(make_scoped_ptr(new ResourceUpdateQueue)),
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 << "Last upload wasn't followed by a flush."; 321 << "Last upload wasn't followed by a flush.";
323 } 322 }
324 323
325 class FakeResourceUpdateControllerClient 324 class FakeResourceUpdateControllerClient
326 : public ResourceUpdateControllerClient { 325 : public ResourceUpdateControllerClient {
327 public: 326 public:
328 FakeResourceUpdateControllerClient() { Reset(); } 327 FakeResourceUpdateControllerClient() { Reset(); }
329 void Reset() { ready_to_finalize_called_ = false; } 328 void Reset() { ready_to_finalize_called_ = false; }
330 bool ReadyToFinalizeCalled() const { return ready_to_finalize_called_; } 329 bool ReadyToFinalizeCalled() const { return ready_to_finalize_called_; }
331 330
332 virtual void ReadyToFinalizeTextureUpdates() override { 331 void ReadyToFinalizeTextureUpdates() override {
333 ready_to_finalize_called_ = true; 332 ready_to_finalize_called_ = true;
334 } 333 }
335 334
336 protected: 335 protected:
337 bool ready_to_finalize_called_; 336 bool ready_to_finalize_called_;
338 }; 337 };
339 338
340 class FakeResourceUpdateController : public ResourceUpdateController { 339 class FakeResourceUpdateController : public ResourceUpdateController {
341 public: 340 public:
342 static scoped_ptr<FakeResourceUpdateController> Create( 341 static scoped_ptr<FakeResourceUpdateController> Create(
343 ResourceUpdateControllerClient* client, 342 ResourceUpdateControllerClient* client,
344 base::TestSimpleTaskRunner* task_runner, 343 base::TestSimpleTaskRunner* task_runner,
345 scoped_ptr<ResourceUpdateQueue> queue, 344 scoped_ptr<ResourceUpdateQueue> queue,
346 ResourceProvider* resource_provider) { 345 ResourceProvider* resource_provider) {
347 return make_scoped_ptr(new FakeResourceUpdateController( 346 return make_scoped_ptr(new FakeResourceUpdateController(
348 client, task_runner, queue.Pass(), resource_provider)); 347 client, task_runner, queue.Pass(), resource_provider));
349 } 348 }
350 349
351 void SetNow(base::TimeTicks time) { now_ = time; } 350 void SetNow(base::TimeTicks time) { now_ = time; }
352 base::TimeTicks Now() const { return now_; } 351 base::TimeTicks Now() const { return now_; }
353 void SetUpdateTextureTime(base::TimeDelta time) { 352 void SetUpdateTextureTime(base::TimeDelta time) {
354 update_textures_time_ = time; 353 update_textures_time_ = time;
355 } 354 }
356 virtual base::TimeTicks UpdateMoreTexturesCompletionTime() override { 355 base::TimeTicks UpdateMoreTexturesCompletionTime() override {
357 size_t total_updates = 356 size_t total_updates =
358 resource_provider_->NumBlockingUploads() + update_more_textures_size_; 357 resource_provider_->NumBlockingUploads() + update_more_textures_size_;
359 return now_ + total_updates * update_textures_time_; 358 return now_ + total_updates * update_textures_time_;
360 } 359 }
361 void SetUpdateMoreTexturesSize(size_t size) { 360 void SetUpdateMoreTexturesSize(size_t size) {
362 update_more_textures_size_ = size; 361 update_more_textures_size_ = size;
363 } 362 }
364 virtual size_t UpdateMoreTexturesSize() const override { 363 size_t UpdateMoreTexturesSize() const override {
365 return update_more_textures_size_; 364 return update_more_textures_size_;
366 } 365 }
367 366
368 protected: 367 protected:
369 FakeResourceUpdateController(ResourceUpdateControllerClient* client, 368 FakeResourceUpdateController(ResourceUpdateControllerClient* client,
370 base::TestSimpleTaskRunner* task_runner, 369 base::TestSimpleTaskRunner* task_runner,
371 scoped_ptr<ResourceUpdateQueue> queue, 370 scoped_ptr<ResourceUpdateQueue> queue,
372 ResourceProvider* resource_provider) 371 ResourceProvider* resource_provider)
373 : ResourceUpdateController( 372 : ResourceUpdateController(
374 client, task_runner, queue.Pass(), resource_provider), 373 client, task_runner, queue.Pass(), resource_provider),
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 RunPendingTask(task_runner.get(), controller.get()); 508 RunPendingTask(task_runner.get(), controller.get());
510 } 509 }
511 510
512 EXPECT_FALSE(task_runner->HasPendingTask()); 511 EXPECT_FALSE(task_runner->HasPendingTask());
513 EXPECT_TRUE(client.ReadyToFinalizeCalled()); 512 EXPECT_TRUE(client.ReadyToFinalizeCalled());
514 EXPECT_EQ(2, num_total_uploads_); 513 EXPECT_EQ(2, num_total_uploads_);
515 } 514 }
516 515
517 } // namespace 516 } // namespace
518 } // namespace cc 517 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/resources/scoped_ui_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698