diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 22:26:12 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 22:26:12 +0000 |
| commit | 053baf3bdcf52ee85a8d1fa795777df374bdbac8 (patch) | |
| tree | cf986b67404c9883d5ddba6adc7d0709dc537ff5 /mojo/gles2 | |
| parent | 10f1b3a61e6a5cb41ea442c4922eb896622d35d9 (diff) | |
| download | chromium_src-053baf3bdcf52ee85a8d1fa795777df374bdbac8.zip chromium_src-053baf3bdcf52ee85a8d1fa795777df374bdbac8.tar.gz chromium_src-053baf3bdcf52ee85a8d1fa795777df374bdbac8.tar.bz2 | |
Add creation of ServiceManager to Content
BUG=None
TEST=Mojo.Init
R=jam@chromium.org, sky@chromium.org, jam
Review URL: https://codereview.chromium.org/187183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/gles2')
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc index 60bb96a..213518a 100644 --- a/mojo/gles2/command_buffer_client_impl.cc +++ b/mojo/gles2/command_buffer_client_impl.cc @@ -91,7 +91,7 @@ void CommandBufferClientImpl::WaitForTokenInRange(int32 start, int32 end) { void CommandBufferClientImpl::WaitForGetOffsetInRange(int32 start, int32 end) { TryUpdateState(); - while (!InRange(start, end, last_state_.get_offset) && + while (!InRange(start, end, last_state_.token) && last_state_.error == gpu::error::kNoError) { MakeProgressAndUpdateState(); TryUpdateState(); |