| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include <errno.h> | 5 #include <errno.h> |
| 6 #include <stdlib.h> | 6 #include <stdlib.h> |
| 7 #include <sys/ipc.h> | 7 #include <sys/ipc.h> |
| 8 #include <sys/shm.h> | 8 #include <sys/shm.h> |
| 9 | 9 |
| 10 #include "app/surface/transport_dib.h" | 10 #include "app/surface/transport_dib.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/scoped_ptr.h" | 12 #include "base/scoped_ptr.h" |
| 13 #include "gfx/size.h" | |
| 14 #include "skia/ext/platform_canvas.h" | 13 #include "skia/ext/platform_canvas.h" |
| 15 #include "ui/base/x/x11_util.h" | 14 #include "ui/base/x/x11_util.h" |
| 15 #include "ui/gfx/size.h" |
| 16 | 16 |
| 17 // The shmat system call uses this as it's invalid return address | 17 // The shmat system call uses this as it's invalid return address |
| 18 static void *const kInvalidAddress = (void*) -1; | 18 static void *const kInvalidAddress = (void*) -1; |
| 19 | 19 |
| 20 TransportDIB::TransportDIB() | 20 TransportDIB::TransportDIB() |
| 21 : key_(-1), | 21 : key_(-1), |
| 22 address_(kInvalidAddress), | 22 address_(kInvalidAddress), |
| 23 x_shm_(0), | 23 x_shm_(0), |
| 24 display_(NULL), | 24 display_(NULL), |
| 25 size_(0) { | 25 size_(0) { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 } | 127 } |
| 128 | 128 |
| 129 XID TransportDIB::MapToX(Display* display) { | 129 XID TransportDIB::MapToX(Display* display) { |
| 130 if (!x_shm_) { | 130 if (!x_shm_) { |
| 131 x_shm_ = ui::AttachSharedMemory(display, key_); | 131 x_shm_ = ui::AttachSharedMemory(display, key_); |
| 132 display_ = display; | 132 display_ = display; |
| 133 } | 133 } |
| 134 | 134 |
| 135 return x_shm_; | 135 return x_shm_; |
| 136 } | 136 } |
| OLD | NEW |