diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 16:04:40 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-12 19:24:28 (GMT) |
| commit | e7bd289b2d748e0d326f34be9bf1db51058d8f01 (patch) | |
| tree | 4ce3de94ce2c5fd9bf16199568776c018a26b1b2 /src/3rdparty/webkit/WebCore | |
| parent | 1b4736527627fd29074d853a48ea8f94b238fe9b (diff) | |
| download | Qt-e7bd289b2d748e0d326f34be9bf1db51058d8f01.zip Qt-e7bd289b2d748e0d326f34be9bf1db51058d8f01.tar.gz Qt-e7bd289b2d748e0d326f34be9bf1db51058d8f01.tar.bz2 | |
QtWebKit: fix build with qws temporarily until next import.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/PluginView.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/PluginViewNone.cpp | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp b/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp index 51a43ac..38acdd9 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp @@ -1298,6 +1298,7 @@ void PluginView::keepAlive(NPP instance) } #endif +#if ENABLE(NETSCAPE_PLUGIN_API) NPError PluginView::getValueStatic(NPNVariable variable, void* value) { LOG(Plugins, "PluginView::getValueStatic(%s)", prettyNameForNPNVariable(variable).data()); @@ -1308,6 +1309,7 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) return NPERR_GENERIC_ERROR; } +#endif NPError PluginView::getValue(NPNVariable variable, void* value) { @@ -1317,8 +1319,10 @@ NPError PluginView::getValue(NPNVariable variable, void* value) if (platformGetValue(variable, value, &result)) return result; +#if ENABLE(NETSCAPE_PLUGIN_API) if (platformGetValueStatic(variable, value, &result)) return result; +#endif switch (variable) { #if ENABLE(NETSCAPE_PLUGIN_API) diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginViewNone.cpp b/src/3rdparty/webkit/WebCore/plugins/PluginViewNone.cpp index 16383cc..ed5ad1b 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginViewNone.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/PluginViewNone.cpp @@ -126,12 +126,4 @@ void PluginView::keepAlive(NPP) } #endif -void PluginView::privateBrowsingStateChanged(bool) -{ -} - -void PluginView::setJavaScriptPaused(bool) -{ -} - } // namespace WebCore |