Revert 191400 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/cc/scheduler/frame_rate_controller.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/scheduler/frame_rate_controller.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/base/thread.h"
 #include "cc/scheduler/delay_based_time_source.h"
@@ skipping 21 matching lines @@
 };
 
 FrameRateController::FrameRateController(scoped_refptr<TimeSource> timer)
     : client_(NULL),
       num_frames_pending_(0),
       max_frames_pending_(0),
       time_source_(timer),
       active_(false),
       swap_buffers_complete_supported_(true),
       is_time_source_throttling_(true),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
-      thread_(NULL) {
+      thread_(NULL),
+      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   time_source_client_adapter_ =
       FrameRateControllerTimeSourceAdapter::Create(this);
   time_source_->SetClient(time_source_client_adapter_.get());
 }
 
 FrameRateController::FrameRateController(Thread* thread)
     : client_(NULL),
       num_frames_pending_(0),
       max_frames_pending_(0),
       active_(false),
       swap_buffers_complete_supported_(true),
       is_time_source_throttling_(false),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
-      thread_(thread) {}
+      thread_(thread),
+      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
 
 FrameRateController::~FrameRateController() {
   if (is_time_source_throttling_)
     time_source_->SetActive(false);
 }
 
 void FrameRateController::SetActive(bool active) {
   if (active_ == active)
     return;
   TRACE_EVENT1("cc", "FrameRateController::SetActive", "active", active);
@@ skipping 76 matching lines @@
 }
 
 base::TimeTicks FrameRateController::LastTickTime() {
   if (is_time_source_throttling_)
     return time_source_->LastTickTime();
 
   return base::TimeTicks::Now();
 }
 
 }  // namespace cc