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

Side by Side Diff: ui/surface/transport_dib.h

Issue 10351002: ui: Move surface/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix gpu DEPS Created 8 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/surface_export.h ('k') | ui/surface/transport_dib_android.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) 2011 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 #ifndef UI_GFX_SURFACE_TRANSPORT_DIB_H_ 5 #ifndef UI_SURFACE_TRANSPORT_DIB_H_
6 #define UI_GFX_SURFACE_TRANSPORT_DIB_H_ 6 #define UI_SURFACE_TRANSPORT_DIB_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "ui/gfx/surface/surface_export.h" 10 #include "ui/surface/surface_export.h"
11 11
12 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) 12 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
13 #include "base/shared_memory.h" 13 #include "base/shared_memory.h"
14 #endif 14 #endif
15 15
16 #if defined(OS_WIN) 16 #if defined(OS_WIN)
17 #include <windows.h> 17 #include <windows.h>
18 #elif defined(USE_X11) 18 #elif defined(USE_X11)
19 #include "ui/base/x/x11_util.h" 19 #include "ui/base/x/x11_util.h"
20 #endif 20 #endif
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 Id key_; // SysV shared memory id 207 Id key_; // SysV shared memory id
208 void* address_; // mapped address 208 void* address_; // mapped address
209 XSharedMemoryId x_shm_; // X id for the shared segment 209 XSharedMemoryId x_shm_; // X id for the shared segment
210 Display* display_; // connection to the X server 210 Display* display_; // connection to the X server
211 #endif 211 #endif
212 size_t size_; // length, in bytes 212 size_t size_; // length, in bytes
213 213
214 DISALLOW_COPY_AND_ASSIGN(TransportDIB); 214 DISALLOW_COPY_AND_ASSIGN(TransportDIB);
215 }; 215 };
216 216
217 #endif // UI_GFX_SURFACE_TRANSPORT_DIB_H_ 217 #endif // UI_SURFACE_TRANSPORT_DIB_H_
OLDNEW
« no previous file with comments | « ui/surface/surface_export.h ('k') | ui/surface/transport_dib_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698