diff options
| author | epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 08:21:31 +0000 |
|---|---|---|
| committer | epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 08:21:31 +0000 |
| commit | 3f1d4939ca115110c6c98abf37666c3f95c69ebf (patch) | |
| tree | d576575eb01ea9b16c17e399841c2e40c6c7fd05 /content | |
| parent | ebbffaef9d3b317ab161683ebb13b63813e0b9f3 (diff) | |
| download | chromium_src-3f1d4939ca115110c6c98abf37666c3f95c69ebf.zip chromium_src-3f1d4939ca115110c6c98abf37666c3f95c69ebf.tar.gz chromium_src-3f1d4939ca115110c6c98abf37666c3f95c69ebf.tar.bz2 | |
cc: Fix resource provider fences and add DCHECKs.
When I added the resource provider fence concept, I didn't
extend the read-fence long enough (it currently only protects
the current frame). This extends the read-lock for one frame.
BUG=172995
Review URL: https://chromiumcodereview.appspot.com/12220095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/gpu/compositor_output_surface.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc index 2b18c35..da7c3c1 100644 --- a/content/renderer/gpu/compositor_output_surface.cc +++ b/content/renderer/gpu/compositor_output_surface.cc @@ -149,10 +149,10 @@ namespace { 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(); DCHECK_EQ(g_last_thread, base::PlatformThread::CurrentId()); #endif if (prefers_smoothness_ == prefers_smoothness) |