diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 00:01:23 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 00:01:23 +0000 |
| commit | bed956d5ad7e7b6128067eb32c2dd6d1f1c3a75e (patch) | |
| tree | 5812df7fbef8dcd3010447698774d45e95d304a9 | |
| parent | 719f9c66f051914fe3d41e7815afd541e7ed6a7f (diff) | |
| download | chromium_src-bed956d5ad7e7b6128067eb32c2dd6d1f1c3a75e.zip chromium_src-bed956d5ad7e7b6128067eb32c2dd6d1f1c3a75e.tar.gz chromium_src-bed956d5ad7e7b6128067eb32c2dd6d1f1c3a75e.tar.bz2 | |
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
| -rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl.h | 6 |
1 files 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_; |