diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-20 11:26:21 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-01-20 11:26:21 -0800 |
| commit | 12250939d507d6cacda32b1b073ccd0d06a88d11 (patch) | |
| tree | 3950da795e6bd9f449603ecef0ad816c8fa43b42 /WebCore/plugins/PluginView.h | |
| parent | a01a68253f642c4d9219f0aca9ccc6c5da9e46b0 (diff) | |
| parent | 9dabd572bcca8e38d72ee40eaf442a9bb0790508 (diff) | |
| download | external_webkit-12250939d507d6cacda32b1b073ccd0d06a88d11.zip external_webkit-12250939d507d6cacda32b1b073ccd0d06a88d11.tar.gz external_webkit-12250939d507d6cacda32b1b073ccd0d06a88d11.tar.bz2 | |
resolved conflicts for merge of 9dabd572 to master
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index a5618f7..0ce9c7c 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -373,7 +373,7 @@ public: private: -#if defined(XP_UNIX) || defined(Q_WS_X11) || PLATFORM(SYMBIAN) +#if defined(XP_UNIX) || defined(Q_WS_X11) || PLATFORM(SYMBIAN) || defined(ANDROID_PLUGINS) void setNPWindowIfNeeded(); #elif defined(XP_MACOSX) NP_CGContext m_npCgContext; |