| Index: ui/gl/gl_fence_noop.h
|
| diff --git a/ui/gl/gl_fence_arb.h b/ui/gl/gl_fence_noop.h
|
| similarity index 51%
|
| copy from ui/gl/gl_fence_arb.h
|
| copy to ui/gl/gl_fence_noop.h
|
| index 3975efec7e1f685b03c135b27364993eb249c182..0cdbab0a94c305a98d04e79a6c9ef68a8526e9dd 100644
|
| --- a/ui/gl/gl_fence_arb.h
|
| +++ b/ui/gl/gl_fence_noop.h
|
| @@ -1,20 +1,19 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_GL_GL_FENCE_ARB_H_
|
| -#define UI_GL_GL_FENCE_ARB_H_
|
| +#ifndef UI_GL_GL_FENCE_NOOP_H_
|
| +#define UI_GL_GL_FENCE_NOOP_H_
|
|
|
| #include "base/macros.h"
|
| -#include "ui/gl/gl_bindings.h"
|
| #include "ui/gl/gl_fence.h"
|
|
|
| namespace gfx {
|
|
|
| -class GL_EXPORT GLFenceARB : public GLFence {
|
| +class GL_EXPORT GLFenceNoop : public GLFence {
|
| public:
|
| - GLFenceARB();
|
| - ~GLFenceARB() override;
|
| + GLFenceNoop();
|
| + ~GLFenceNoop() override;
|
|
|
| // GLFence implementation:
|
| bool HasCompleted() override;
|
| @@ -22,11 +21,10 @@ class GL_EXPORT GLFenceARB : public GLFence {
|
| void ServerWait() override;
|
|
|
| private:
|
| - GLsync sync_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(GLFenceARB);
|
| + DISALLOW_COPY_AND_ASSIGN(GLFenceNoop);
|
| };
|
|
|
| } // namespace gfx
|
|
|
| -#endif // UI_GL_GL_FENCE_ARB_H_
|
| +#endif // UI_GL_GL_FENCE_NOOP_H_
|
| +
|
|
|