diff options
| author | nhiroki <nhiroki@chromium.org> | 2015-11-04 21:56:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-05 05:56:50 +0000 |
| commit | a1ab22a90140fe9e6c669998f3efc52795e569e2 (patch) | |
| tree | 98e158c1d36c83f57f9c9334dc600dc7468f3c4f /cc/test/test_gpu_memory_buffer_manager.cc | |
| parent | 29a936f7a618bc15e90e1308eab78ffc9d5b6ce8 (diff) | |
| download | chromium_src-a1ab22a90140fe9e6c669998f3efc52795e569e2.zip chromium_src-a1ab22a90140fe9e6c669998f3efc52795e569e2.tar.gz chromium_src-a1ab22a90140fe9e6c669998f3efc52795e569e2.tar.bz2 | |
Revert of Converted video frame and image callbacks to use new sync tokens. (patchset #9 id:160001 of https://codereview.chromium.org/1429213002/ )
Reason for revert:
This could be breaking webkit_tests:
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20%28dbg%29/builds/4445
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac10.7%20%28dbg%29/builds/25461
Original issue's description:
> Converted video frame and image callbacks to use new sync tokens.
>
> As an incremental step towards utilizing the new sync tokens, this
> CL converts existing video frame and image sync points to use
> sync tokens instead.
>
> In order to accomplish this, the GpuCommandBufferMsg_CreateImage
> IPC message has been modified to accept a fence_release parameter
> so that it can act as a sync token IPC.
>
> A new SyncPointClientWaiter concept has also added which can wait
> on other sync point clients without an associated order number.
> This only works because the SyncPointClientWaiter cannot be waited
> on so no deadlocks can occur.
>
> BUG=514815
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/c7aff68a0c11820cc2b8d488851c682c0d32cd2b
> Cr-Commit-Position: refs/heads/master@{#357997}
TBR=dcheng@chromium.org,dalecurtis@chromium.org,piman@chromium.org,sky@chromium.org,dyen@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=514815
Review URL: https://codereview.chromium.org/1414793018
Cr-Commit-Position: refs/heads/master@{#358008}
Diffstat (limited to 'cc/test/test_gpu_memory_buffer_manager.cc')
| -rw-r--r-- | cc/test/test_gpu_memory_buffer_manager.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc index ed5e713..352a75c 100644 --- a/cc/test/test_gpu_memory_buffer_manager.cc +++ b/cc/test/test_gpu_memory_buffer_manager.cc @@ -114,8 +114,9 @@ TestGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( return reinterpret_cast<gfx::GpuMemoryBuffer*>(buffer); } -void TestGpuMemoryBufferManager::SetDestructionSyncToken( +void TestGpuMemoryBufferManager::SetDestructionSyncPoint( gfx::GpuMemoryBuffer* buffer, - const gpu::SyncToken& sync_token) {} + uint32 sync_point) { +} } // namespace cc |