Moving the GL implementation details into a sub folder for client display.

This change with allow me to cleanly add interfaces to the GL implementations.
The intent is to add interfaces to the different components, but these get lost
in the flat client/ directory. Moving display related files to their own location.

R=yuweih@chromium.org
BUG=671692

Review-Url: https://codereview.chromium.org/2614443003
Cr-Commit-Position: refs/heads/master@{#441727}

remoting/BUILD.gn

@@ -145,6 +145,7 @@ test("remoting_unittests") {
     "//google_apis",
     "//remoting/base:unit_tests",
     "//remoting/client:unit_tests",
+    "//remoting/client/display:unit_tests",
     "//remoting/protocol:unit_tests",
     "//remoting/signaling:unit_tests",
     "//remoting/test:unit_tests",

remoting/android/BUILD.gn

@@ -24,7 +24,7 @@ shared_library("remoting_client_jni") {
     "//remoting/android:jni_headers",
     "//remoting/base",
     "//remoting/client",
-    "//remoting/client:opengl_renderer",
+    "//remoting/client/display",
     "//remoting/protocol",
     "//ui/events:dom_keycode_converter",
     "//ui/gfx",

remoting/client/BUILD.gn

@@ -73,56 +73,6 @@ static_library("client") {
   }
 }
 
-source_set("opengl_renderer") {
-  sources = [
-    "gl_canvas.cc",
-    "gl_canvas.h",
-    "gl_cursor.cc",
-    "gl_cursor.h",
-    "gl_cursor_feedback.cc",
-    "gl_cursor_feedback.h",
-    "gl_cursor_feedback_texture.cc",
-    "gl_cursor_feedback_texture.h",
-    "gl_desktop.cc",
-    "gl_desktop.h",
-    "gl_helpers.cc",
-    "gl_helpers.h",
-    "gl_math.cc",
-    "gl_math.h",
-    "gl_render_layer.cc",
-    "gl_render_layer.h",
-    "gl_renderer.cc",
-    "gl_renderer.h",
-  ]
-
-  deps = [
-    "//remoting/proto",
-    "//third_party/libyuv",
-    "//third_party/webrtc/base:rtc_base",
-  ]
-
-  configs += [ "//third_party/khronos:khronos_headers" ]
-
-  if (is_linux) {
-    libs = [ "GL" ]
-  }
-
-  if (is_mac) {
-    libs = [ "OpenGL.framework" ]
-  }
-
-  if (is_ios) {
-    libs = [
-      "GLKit.framework",
-      "OpenGLES.framework",
-    ]
-  }
-
-  if (is_win) {
-    deps += [ "//third_party/angle:libGLESv2" ]
-  }
-}
-
 source_set("unit_tests") {
   testonly = true
 
@@ -159,11 +109,4 @@ source_set("unit_tests") {
     "//testing/gtest",
     "//third_party/webrtc/base:rtc_base",
   ]
-
-  if (!is_win) {
-    # Windows clang builder fails to link the test binary with ANGLE GLESv2.
-    # crbug.com/642027
-    sources += [ "gl_renderer_unittest.cc" ]
-    deps += [ ":opengl_renderer" ]
-  }
 }

remoting/client/display/BUILD.gn

+# Copyright 2014 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.
+
+source_set("display") {
+  sources = [
+    "gl_canvas.cc",
+    "gl_canvas.h",
+    "gl_cursor.cc",
+    "gl_cursor.h",
+    "gl_cursor_feedback.cc",
+    "gl_cursor_feedback.h",
+    "gl_cursor_feedback_texture.cc",
+    "gl_cursor_feedback_texture.h",
+    "gl_desktop.cc",
+    "gl_desktop.h",
+    "gl_helpers.cc",
+    "gl_helpers.h",
+    "gl_math.cc",
+    "gl_math.h",
+    "gl_render_layer.cc",
+    "gl_render_layer.h",
+    "gl_renderer.cc",
+    "gl_renderer.h",
+  ]
+
+  deps = [
+    "//remoting/proto",
+    "//third_party/libyuv",
+    "//third_party/webrtc/base:rtc_base",
+  ]
+
+  configs += [ "//third_party/khronos:khronos_headers" ]
+
+  if (is_linux) {
+    libs = [ "GL" ]
+  }
+
+  if (is_mac) {
+    libs = [ "OpenGL.framework" ]
+  }
+
+  if (is_ios) {
+    libs = [
+      "GLKit.framework",
+      "OpenGLES.framework",
+    ]
+  }
+
+  if (is_win) {
+    deps += [ "//third_party/angle:libGLESv2" ]
+  }
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "gl_renderer_unittest.cc",
+  ]
+
+  configs += [
+    "//remoting/build/config:version",
+    "//remoting/build/config:enable_webrtc_remoting_client",
+  ]
+
+  deps = [
+    ":display",
+    "//remoting/proto",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/webrtc/base:rtc_base",
+  ]
+
+  if (is_win) {
+    # Windows clang builder fails to link the test binary with ANGLE GLESv2.
+    # crbug.com/642027
+    sources -= [ "gl_renderer_unittest.cc" ]
+    deps -= [ ":display" ]
+  }
+}

remoting/client/display/DEPS

+include_rules = [
+  "-remoting/client",
+  "+remoting/client/display",
+]

remoting/client/gl_canvas.cc → remoting/client/display/gl_canvas.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_canvas.h"
+#include "remoting/client/display/gl_canvas.h"
 
 #include "base/logging.h"
-#include "remoting/client/gl_helpers.h"
-#include "remoting/client/gl_math.h"
+#include "remoting/client/display/gl_helpers.h"
+#include "remoting/client/display/gl_math.h"
 
 namespace {
 
@@ -37,15 +37,15 @@ const char kTexCoordToViewVert[] =
     "void main() {\n"
     "  v_texCoord = a_texCoord;\n"
 
-       // Transforms coordinates related to the canvas to coordinates
-       // related to the view.
+    // Transforms coordinates related to the canvas to coordinates
+    // related to the view.
     "  vec3 trans_position = u_transform * vec3(a_position, 1.0);\n"
 
-       // Normalize the position by the size of the view.
+    // Normalize the position by the size of the view.
     "  trans_position.xy /= u_viewSize;\n"
 
-       // Transforms texture coordinates to view coordinates and adds
-       // projection component 1.
+    // Transforms texture coordinates to view coordinates and adds
+    // projection component 1.
     "  gl_Position = vec4(tex_to_view * trans_position, 1.0);\n"
     "}";
 
@@ -108,7 +108,7 @@ void GlCanvas::SetTransformationMatrix(const std::array<float, 9>& matrix) {
 void GlCanvas::SetViewSize(int width, int height) {
   DCHECK(width > 0 && height > 0);
   glViewport(0, 0, width, height);
-  float view_size[2] {width, height};
+  float view_size[2]{width, height};
   glUniform2fv(view_size_location_, 1, view_size);
   view_size_set_ = true;
 }

remoting/client/gl_canvas.h → remoting/client/display/gl_canvas.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_OPENGL_GL_CANVAS_H_
-#define REMOTING_CLIENT_OPENGL_GL_CANVAS_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_CANVAS_H_
+#define REMOTING_CLIENT_DISPLAY_GL_CANVAS_H_
 
 #include <array>
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
-#include "remoting/client/sys_opengl.h"
+#include "remoting/client/display/sys_opengl.h"
 
 namespace remoting {
 
@@ -91,4 +91,4 @@ class GlCanvas {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_OPENGL_GL_CANVAS_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_CANVAS_H_

remoting/client/gl_cursor.cc → remoting/client/display/gl_cursor.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_cursor.h"
+#include "remoting/client/display/gl_cursor.h"
 
 #include "remoting/base/util.h"
-#include "remoting/client/gl_canvas.h"
-#include "remoting/client/gl_math.h"
-#include "remoting/client/gl_render_layer.h"
-#include "remoting/client/gl_texture_ids.h"
+#include "remoting/client/display/gl_canvas.h"
+#include "remoting/client/display/gl_math.h"
+#include "remoting/client/display/gl_render_layer.h"
+#include "remoting/client/display/gl_texture_ids.h"
 #include "remoting/proto/control.pb.h"
 #include "third_party/libyuv/include/libyuv/convert_argb.h"
 
@@ -24,7 +24,7 @@ GlCursor::~GlCursor() {}
 
 void GlCursor::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) {
   int data_size = cursor_shape.width() * cursor_shape.height() *
-      GlRenderLayer::kBytesPerPixel;
+                  GlRenderLayer::kBytesPerPixel;
   if (current_cursor_data_size_ < data_size) {
     current_cursor_data_size_ =
         kDefaultCursorDataSize > data_size ? kDefaultCursorDataSize : data_size;

remoting/client/gl_cursor.h → remoting/client/display/gl_cursor.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_OPENGL_GL_CURSOR_H_
-#define REMOTING_CLIENT_OPENGL_GL_CURSOR_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_CURSOR_H_
+#define REMOTING_CLIENT_DISPLAY_GL_CURSOR_H_
 
 #include <array>
 #include <cstdint>
@@ -63,4 +63,4 @@ class GlCursor {
 };
 
 }  // namespace remoting
-#endif  // REMOTING_CLIENT_OPENGL_GL_CURSOR_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_CURSOR_H_

remoting/client/gl_cursor_feedback.cc → remoting/client/display/gl_cursor_feedback.cc

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_cursor_feedback.h"
+#include "remoting/client/display/gl_cursor_feedback.h"
 
 #include <math.h>
 
 #include <array>
 
 #include "base/logging.h"
-#include "remoting/client/gl_canvas.h"
-#include "remoting/client/gl_cursor_feedback_texture.h"
-#include "remoting/client/gl_math.h"
-#include "remoting/client/gl_render_layer.h"
-#include "remoting/client/gl_texture_ids.h"
+#include "remoting/client/display/gl_canvas.h"
+#include "remoting/client/display/gl_cursor_feedback_texture.h"
+#include "remoting/client/display/gl_math.h"
+#include "remoting/client/display/gl_render_layer.h"
+#include "remoting/client/display/gl_texture_ids.h"
 
 namespace {
 
@@ -80,8 +80,8 @@ bool GlCursorFeedback::Draw() {
   float diameter = GetExpansionCoefficient(progress) * max_diameter_;
   std::array<float, 8> positions;
   FillRectangleVertexPositions(cursor_x_ - diameter / 2,
-                               cursor_y_ - diameter / 2,
-                               diameter, diameter, &positions);
+                               cursor_y_ - diameter / 2, diameter, diameter,
+                               &positions);
   layer_->SetVertexPositions(positions);
 
   // Linear fade-out.

remoting/client/gl_cursor_feedback.h → remoting/client/display/gl_cursor_feedback.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_OPENGL_GL_CURSOR_FEEDBACK_H_
-#define REMOTING_CLIENT_OPENGL_GL_CURSOR_FEEDBACK_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_CURSOR_FEEDBACK_H_
+#define REMOTING_CLIENT_DISPLAY_GL_CURSOR_FEEDBACK_H_
 
 #include <stdint.h>
 
@@ -45,4 +45,4 @@ class GlCursorFeedback {
 };
 
 }  // namespace remoting
-#endif  // REMOTING_CLIENT_OPENGL_GL_CURSOR_FEEDBACK_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_CURSOR_FEEDBACK_H_

remoting/client/gl_cursor_feedback_texture.cc → remoting/client/display/gl_cursor_feedback_texture.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_cursor_feedback_texture.h"
+#include "remoting/client/display/gl_cursor_feedback_texture.h"
 
-#include "remoting/client/gl_render_layer.h"
+#include "remoting/client/display/gl_render_layer.h"
 
 namespace remoting {
 
@@ -17,15 +17,15 @@ const int kFeedbackTexturePixelRadius = kFeedbackTexturePixelDiameter / 2;
 // RGBA8888 colors. From inside to outside.
 const uint8_t kFeedbackRingColors[kColorRingsCount]
                                  [GlRenderLayer::kBytesPerPixel] = {
-                                     {0x0, 0x0, 0x0, 0x7f},  // Black
-                                     {0x0, 0x0, 0x0, 0x7f},  // Black
+                                     {0x0, 0x0, 0x0, 0x7f},     // Black
+                                     {0x0, 0x0, 0x0, 0x7f},     // Black
                                      {0xff, 0xff, 0xff, 0x7f},  // White
                                      {0xff, 0xff, 0xff, 0x7f},  // White
                                      {0xff, 0xff, 0xff, 0}  // Transparent White
 };
 
-const float kFeedbackRadiusStops[kColorRingsCount] =
-    {0.0f, 0.85f, 0.9f, 0.95f, 1.0f};
+const float kFeedbackRadiusStops[kColorRingsCount] = {0.0f, 0.85f, 0.9f, 0.95f,
+                                                      1.0f};
 
 uint32_t GetColorByRadius(float radius) {
   int ring_index = kColorRingsCount - 1;

remoting/client/gl_cursor_feedback_texture.h → remoting/client/display/gl_cursor_feedback_texture.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_GL_CURSOR_FEEDBACK_TEXTURE_H_
-#define REMOTING_CLIENT_GL_CURSOR_FEEDBACK_TEXTURE_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_CURSOR_FEEDBACK_TEXTURE_H_
+#define REMOTING_CLIENT_DISPLAY_GL_CURSOR_FEEDBACK_TEXTURE_H_
 
 #include <vector>
 
@@ -34,4 +34,4 @@ class GlCursorFeedbackTexture {
 };
 
 }  // namespace remoting
-#endif  // REMOTING_CLIENT_GL_CURSOR_FEEDBACK_TEXTURE_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_CURSOR_FEEDBACK_TEXTURE_H_

remoting/client/gl_desktop.cc → remoting/client/display/gl_desktop.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_desktop.h"
+#include "remoting/client/display/gl_desktop.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "remoting/client/gl_canvas.h"
-#include "remoting/client/gl_math.h"
-#include "remoting/client/gl_render_layer.h"
-#include "remoting/client/gl_texture_ids.h"
+#include "remoting/client/display/gl_canvas.h"
+#include "remoting/client/display/gl_math.h"
+#include "remoting/client/display/gl_render_layer.h"
+#include "remoting/client/display/gl_texture_ids.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
 

remoting/client/gl_desktop.h → remoting/client/display/gl_desktop.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_OPENGL_GL_DESKTOP_H_
-#define REMOTING_CLIENT_OPENGL_GL_DESKTOP_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_
+#define REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_
 
 #include <memory>
 #include <vector>
@@ -52,4 +52,4 @@ class GlDesktop {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_OPENGL_GL_DESKTOP_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_DESKTOP_H_

remoting/client/gl_helpers.cc → remoting/client/display/gl_helpers.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_helpers.h"
+#include "remoting/client/display/gl_helpers.h"
 
 #include "base/logging.h"
 

remoting/client/gl_helpers.h → remoting/client/display/gl_helpers.h

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_GL_HELPERS_H_
-#define REMOTING_CLIENT_GL_HELPERS_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_HELPERS_H_
+#define REMOTING_CLIENT_DISPLAY_GL_HELPERS_H_
 
 #include "base/macros.h"
-#include "remoting/client/sys_opengl.h"
+#include "remoting/client/display/sys_opengl.h"
 
 namespace remoting {
 
@@ -26,4 +26,4 @@ GLuint CreateBuffer(const void* data, int size);
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_GL_HELPERS_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_HELPERS_H_

remoting/client/gl_math.cc → remoting/client/display/gl_math.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_math.h"
+#include "remoting/client/display/gl_math.h"
 
 #include <sstream>
 

remoting/client/gl_math.h → remoting/client/display/gl_math.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_OPENGL_GL_MATH_H_
-#define REMOTING_CLIENT_OPENGL_GL_MATH_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_MATH_H_
+#define REMOTING_CLIENT_DISPLAY_GL_MATH_H_
 
 #include <array>
 #include <string>
@@ -43,4 +43,4 @@ std::string MatrixToString(const float* mat, int num_rows, int num_cols);
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_OPENGL_GL_MATH_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_MATH_H_

remoting/client/gl_render_layer.cc → remoting/client/display/gl_render_layer.cc

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_render_layer.h"
+#include "remoting/client/display/gl_render_layer.h"
 
 #include "base/logging.h"
-#include "remoting/client/gl_canvas.h"
-#include "remoting/client/gl_helpers.h"
-
+#include "remoting/client/display/gl_canvas.h"
+#include "remoting/client/display/gl_helpers.h"
 
 namespace remoting {
 

remoting/client/gl_render_layer.h → remoting/client/display/gl_render_layer.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_OPENGL_GL_RENDER_LAYER_H_
-#define REMOTING_CLIENT_OPENGL_GL_RENDER_LAYER_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_RENDER_LAYER_H_
+#define REMOTING_CLIENT_DISPLAY_GL_RENDER_LAYER_H_
 
 #include <array>
 #include <memory>
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
-#include "remoting/client/sys_opengl.h"
+#include "remoting/client/display/sys_opengl.h"
 
 namespace remoting {
 class GlCanvas;
@@ -97,4 +97,4 @@ class GlRenderLayer {
 };
 
 }  // namespace remoting
-#endif  // REMOTING_CLIENT_OPENGL_GL_RENDER_LAYER_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_RENDER_LAYER_H_

remoting/client/gl_renderer.cc → remoting/client/display/gl_renderer.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_renderer.h"
+#include "remoting/client/display/gl_renderer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "remoting/client/gl_canvas.h"
-#include "remoting/client/gl_math.h"
-#include "remoting/client/gl_renderer_delegate.h"
-#include "remoting/client/sys_opengl.h"
+#include "remoting/client/display/gl_canvas.h"
+#include "remoting/client/display/gl_math.h"
+#include "remoting/client/display/gl_renderer_delegate.h"
+#include "remoting/client/display/sys_opengl.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
 namespace remoting {

remoting/client/gl_renderer.h → remoting/client/display/gl_renderer.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_GL_RENDERER_H_
-#define REMOTING_CLIENT_GL_RENDERER_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_RENDERER_H_
+#define REMOTING_CLIENT_DISPLAY_GL_RENDERER_H_
 
 #include <queue>
 
@@ -11,9 +11,9 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "remoting/client/gl_cursor.h"
-#include "remoting/client/gl_cursor_feedback.h"
-#include "remoting/client/gl_desktop.h"
+#include "remoting/client/display/gl_cursor.h"
+#include "remoting/client/display/gl_cursor_feedback.h"
+#include "remoting/client/display/gl_desktop.h"
 #include "remoting/proto/control.pb.h"
 
 namespace webrtc {
@@ -134,4 +134,4 @@ class GlRenderer {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_GL_RENDERER_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_RENDERER_H_

remoting/client/gl_renderer_delegate.h → remoting/client/display/gl_renderer_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_GL_RENDERER_DELEGATE_H_
-#define REMOTING_CLIENT_GL_RENDERER_DELEGATE_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_RENDERER_DELEGATE_H_
+#define REMOTING_CLIENT_DISPLAY_GL_RENDERER_DELEGATE_H_
 
 #include "base/macros.h"
 
@@ -29,4 +29,4 @@ class GlRendererDelegate {
 };
 
 }  // namespace remoting
-#endif  // REMOTING_CLIENT_GL_RENDERER_DELEGATE_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_RENDERER_DELEGATE_H_

remoting/client/gl_renderer_unittest.cc → remoting/client/display/gl_renderer_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/gl_renderer.h"
+#include "remoting/client/display/gl_renderer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -10,7 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "remoting/client/gl_renderer_delegate.h"
+#include "remoting/client/display/gl_renderer_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
@@ -42,29 +42,19 @@ class FakeGlRendererDelegate : public GlRendererDelegate {
     on_frame_rendered_callback_ = callback;
   }
 
-  int canvas_width() {
-    return canvas_width_;
-  }
+  int canvas_width() { return canvas_width_; }
 
-  int canvas_height() {
-    return canvas_height_;
-  }
+  int canvas_height() { return canvas_height_; }
 
   base::WeakPtr<FakeGlRendererDelegate> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
   }
 
-  int can_render_frame_call_count() {
-    return can_render_frame_call_count_;
-  }
+  int can_render_frame_call_count() { return can_render_frame_call_count_; }
 
-  int on_frame_rendered_call_count() {
-    return on_frame_rendered_call_count_;
-  }
+  int on_frame_rendered_call_count() { return on_frame_rendered_call_count_; }
 
-  int on_size_changed_call_count() {
-    return on_size_changed_call_count_;
-  }
+  int on_size_changed_call_count() { return on_size_changed_call_count_; }
 
   bool can_render_frame_ = false;
 
@@ -120,8 +110,8 @@ void GlRendererTest::SetDesktopFrameWithSize(const webrtc::DesktopSize& size) {
                  base::Unretained(this)));
 }
 
-void GlRendererTest::PostSetDesktopFrameTasks(
-    const webrtc::DesktopSize& size, int count) {
+void GlRendererTest::PostSetDesktopFrameTasks(const webrtc::DesktopSize& size,
+                                              int count) {
   for (int i = 0; i < count; i++) {
     message_loop_.task_runner()->PostTask(
         FROM_HERE, base::Bind(&GlRendererTest::SetDesktopFrameWithSize,
@@ -145,7 +135,6 @@ void GlRendererTest::RunUntilRendered() {
   run_loop.Run();
 }
 
-
 TEST_F(GlRendererTest, TestDelegateCanRenderFrame) {
   delegate_.can_render_frame_ = true;
   RequestRender();

remoting/client/gl_texture_ids.h → remoting/client/display/gl_texture_ids.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_GL_TEXTURE_IDS_H_
-#define REMOTING_CLIENT_GL_TEXTURE_IDS_H_
+#ifndef REMOTING_CLIENT_DISPLAY_GL_TEXTURE_IDS_H_
+#define REMOTING_CLIENT_DISPLAY_GL_TEXTURE_IDS_H_
 
 #include "base/macros.h"
 
@@ -19,4 +19,4 @@ const int kGlDesktopFirstTextureId = 2;
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_GL_TEXTURE_IDS_H_
+#endif  // REMOTING_CLIENT_DISPLAY_GL_TEXTURE_IDS_H_

remoting/client/sys_opengl.h → remoting/client/display/sys_opengl.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_SYS_OPENGL_H_
-#define REMOTING_CLIENT_SYS_OPENGL_H_
+#ifndef REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_
+#define REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_
 
 #include "build/build_config.h"
 
@@ -21,4 +21,4 @@
 #include <GLES3/gl3.h>
 #endif  // defined(OS_IOS)
 
-#endif  // REMOTING_CLIENT_SYS_OPENGL_H_
+#endif  // REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_

remoting/client/ios/example_view_controller.mm

@@ -8,7 +8,7 @@
 
 #import "remoting/client/ios/example_view_controller.h"
 
-#import "remoting/client/sys_opengl.h"
+#import "remoting/client/display/sys_opengl.h"
 
 @interface ExampleViewController()
 

remoting/client/jni/jni_gl_display_handler.h

@@ -11,8 +11,8 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "remoting/client/gl_renderer.h"
-#include "remoting/client/gl_renderer_delegate.h"
+#include "remoting/client/display/gl_renderer.h"
+#include "remoting/client/display/gl_renderer_delegate.h"
 #include "remoting/client/queued_task_poster.h"
 #include "remoting/protocol/cursor_shape_stub.h"