From bed956d5ad7e7b6128067eb32c2dd6d1f1c3a75e Mon Sep 17 00:00:00 2001 From: "saintlou@chromium.org" Date: Sat, 1 Oct 2011 00:01:23 +0000 Subject: Make ifdef match between content/plugin/webplugin_proxy.cc and chrome/src/webkit/plugins/npapi/webplugin_delegate_impl.h. BUG=97131 TEST=none Review URL: http://codereview.chromium.org/8100006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103592 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/plugins/npapi/webplugin_delegate_impl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h index ffb95da..f8e20fc 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.h +++ b/webkit/plugins/npapi/webplugin_delegate_impl.h @@ -202,7 +202,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { void set_windowed_handle(gfx::PluginWindowHandle handle); #endif -#if defined(TOOLKIT_USES_GTK) +#if defined(USE_X11) void SetWindowlessShmPixmap(XID shm_pixmap) { windowless_shm_pixmap_ = shm_pixmap; } @@ -320,10 +320,12 @@ class WebPluginDelegateImpl : public WebPluginDelegate { bool is_calling_wndproc; #endif // defined(OS_WIN) -#if defined(TOOLKIT_USES_GTK) +#if defined(USE_X11) // The SHM pixmap for a windowless plugin. XID windowless_shm_pixmap_; +#endif +#if defined(TOOLKIT_USES_GTK) // The pixmap we're drawing into, for a windowless plugin. GdkPixmap* pixmap_; double first_event_time_; -- cgit v1.1