From e7bd289b2d748e0d326f34be9bf1db51058d8f01 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 6 Apr 2010 18:04:40 +0200 Subject: QtWebKit: fix build with qws temporarily until next import. Reviewed-by: Simon Hausmann --- src/3rdparty/webkit/WebCore/plugins/PluginView.cpp | 4 ++++ 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 -- cgit v0.12