diff options
author | anujk.sharma <anujk.sharma@samsung.com> | 2014-12-11 16:36:47 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-12 00:37:34 +0000 |
commit | e75b97e2d6797a635d8c4b3237d92668fd9f3b20 (patch) | |
tree | b626381b39b68ab039a348ff5b437ad2e0d6f574 /gpu/tools | |
parent | 126fd5821f27793535bd80642c6e87c56b2634a1 (diff) | |
download | chromium_src-e75b97e2d6797a635d8c4b3237d92668fd9f3b20.zip chromium_src-e75b97e2d6797a635d8c4b3237d92668fd9f3b20.tar.gz chromium_src-e75b97e2d6797a635d8c4b3237d92668fd9f3b20.tar.bz2 |
Fix WeakPtrFactory member ordering in gpu
Changing in the intialization order of WeakPtrFactory such that all
member variables should appear before the WeakPtrFactory to ensure
that any WeakPtrs to Controller are invalidated before its members
variable's destructors are executed, rendering them invalid.
BUG=303818
Review URL: https://codereview.chromium.org/791353002
Cr-Commit-Position: refs/heads/master@{#308010}
Diffstat (limited to 'gpu/tools')
-rw-r--r-- | gpu/tools/compositor_model_bench/compositor_model_bench.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc index 5108a87..375bce2 100644 --- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc +++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc @@ -61,12 +61,12 @@ class Simulator { : current_sim_(NULL), output_path_(output_path), seconds_per_test_(seconds_per_test), - weak_factory_(this), display_(NULL), window_(0), gl_context_(NULL), window_width_(WINDOW_WIDTH), - window_height_(WINDOW_HEIGHT) { + window_height_(WINDOW_HEIGHT), + weak_factory_(this) { } ~Simulator() { @@ -344,12 +344,12 @@ class Simulator { // Amount of time to run each simulation int seconds_per_test_; // GUI data - base::WeakPtrFactory<Simulator> weak_factory_; Display* display_; Window window_; GLXContext gl_context_; int window_width_; int window_height_; + base::WeakPtrFactory<Simulator> weak_factory_; }; int main(int argc, char* argv[]) { |