trunk/src/content/browser/aura/software_output_device_ozone.h - Issue 137853019: Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: trunk/src/content/browser/aura/software_output_device_ozone.h

Issue 137853019: Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness (Closed) Base URL: svn://svn.chromium.org/chrome/

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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/content/browser/aura/software_browser_compositor_output_surface_unittest.cc ('k') | trunk/src/content/browser/aura/software_output_device_ozone.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_	5 #ifndef CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_

6 #define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_	6 #define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_

7	7

8 #include "cc/output/software_output_device.h"	8 #include "cc/output/software_output_device.h"

9 #include "content/common/content_export.h"	9 #include "content/common/content_export.h"

10 #include "ui/gfx/native_widget_types.h"	10 #include "ui/gfx/native_widget_types.h"

(...skipping 21 matching lines...) Expand all Loading...
32 ui::Compositor* compositor_;	32 ui::Compositor* compositor_;

33	33

34 gfx::AcceleratedWidget realized_widget_;	34 gfx::AcceleratedWidget realized_widget_;

35	35

36 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone);	36 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone);

37 };	37 };

38	38

39 } // namespace content	39 } // namespace content

40	40

41 #endif // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_	41 #endif // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_

OLD	NEW