aw: Ubercomp mega patch

cc/trees/blocking_task_runner.h

 // Copyright 2013 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.
 
 #ifndef CC_TREES_BLOCKING_TASK_RUNNER_H_
 #define CC_TREES_BLOCKING_TASK_RUNNER_H_
 
 #include <vector>
 
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
+#include "base/threading/platform_thread.h"
 #include "cc/base/cc_export.h"
 
 namespace cc {
 
 // This class wraps a SingleThreadTaskRunner but allows posted tasks to be
 // run without a round trip through the message loop. This shortcutting
 // removes guarantees about ordering. Tasks posted while the
 // BlockingTaskRunner is in a capturing state will run in order, and tasks
 // posted while the BlockingTaskRunner is /not/ in a capturing state will
 // run in order, but the two sets of tasks will *not* run in order relative
@@ skipping 31 matching lines @@
     ~CapturePostTasks();
 
    private:
     scoped_refptr<BlockingTaskRunner> blocking_runner_;
 
     DISALLOW_COPY_AND_ASSIGN(CapturePostTasks);
   };
 
   // True if tasks posted to the BlockingTaskRunner will run on the current
   // thread.
-  bool BelongsToCurrentThread() {
-    return task_runner_->BelongsToCurrentThread();
-  }
+  bool BelongsToCurrentThread();
 
   // Posts a task using the contained SingleThreadTaskRunner unless |capture_|
   // is true. When |capture_| is true, tasks posted will be caught and stored
   // until the capturing stops. At that time the tasks will be run directly
   // instead of being posted to the SingleThreadTaskRunner.
   bool PostTask(const tracked_objects::Location& from_here,
                 const base::Closure& task);
 
  private:
   friend class base::RefCountedThreadSafe<BlockingTaskRunner>;
 
   explicit BlockingTaskRunner(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
   virtual ~BlockingTaskRunner();
 
   void SetCapture(bool capture);
 
+  base::PlatformThreadId thread_id_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   base::Lock lock_;
   int capture_;
   std::vector<base::Closure> captured_tasks_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_BLOCKING_TASK_RUNNER_H_