diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 17:41:39 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 17:41:39 +0000 |
| commit | c4eb2947a68a9ceb064f789ded6f06ce8a5b0497 (patch) | |
| tree | 6eccf6da9f8557688cd9b6f0c2de860b81824d89 /ui/surface | |
| parent | f746ee6b3e71c5688a1f774faa0602799c7118d6 (diff) | |
| download | chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.zip chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.tar.gz chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.tar.bz2 | |
Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h
This is to break a dependency on ui/base from ui/compositor.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/23460052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/surface')
| -rw-r--r-- | ui/surface/transport_dib.h | 5 | ||||
| -rw-r--r-- | ui/surface/transport_dib_gtk.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ui/surface/transport_dib.h b/ui/surface/transport_dib.h index 1d5410d..7ec7bb8 100644 --- a/ui/surface/transport_dib.h +++ b/ui/surface/transport_dib.h @@ -16,6 +16,7 @@ #include <windows.h> #elif defined(TOOLKIT_GTK) #include "ui/base/x/x11_util.h" +#include "ui/gfx/x/x11_types.h" #endif class SkCanvas; @@ -189,7 +190,7 @@ class SURFACE_EXPORT TransportDIB { #if defined(TOOLKIT_GTK) // Map the shared memory into the X server and return an id for the shared // segment. - XID MapToX(Display* connection); + XID MapToX(XDisplay* connection); void IncreaseInFlightCounter() { inflight_counter_++; } // Decreases the inflight counter, and deletes the transport DIB if it is @@ -211,7 +212,7 @@ class SURFACE_EXPORT TransportDIB { Id key_; // SysV shared memory id void* address_; // mapped address XSharedMemoryId x_shm_; // X id for the shared segment - Display* display_; // connection to the X server + XDisplay* display_; // connection to the X server size_t inflight_counter_; // How many requests to the X server are in flight bool detached_; // If true, delete the transport DIB when it is idle #else diff --git a/ui/surface/transport_dib_gtk.cc b/ui/surface/transport_dib_gtk.cc index 31f6513..61ec624 100644 --- a/ui/surface/transport_dib_gtk.cc +++ b/ui/surface/transport_dib_gtk.cc @@ -133,7 +133,7 @@ TransportDIB::Handle TransportDIB::handle() const { return key_.shmkey; } -XID TransportDIB::MapToX(Display* display) { +XID TransportDIB::MapToX(XDisplay* display) { if (!x_shm_) { x_shm_ = ui::AttachSharedMemory(display, key_.shmkey); display_ = display; |