diff options
Diffstat (limited to 'Source/WebCore/plugins/PluginView.h')
| -rw-r--r-- | Source/WebCore/plugins/PluginView.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/plugins/PluginView.h b/Source/WebCore/plugins/PluginView.h index 9321a86..e2dbb49 100644 --- a/Source/WebCore/plugins/PluginView.h +++ b/Source/WebCore/plugins/PluginView.h @@ -438,7 +438,11 @@ public: private: +<<<<<<< HEAD #if defined(XP_UNIX) || OS(SYMBIAN) || defined(ANDROID_PLUGINS) +======= +#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK) +>>>>>>> WebKit.org at r84325 void setNPWindowIfNeeded(); #elif defined(XP_MACOSX) NP_CGContext m_npCgContext; |