From bc3847a1ba39db7adec20aa9e0565f6e868e8480 Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Wed, 17 Oct 2012 00:50:19 +0000 Subject: cc: Switch to Chromium DCHECKs LOGs We can't compile-guard code and use DCHECK since it can be enabled at runtime. This removes all compile-time guards, and makes use of DCHECK instead of ASSERT. We use DCHECK_IS_ON() to early out and avoid extra work just for DCHECK where possible as well. This also replaces use of LOG_ERROR("Foo") with LOG(ERROR)<<"Foo"; R=enne,jamesr Review URL: https://chromiumcodereview.appspot.com/11048044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162296 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/program_binding.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cc/program_binding.h') diff --git a/cc/program_binding.h b/cc/program_binding.h index 28f628c..3ddc0b4 100644 --- a/cc/program_binding.h +++ b/cc/program_binding.h @@ -7,6 +7,8 @@ #include +#include "base/logging.h" + namespace WebKit { class WebGraphicsContext3D; } @@ -22,7 +24,7 @@ public: void link(WebKit::WebGraphicsContext3D*); void cleanup(WebKit::WebGraphicsContext3D*); - unsigned program() const { ASSERT(m_initialized); return m_program; } + unsigned program() const { DCHECK(m_initialized); return m_program; } bool initialized() const { return m_initialized; } protected: @@ -47,9 +49,9 @@ public: void initialize(WebKit::WebGraphicsContext3D* context, bool usingBindUniform) { - ASSERT(context); - ASSERT(m_program); - ASSERT(!m_initialized); + DCHECK(context); + DCHECK(m_program); + DCHECK(!m_initialized); // Need to bind uniforms before linking if (!usingBindUniform) -- cgit v1.1