Index: cc/CCSingleThreadProxy.h |
diff --git a/cc/CCSingleThreadProxy.h b/cc/CCSingleThreadProxy.h |
index 979dbb3907f529f510878397c38a9725c2249d4b..7906a89c9a8a3496556f7be4df7c5091bea471ee 100644 |
--- a/cc/CCSingleThreadProxy.h |
+++ b/cc/CCSingleThreadProxy.h |
@@ -8,7 +8,7 @@ |
#include "CCAnimationEvents.h" |
#include "CCLayerTreeHostImpl.h" |
#include "CCProxy.h" |
-#include <base/time.h> |
+#include "base/time.h" |
#include <limits> |
namespace cc { |
@@ -90,15 +90,11 @@ class DebugScopedSetImplThread { |
public: |
DebugScopedSetImplThread() |
{ |
-#if !ASSERT_DISABLED |
CCProxy::setCurrentThreadIsImplThread(true); |
-#endif |
} |
~DebugScopedSetImplThread() |
{ |
-#if !ASSERT_DISABLED |
CCProxy::setCurrentThreadIsImplThread(false); |
-#endif |
} |
}; |
@@ -108,15 +104,11 @@ class DebugScopedSetMainThread { |
public: |
DebugScopedSetMainThread() |
{ |
-#if !ASSERT_DISABLED |
CCProxy::setCurrentThreadIsImplThread(false); |
-#endif |
} |
~DebugScopedSetMainThread() |
{ |
-#if !ASSERT_DISABLED |
CCProxy::setCurrentThreadIsImplThread(true); |
-#endif |
} |
}; |