Index: ui/gl/gl_fence_apple.cc |
diff --git a/ui/gl/gl_fence_apple.cc b/ui/gl/gl_fence_apple.cc |
index 9df0cad7e13f9de4ceeef311f127ed1ecd5d9650..3b5f697da50a9cbfc5fc8c5d3aa52c993d9ebdaf 100644 |
--- a/ui/gl/gl_fence_apple.cc |
+++ b/ui/gl/gl_fence_apple.cc |
@@ -5,19 +5,14 @@ |
#include "ui/gl/gl_fence_apple.h" |
#include "ui/gl/gl_bindings.h" |
-#include "ui/gl/gl_context.h" |
namespace gfx { |
-GLFenceAPPLE::GLFenceAPPLE(bool flush) { |
+GLFenceAPPLE::GLFenceAPPLE() { |
glGenFencesAPPLE(1, &fence_); |
glSetFenceAPPLE(fence_); |
DCHECK(glIsFenceAPPLE(fence_)); |
- if (flush) { |
- glFlush(); |
- } else { |
- flush_event_ = GLContext::GetCurrent()->SignalFlush(); |
- } |
+ glFlush(); |
} |
bool GLFenceAPPLE::HasCompleted() { |
@@ -27,11 +22,7 @@ bool GLFenceAPPLE::HasCompleted() { |
void GLFenceAPPLE::ClientWait() { |
DCHECK(glIsFenceAPPLE(fence_)); |
- if (!flush_event_.get() || flush_event_->IsSignaled()) { |
- glFinishFenceAPPLE(fence_); |
- } else { |
- LOG(ERROR) << "Trying to wait for uncommitted fence. Skipping..."; |
- } |
+ glFinishFenceAPPLE(fence_); |
} |
void GLFenceAPPLE::ServerWait() { |