ui/compositor: use cc/ directly instead of webkit

cc/proxy.h

 // 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.
 
 #ifndef CC_PROXY_H_
 #define CC_PROXY_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 99 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(Proxy);
 
     scoped_ptr<Thread> m_mainThread;
     scoped_ptr<Thread> m_implThread;
 #ifndef NDEBUG
     bool m_implThreadIsOverridden;
     bool m_isMainThreadBlocked;
 #endif
 };
 
+#ifndef NDEBUG
 class DebugScopedSetMainThreadBlocked {
 public:
     explicit DebugScopedSetMainThreadBlocked(Proxy* proxy)
         : m_proxy(proxy)

[danakj, 2012/11/21 20:23:59]

Just #ifndef around this and the private variable instead? (Prefer not a second
version of the class in an else if we can help it).

[piman, 2012/11/21 20:44:06]

If you prefer, but I found that this version was a lot more readable:
- if debug, this class keeps state and check things
- if release, this class does nothing

The alternative is a preprocessor statement nearly every other line (I'm even a
little afraid clang will complain about the |proxy| parameter being unused in
the constructor if I don't ifdef it out too).

[danakj, 2012/11/21 20:52:23]

Ah, right. I had noticed the parameter in the #else case, but it's without a var
name of course.. blah. Both are kinda ugly. What you've done will work. cc/ LGTM

     {
-#ifndef NDEBUG
         DCHECK(!m_proxy->isMainThreadBlocked());
         m_proxy->setMainThreadBlocked(true);
-#endif
     }
     ~DebugScopedSetMainThreadBlocked()
     {
-#ifndef NDEBUG
         DCHECK(m_proxy->isMainThreadBlocked());
         m_proxy->setMainThreadBlocked(false);
-#endif
     }
 private:
     Proxy* m_proxy;
 };
+#else
+class DebugScopedSetMainThreadBlocked {
+public:
+    explicit DebugScopedSetMainThreadBlocked(Proxy*) { }
+    ~DebugScopedSetMainThreadBlocked() { }
+};
+#endif
 
 }
 
 #endif  // CC_PROXY_H_