| OLD | NEW |
|---|
| 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 #include "ui/gfx/surface/transport_dib.h" | 5 #include "ui/surface/transport_dib.h" |
| 6 | 6 |
| 7 #include <errno.h> | 7 #include <errno.h> |
| 8 #include <stdlib.h> | 8 #include <stdlib.h> |
| 9 #include <sys/ipc.h> | 9 #include <sys/ipc.h> |
| 10 #include <sys/shm.h> | 10 #include <sys/shm.h> |
| 11 | 11 |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "skia/ext/platform_canvas.h" | 14 #include "skia/ext/platform_canvas.h" |
| 15 #include "ui/base/x/x11_util.h" | 15 #include "ui/base/x/x11_util.h" |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 } | 132 } |
| 133 | 133 |
| 134 XID TransportDIB::MapToX(Display* display) { | 134 XID TransportDIB::MapToX(Display* display) { |
| 135 if (!x_shm_) { | 135 if (!x_shm_) { |
| 136 x_shm_ = ui::AttachSharedMemory(display, key_.shmkey); | 136 x_shm_ = ui::AttachSharedMemory(display, key_.shmkey); |
| 137 display_ = display; | 137 display_ = display; |
| 138 } | 138 } |
| 139 | 139 |
| 140 return x_shm_; | 140 return x_shm_; |
| 141 } | 141 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10351002:
ui: Move surface/ directory out of gfx/, up to ui/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src