cc: Fix resource provider fences and add DCHECKs.

content/renderer/gpu/compositor_output_surface.cc

 // Copyright (c) 2012 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 "content/renderer/gpu/compositor_output_surface.h"
 
 #include "base/message_loop_proxy.h"
 #include "cc/compositor_frame.h"
 #include "cc/output_surface_client.h"
 #include "content/common/view_messages.h"
@@ skipping 131 matching lines @@
     setpriority(PRIO_PROCESS, id, nice_value);
   }
 #else
   void SetThreadsPriorityToIdle(base::PlatformThreadId id) {}
   void SetThreadsPriorityToDefault(base::PlatformThreadId id) {}
 #endif
 }
 
 void CompositorOutputSurface::UpdateSmoothnessTakesPriority(
     bool prefers_smoothness) {
-#if ENABLE_DCHECK
+#ifndef NDEBUG
   // If we use different compositor threads, we need to
   // use an atomic int to track prefer smoothness count.
-  static int g_last_thread = base::PlatformThread::CurrentId();
+  base::PlatformThreadId g_last_thread = base::PlatformThread::CurrentId();

[joth, 2013/04/05 05:30:32]

removing the static here makes the dcheck below pointless? (And, g_ prefix does
not make sense as it's a plain local var)

can probably write this as:
  static NonThreadSafe g_nts;
  DCHECK(g_nts.CalledOnValidThread());
(no need for ifdef)

   DCHECK_EQ(g_last_thread, base::PlatformThread::CurrentId());
 #endif
   if (prefers_smoothness_ == prefers_smoothness)
     return;
   // If this is the first surface to start preferring smoothness,
   // Throttle the main thread's priority.
   if (prefers_smoothness_ == false &&
       ++g_prefer_smoothness_count == 1) {
     SetThreadsPriorityToIdle(main_thread_id_);
   }
   // If this is the last surface to stop preferring smoothness,
   // Reset the main thread's priority to the default.
   if (prefers_smoothness_ == true &&
       --g_prefer_smoothness_count == 0) {
     SetThreadsPriorityToDefault(main_thread_id_);
   }
   prefers_smoothness_ = prefers_smoothness;
 }
 
 }  // namespace content