summaryrefslogtreecommitdiffstats
path: root/cc/texture_layer_impl.cc
diff options
context:
space:
mode:
authoralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 21:27:54 +0000
committeralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 21:27:54 +0000
commita7acdbd4477a0c1b970731843ef30426fd63ce17 (patch)
treec23bc8f602d5e2ceea3e8a0c8910ba58bbcc5430 /cc/texture_layer_impl.cc
parent900efd6f8aa96117ed241fef63587143249f8d85 (diff)
downloadchromium_src-a7acdbd4477a0c1b970731843ef30426fd63ce17.zip
chromium_src-a7acdbd4477a0c1b970731843ef30426fd63ce17.tar.gz
chromium_src-a7acdbd4477a0c1b970731843ef30426fd63ce17.tar.bz2
Add sync point to wait on before consuming texture_mailbox.
BUG= Review URL: https://chromiumcodereview.appspot.com/12036086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/texture_layer_impl.cc')
-rw-r--r--cc/texture_layer_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
index 279decc..7a6a5d6 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/texture_layer_impl.cc
@@ -37,7 +37,7 @@ TextureLayerImpl::~TextureLayerImpl()
provider->deleteResource(m_externalTextureResource);
}
if (m_hasPendingMailbox)
- m_pendingTextureMailbox.RunReleaseCallback(0);
+ m_pendingTextureMailbox.RunReleaseCallback(m_pendingTextureMailbox.sync_point());
}
void TextureLayerImpl::setTextureMailbox(const TextureMailbox& mailbox)
@@ -48,7 +48,7 @@ void TextureLayerImpl::setTextureMailbox(const TextureMailbox& mailbox)
return;
// Two commits without a draw, ack the previous mailbox.
if (m_hasPendingMailbox)
- m_pendingTextureMailbox.RunReleaseCallback(0);
+ m_pendingTextureMailbox.RunReleaseCallback(m_pendingTextureMailbox.sync_point());
m_pendingTextureMailbox = mailbox;
m_hasPendingMailbox = true;