Split //ui/gl into //ui/gl + //ui/gi/init.

android_webview/browser/aw_gl_surface.h

 // Copyright 2013 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 ANDROID_WEBVIEW_BROWSER_AW_GL_SURFACE_H_
 #define ANDROID_WEBVIEW_BROWSER_AW_GL_SURFACE_H_
 
 #include "base/macros.h"
+#include "ui/gl/gl_export.h"
 #include "ui/gl/gl_surface.h"
 
 namespace android_webview {
 
 // This surface is used to represent the underlying surface provided by the App
 // inside a hardware draw. Note that offscreen contexts will not be using this
 // GLSurface.
 class GL_EXPORT AwGLSurface : public gfx::GLSurface {

[piman, 2016/05/11 23:14:57]

huh... I don't think this should be GL_EXPORT, it's not part of the gl component

[kylechar, 2016/05/12 14:47:30]

Yeah, this doesn't seem right at all looking at it closer. I'll remove the
include and macro.

  public:
   AwGLSurface();
 
   // Implement GLSurface.
   void Destroy() override;
   bool IsOffscreen() override;
   unsigned int GetBackingFrameBufferObject() override;
   gfx::SwapResult SwapBuffers() override;
   gfx::Size GetSize() override;
   void* GetHandle() override;
   void* GetDisplay() override;
 
   void SetBackingFrameBufferObject(unsigned int fbo);
 
  protected:
   ~AwGLSurface() override;
 
  private:
   unsigned int fbo_;
 
   DISALLOW_COPY_AND_ASSIGN(AwGLSurface);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_AW_GL_SURFACE_H_