Index: gpu/tools/compositor_model_bench/compositor_model_bench.cc |
diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc |
index 5108a8716d109d2f330ee6f5430940ad461f19f1..375bce2e2f4d202a9d894578f4962d5379bb0d96 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[]) { |