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