services/sky/compositor/resource_manager.cc - Issue 1235093002: Move sky_viewer into services/sky

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: services/sky/compositor/resource_manager.cc

Issue 1235093002: Move sky_viewer into services/sky (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: again Created 5 years, 5 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:

Index: services/sky/compositor/resource_manager.cc

diff --git a/sky/viewer/compositor/resource_manager.cc b/services/sky/compositor/resource_manager.cc

similarity index 97%

rename from sky/viewer/compositor/resource_manager.cc

rename to services/sky/compositor/resource_manager.cc

index 172dc124b3d0564bb434aeb748d7bd803ba81403..4bf0f4ec56ff68426ea03baff53fdd29f2e0aeac 100644

--- a/sky/viewer/compositor/resource_manager.cc

+++ b/services/sky/compositor/resource_manager.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 "sky/viewer/compositor/resource_manager.h"

+#include "services/sky/compositor/resource_manager.h"

#ifndef GL_GLEXT_PROTOTYPES

#define GL_GLEXT_PROTOTYPES

@@ -16,7 +16,7 @@

#include "mojo/gpu/gl_context.h"

#include "mojo/gpu/gl_texture.h"

#include "mojo/public/c/gles2/gles2.h"

-#include "sky/viewer/compositor/layer.h"

+#include "services/sky/compositor/layer.h"

namespace sky {