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 /content/plugin | |
| 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 'content/plugin')
| -rw-r--r-- | content/plugin/webplugin_proxy.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 92edf70..ecdab98 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -75,7 +75,7 @@ WebPluginProxy::WebPluginProxy( // If the X server supports SHM pixmaps // and the color depth and masks match, // then consider using SHM pixmaps for windowless plugin painting. - Display* display = ui::GetXDisplay(); + XDisplay* display = gfx::GetXDisplay(); if (ui::QuerySharedMemorySupport(display) == ui::SHARED_MEMORY_PIXMAP && ui::BitsPerPixelForPixmapDepth( display, DefaultDepth(display, DefaultScreen(display))) == 32) { @@ -92,9 +92,9 @@ WebPluginProxy::WebPluginProxy( WebPluginProxy::~WebPluginProxy() { #if defined(USE_X11) if (windowless_shm_pixmaps_[0] != None) - XFreePixmap(ui::GetXDisplay(), windowless_shm_pixmaps_[0]); + XFreePixmap(gfx::GetXDisplay(), windowless_shm_pixmaps_[0]); if (windowless_shm_pixmaps_[1] != None) - XFreePixmap(ui::GetXDisplay(), windowless_shm_pixmaps_[1]); + XFreePixmap(gfx::GetXDisplay(), windowless_shm_pixmaps_[1]); #endif #if defined(OS_MACOSX) @@ -557,7 +557,7 @@ void WebPluginProxy::CreateShmPixmapFromDIB( const gfx::Rect& window_rect, XID* pixmap_out) { if (dib) { - Display* display = ui::GetXDisplay(); + XDisplay* display = gfx::GetXDisplay(); XID root_window = ui::GetX11RootWindow(); XShmSegmentInfo shminfo = {0}; |