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

Side by Side Diff: chrome/common/transport_dib.h

Issue 164226: linux: fix race in TransportDIB passing (Closed)
Patch Set: Add newline for clarity Created 11 years, 4 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
« no previous file with comments | « no previous file | chrome/common/transport_dib_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 CHROME_COMMON_TRANSPORT_DIB_H_ 5 #ifndef CHROME_COMMON_TRANSPORT_DIB_H_
6 #define CHROME_COMMON_TRANSPORT_DIB_H_ 6 #define CHROME_COMMON_TRANSPORT_DIB_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 9
10 #if defined(OS_WIN) || defined(OS_MACOSX) 10 #if defined(OS_WIN) || defined(OS_MACOSX)
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 explicit TransportDIB(base::SharedMemoryHandle dib); 135 explicit TransportDIB(base::SharedMemoryHandle dib);
136 base::SharedMemory shared_memory_; 136 base::SharedMemory shared_memory_;
137 uint32 sequence_num_; 137 uint32 sequence_num_;
138 #elif defined(OS_LINUX) 138 #elif defined(OS_LINUX)
139 int key_; // SysV shared memory id 139 int key_; // SysV shared memory id
140 void* address_; // mapped address 140 void* address_; // mapped address
141 XID x_shm_; // X id for the shared segment 141 XID x_shm_; // X id for the shared segment
142 Display* display_; // connection to the X server 142 Display* display_; // connection to the X server
143 #endif 143 #endif
144 size_t size_; // length, in bytes 144 size_t size_; // length, in bytes
145
146 DISALLOW_COPY_AND_ASSIGN(TransportDIB);
145 }; 147 };
146 148
147 class MessageLoop; 149 class MessageLoop;
148 150
149 #endif // CHROME_COMMON_TRANSPORT_DIB_H_ 151 #endif // CHROME_COMMON_TRANSPORT_DIB_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/common/transport_dib_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698