ui/surface/transport_dib_posix.cc - Issue 13985039: Rationalize linux vs x11 in ui

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: ui/surface/transport_dib_posix.cc

Issue 13985039: Rationalize linux vs x11 in ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix review / try issues Created 7 years, 7 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 | « ui/surface/transport_dib.h ('k') | ui/ui.gyp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "ui/surface/transport_dib.h"	5 #include "ui/surface/transport_dib.h"

6	6

7 // Desktop GTK Linux builds use the old-style SYSV SHM based DIBs.	7 // Desktop GTK Linux builds use the old-style SYSV SHM based DIBs.

8 // Linux Aura and Chrome OS do too. This will change very soon.	8 // Linux Aura and Chrome OS do too. This will change very soon.

9 #if !defined(TOOLKIT_GTK) && !(defined(OS_LINUX) && defined(USE_AURA))	9 #if defined(USE_X11) && !defined(TOOLKIT_GTK) && !(defined(OS_LINUX) && defined( USE_AURA))

10	10

11 #include <sys/stat.h>	11 #include <sys/stat.h>

12 #include <unistd.h>	12 #include <unistd.h>

13	13

14 #include "base/logging.h"	14 #include "base/logging.h"

15 #include "base/memory/scoped_ptr.h"	15 #include "base/memory/scoped_ptr.h"

16 #include "base/memory/shared_memory.h"	16 #include "base/memory/shared_memory.h"

17 #include "base/posix/eintr_wrapper.h"	17 #include "base/posix/eintr_wrapper.h"

18 #include "skia/ext/platform_canvas.h"	18 #include "skia/ext/platform_canvas.h"

19	19

(...skipping 89 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
109 return shared_memory_.id();	109 return shared_memory_.id();

110 #endif	110 #endif

111 }	111 }

112	112

113 TransportDIB::Handle TransportDIB::handle() const {	113 TransportDIB::Handle TransportDIB::handle() const {

114 return shared_memory_.handle();	114 return shared_memory_.handle();

115 }	115 }

116	116

117 #endif // !defined(TOOLKIT_GTK) && !(defined(OS_LINUX) && defined(USE_AURA))	117 #endif // !defined(TOOLKIT_GTK) && !(defined(OS_LINUX) && defined(USE_AURA))

118	118

OLD	NEW