content/browser/compositor/software_browser_compositor_output_surface.h - Issue 140753005: Add the UI compositor to the Mac build

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: content/browser/compositor/software_browser_compositor_output_surface.h

Issue 140753005: Add the UI compositor to the Mac build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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 | « content/browser/compositor/resize_lock.cc ('k') | content/browser/compositor/software_browser_compositor_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/software_browser_compositor_output_surface.h

diff --git a/content/browser/aura/software_browser_compositor_output_surface.h b/content/browser/compositor/software_browser_compositor_output_surface.h

similarity index 76%

rename from content/browser/aura/software_browser_compositor_output_surface.h

rename to content/browser/compositor/software_browser_compositor_output_surface.h

index 79c7901f05585e12e2bea8fad4f02d4ea53fffcc..88bf9a9b146227e35f5090a2a902e4818b9a1694 100644

--- a/content/browser/aura/software_browser_compositor_output_surface.h

+++ b/content/browser/compositor/software_browser_compositor_output_surface.h

@@ -1,12 +1,12 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_

-#define CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_

+#ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_

+#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_

#include "base/memory/weak_ptr.h"

-#include "content/browser/aura/browser_compositor_output_surface.h"

+#include "content/browser/compositor/browser_compositor_output_surface.h"

#include "content/common/content_export.h"

#include "ui/compositor/compositor.h"

@@ -47,4 +47,4 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSurface

} // namespace content

-#endif // CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_

+#endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_