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

Side by Side Diff: cc/resources/gpu_raster_worker_pool.h

Issue 581563002: Declaring the weak_ptr_factory in proper order in src/cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/output/output_surface.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_ 5 #ifndef CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_
6 #define CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_ 6 #define CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "cc/resources/raster_worker_pool.h" 9 #include "cc/resources/raster_worker_pool.h"
10 #include "cc/resources/rasterizer.h" 10 #include "cc/resources/rasterizer.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 const NamespaceToken namespace_token_; 53 const NamespaceToken namespace_token_;
54 RasterizerClient* client_; 54 RasterizerClient* client_;
55 ContextProvider* context_provider_; 55 ContextProvider* context_provider_;
56 ResourceProvider* resource_provider_; 56 ResourceProvider* resource_provider_;
57 57
58 bool run_tasks_on_origin_thread_pending_; 58 bool run_tasks_on_origin_thread_pending_;
59 59
60 bool raster_tasks_pending_; 60 bool raster_tasks_pending_;
61 bool raster_tasks_required_for_activation_pending_; 61 bool raster_tasks_required_for_activation_pending_;
62 62
63 base::WeakPtrFactory<GpuRasterWorkerPool> raster_finished_weak_ptr_factory_;
64
65 scoped_refptr<RasterizerTask> raster_finished_task_; 63 scoped_refptr<RasterizerTask> raster_finished_task_;
66 scoped_refptr<RasterizerTask> raster_required_for_activation_finished_task_; 64 scoped_refptr<RasterizerTask> raster_required_for_activation_finished_task_;
67 65
68 // Task graph used when scheduling tasks and vector used to gather 66 // Task graph used when scheduling tasks and vector used to gather
69 // completed tasks. 67 // completed tasks.
70 TaskGraph graph_; 68 TaskGraph graph_;
71 Task::Vector completed_tasks_; 69 Task::Vector completed_tasks_;
72 70
71 base::WeakPtrFactory<GpuRasterWorkerPool> raster_finished_weak_ptr_factory_;
72
73 base::WeakPtrFactory<GpuRasterWorkerPool> weak_ptr_factory_; 73 base::WeakPtrFactory<GpuRasterWorkerPool> weak_ptr_factory_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(GpuRasterWorkerPool); 75 DISALLOW_COPY_AND_ASSIGN(GpuRasterWorkerPool);
76 }; 76 };
77 77
78 } // namespace cc 78 } // namespace cc
79 79
80 #endif // CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_ 80 #endif // CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_
OLDNEW
« no previous file with comments | « cc/output/output_surface.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698