Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(539)

Unified Diff: remoting/client/display/gl_renderer_unittest.cc

Issue 2614443003: Moving the GL implementation details into a sub folder for client display. (Closed)
Patch Set: Adding deps restriction on r/c/display; Moving sys_opengl.h Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/display/gl_renderer_delegate.h ('k') | remoting/client/display/gl_texture_ids.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/display/gl_renderer_unittest.cc
diff --git a/remoting/client/gl_renderer_unittest.cc b/remoting/client/display/gl_renderer_unittest.cc
similarity index 90%
rename from remoting/client/gl_renderer_unittest.cc
rename to remoting/client/display/gl_renderer_unittest.cc
index 1a17e42613203011e1cc34a504be33ae4680d2bc..7edb9bd0e07b56910365bdfaf0b81ec846e9dabf 100644
--- a/remoting/client/gl_renderer_unittest.cc
+++ b/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();
« no previous file with comments | « remoting/client/display/gl_renderer_delegate.h ('k') | remoting/client/display/gl_texture_ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698