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

Side by Side Diff: trunk/src/content/browser/aura/software_output_device_x11.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
OLDNEW
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_X11_H_ 5 #ifndef CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_
6 #define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_ 6 #define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include "cc/output/software_output_device.h" 10 #include "cc/output/software_output_device.h"
(...skipping 16 matching lines...) Expand all
27 private: 27 private:
28 ui::Compositor* compositor_; 28 ui::Compositor* compositor_;
29 XDisplay* display_; 29 XDisplay* display_;
30 GC gc_; 30 GC gc_;
31 XWindowAttributes attributes_; 31 XWindowAttributes attributes_;
32 }; 32 };
33 33
34 } // namespace content 34 } // namespace content
35 35
36 #endif // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_ 36 #endif // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698