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

Side by Side Diff: ui/gfx/surface/transport_dib_linux.cc

Issue 6718027: Refactor: Move app/surface to ui/gfx/surface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 9 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/gfx/surface/transport_dib.h ('k') | ui/gfx/surface/transport_dib_mac.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/gfx/surface/transport_dib.h"
6
5 #include <errno.h> 7 #include <errno.h>
6 #include <stdlib.h> 8 #include <stdlib.h>
7 #include <sys/ipc.h> 9 #include <sys/ipc.h>
8 #include <sys/shm.h> 10 #include <sys/shm.h>
9 11
10 #include "app/surface/transport_dib.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
12 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
13 #include "skia/ext/platform_canvas.h" 14 #include "skia/ext/platform_canvas.h"
14 #include "ui/base/x/x11_util.h" 15 #include "ui/base/x/x11_util.h"
15 #include "ui/gfx/size.h" 16 #include "ui/gfx/size.h"
16 17
17 // The shmat system call uses this as it's invalid return address 18 // The shmat system call uses this as it's invalid return address
18 static void *const kInvalidAddress = (void*) -1; 19 static void *const kInvalidAddress = (void*) -1;
19 20
20 TransportDIB::TransportDIB() 21 TransportDIB::TransportDIB()
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 } 132 }
132 133
133 XID TransportDIB::MapToX(Display* display) { 134 XID TransportDIB::MapToX(Display* display) {
134 if (!x_shm_) { 135 if (!x_shm_) {
135 x_shm_ = ui::AttachSharedMemory(display, key_.shmkey); 136 x_shm_ = ui::AttachSharedMemory(display, key_.shmkey);
136 display_ = display; 137 display_ = display;
137 } 138 }
138 139
139 return x_shm_; 140 return x_shm_;
140 } 141 }
OLDNEW
« no previous file with comments | « ui/gfx/surface/transport_dib.h ('k') | ui/gfx/surface/transport_dib_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698