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-06 16:04:40 (GMT) |
| commit | fd06a0f462e85949e2499cf6dd7f4540e24c5c68 (patch) | |
| tree | ccff2f35024b3602d11f8d9c60e1b8259c88e4f8 /src/3rdparty/webkit | |
| parent | d39b1e08921d6261f2f618cbd92b1415d69592eb (diff) | |
| download | Qt-fd06a0f462e85949e2499cf6dd7f4540e24c5c68.zip Qt-fd06a0f462e85949e2499cf6dd7f4540e24c5c68.tar.gz Qt-fd06a0f462e85949e2499cf6dd7f4540e24c5c68.tar.bz2 | |
QtWebKit: fix build with qws temporarily until next import.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/webkit')
| -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 |