diff options
| author | kulkarni.a <kulkarni.a@samsung.com> | 2014-09-17 08:42:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 15:43:04 +0000 |
| commit | 03fd39760cfd31da392e596be40fd06c9eff6bf6 (patch) | |
| tree | 80f128a4abde8e205530962b5f1bb03385a20357 /cc/output/output_surface.cc | |
| parent | 33f197bf06e457f0a2a3616f15e0f44683cc2a2c (diff) | |
| download | chromium_src-03fd39760cfd31da392e596be40fd06c9eff6bf6.zip chromium_src-03fd39760cfd31da392e596be40fd06c9eff6bf6.tar.gz chromium_src-03fd39760cfd31da392e596be40fd06c9eff6bf6.tar.bz2 | |
Declaring the weak_ptr_factory in proper order in src/cc.
Cleaning up weak_ptr_factory destruction order.
WeakPtrFactory should remain the last member so it'll be destroyed and
invalidate its weak pointers before any other members are destroyed.
BUG=303818
Review URL: https://codereview.chromium.org/581563002
Cr-Commit-Position: refs/heads/master@{#295279}
Diffstat (limited to 'cc/output/output_surface.cc')
| -rw-r--r-- | cc/output/output_surface.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc index 27b3fbd..2b6b782 100644 --- a/cc/output/output_surface.cc +++ b/cc/output/output_surface.cc @@ -46,8 +46,8 @@ OutputSurface::OutputSurface( context_provider_(context_provider), device_scale_factor_(-1), external_stencil_test_enabled_(false), - weak_ptr_factory_(this), - gpu_latency_history_(kGpuLatencyHistorySize) { + gpu_latency_history_(kGpuLatencyHistorySize), + weak_ptr_factory_(this) { } OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device) @@ -55,8 +55,8 @@ OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device) software_device_(software_device.Pass()), device_scale_factor_(-1), external_stencil_test_enabled_(false), - weak_ptr_factory_(this), - gpu_latency_history_(kGpuLatencyHistorySize) { + gpu_latency_history_(kGpuLatencyHistorySize), + weak_ptr_factory_(this) { } OutputSurface::OutputSurface( @@ -67,8 +67,8 @@ OutputSurface::OutputSurface( software_device_(software_device.Pass()), device_scale_factor_(-1), external_stencil_test_enabled_(false), - weak_ptr_factory_(this), - gpu_latency_history_(kGpuLatencyHistorySize) { + gpu_latency_history_(kGpuLatencyHistorySize), + weak_ptr_factory_(this) { } void OutputSurface::CommitVSyncParameters(base::TimeTicks timebase, |