diff options
author | dcheng <dcheng@chromium.org> | 2015-04-17 14:06:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 21:07:12 +0000 |
commit | 3c05e2000a4494ef0197022077ece8ff2bc7fe49 (patch) | |
tree | 30126e4e31f446cc343c79529e40f7b0f70b57b0 /mojo | |
parent | 27118fcf684b03e5c6fa117baa6ffc5a4a3f9f5b (diff) | |
download | chromium_src-3c05e2000a4494ef0197022077ece8ff2bc7fe49.zip chromium_src-3c05e2000a4494ef0197022077ece8ff2bc7fe49.tar.gz chromium_src-3c05e2000a4494ef0197022077ece8ff2bc7fe49.tar.bz2 |
Revert of Update mojo sdk to rev 8563c3d4162bd74e96783e823e076e99869d7385 (patchset #5 id:80001 of https://codereview.chromium.org/1096593002/)
Reason for revert:
Speculative revert to try to fix linux_android_rel_ng trybots.
Original issue's description:
> Update mojo sdk to rev 8563c3d4162bd74e96783e823e076e99869d7385
>
> R=jamesr@chromium.org, rockot@chromium.org
> TBR=rockot@chromium.org
>
> Committed: https://crrev.com/a38136b7f2fd5a7a425bf06bc54c10741bfc22bd
> Cr-Commit-Position: refs/heads/master@{#325643}
TBR=jamesr@chromium.org,rockot@chromium.org,sky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1063443006
Cr-Commit-Position: refs/heads/master@{#325714}
Diffstat (limited to 'mojo')
-rw-r--r-- | mojo/gles2/gles2_impl.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mojo/gles2/gles2_impl.cc b/mojo/gles2/gles2_impl.cc index 70824c6..9a65a6d 100644 --- a/mojo/gles2/gles2_impl.cc +++ b/mojo/gles2/gles2_impl.cc @@ -17,11 +17,6 @@ namespace { base::LazyInstance<base::ThreadLocalPointer<gpu::gles2::GLES2Interface> >::Leaky g_gpu_interface; -void RunSignalSyncCallback(MojoGLES2SignalSyncPointCallback callback, - void* closure) { - callback(closure); -} - } // namespace extern "C" { @@ -57,16 +52,6 @@ void MojoGLES2SwapBuffers() { g_gpu_interface.Get().Get()->SwapBuffers(); } -void MojoGLES2SignalSyncPoint( - MojoGLES2Context context, - uint32_t sync_point, - MojoGLES2SignalSyncPointCallback callback, - void* closure) { - DCHECK(context); - static_cast<GLES2Context*>(context)->context_support()->SignalSyncPoint( - sync_point, base::Bind(&RunSignalSyncCallback, callback, closure)); -} - void* MojoGLES2GetGLES2Interface(MojoGLES2Context context) { return static_cast<GLES2Context*>(context)->interface(); } |