| Index: ui/gl/gl_context.h
|
| diff --git a/ui/gl/gl_context.h b/ui/gl/gl_context.h
|
| index 1bdad6af6be763f74887c20a13d5ea6086afdba2..c5d517690fd5a8e0a14cac80a0bed019f91f5c4c 100644
|
| --- a/ui/gl/gl_context.h
|
| +++ b/ui/gl/gl_context.h
|
| @@ -60,7 +60,7 @@ class GL_EXPORT GLContext : public base::RefCounted<GLContext> {
|
| virtual void* GetHandle() = 0;
|
|
|
| // Creates a GPUTimingClient class which abstracts various GPU Timing exts.
|
| - virtual scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() = 0;
|
| + virtual scoped_refptr<GPUTimingClient> CreateGPUTimingClient() = 0;
|
|
|
| // Gets the GLStateRestorer for the context.
|
| GLStateRestorer* GetGLStateRestorer();
|
| @@ -133,7 +133,7 @@ class GL_EXPORT GLContext : public base::RefCounted<GLContext> {
|
| virtual std::string GetGLRenderer();
|
|
|
| // Returns a helper structure to convert YUV textures to RGB textures.
|
| - virtual gl::YUVToRGBConverter* GetYUVToRGBConverter();
|
| + virtual YUVToRGBConverter* GetYUVToRGBConverter();
|
|
|
| protected:
|
| virtual ~GLContext();
|
| @@ -186,7 +186,7 @@ class GL_EXPORT GLContext : public base::RefCounted<GLContext> {
|
| class GL_EXPORT GLContextReal : public GLContext {
|
| public:
|
| explicit GLContextReal(GLShareGroup* share_group);
|
| - scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() override;
|
| + scoped_refptr<GPUTimingClient> CreateGPUTimingClient() override;
|
|
|
| protected:
|
| ~GLContextReal() override;
|
| @@ -194,7 +194,7 @@ class GL_EXPORT GLContextReal : public GLContext {
|
| void SetCurrent(GLSurface* surface) override;
|
|
|
| private:
|
| - std::unique_ptr<gl::GPUTiming> gpu_timing_;
|
| + std::unique_ptr<GPUTiming> gpu_timing_;
|
| DISALLOW_COPY_AND_ASSIGN(GLContextReal);
|
| };
|
|
|
|
|