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

Side by Side Diff: cc/output/output_surface.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 | « no previous file | cc/output/output_surface.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 #ifndef CC_OUTPUT_OUTPUT_SURFACE_H_ 5 #ifndef CC_OUTPUT_OUTPUT_SURFACE_H_
6 #define CC_OUTPUT_OUTPUT_SURFACE_H_ 6 #define CC_OUTPUT_OUTPUT_SURFACE_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 bool resourceless_software_draw); 171 bool resourceless_software_draw);
172 172
173 private: 173 private:
174 void SetUpContext3d(); 174 void SetUpContext3d();
175 void ResetContext3d(); 175 void ResetContext3d();
176 void SetMemoryPolicy(const ManagedMemoryPolicy& policy); 176 void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
177 void UpdateAndMeasureGpuLatency(); 177 void UpdateAndMeasureGpuLatency();
178 178
179 bool external_stencil_test_enabled_; 179 bool external_stencil_test_enabled_;
180 180
181 base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
182
183 std::deque<unsigned> available_gpu_latency_query_ids_; 181 std::deque<unsigned> available_gpu_latency_query_ids_;
184 std::deque<unsigned> pending_gpu_latency_query_ids_; 182 std::deque<unsigned> pending_gpu_latency_query_ids_;
185 RollingTimeDeltaHistory gpu_latency_history_; 183 RollingTimeDeltaHistory gpu_latency_history_;
186 184
185 base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
186
187 DISALLOW_COPY_AND_ASSIGN(OutputSurface); 187 DISALLOW_COPY_AND_ASSIGN(OutputSurface);
188 }; 188 };
189 189
190 } // namespace cc 190 } // namespace cc
191 191
192 #endif // CC_OUTPUT_OUTPUT_SURFACE_H_ 192 #endif // CC_OUTPUT_OUTPUT_SURFACE_H_
OLDNEW
« no previous file with comments | « no previous file | cc/output/output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698