diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
| commit | 43a42f108af6bcbd91f2672731c3047c26213af1 (patch) | |
| tree | 7fa092e5f5d873c72f2486a70e26be26f7a38bec /Source/WebKit2/UIProcess/API/C/WKContext.cpp | |
| parent | d9cf437c840c6eb7417bdd97e6c40979255d3158 (diff) | |
| download | qtwebkit-43a42f108af6bcbd91f2672731c3047c26213af1.tar.gz | |
Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)
New snapshot that fixes build without QtWidgets
Diffstat (limited to 'Source/WebKit2/UIProcess/API/C/WKContext.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/C/WKContext.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/C/WKContext.cpp b/Source/WebKit2/UIProcess/API/C/WKContext.cpp index 26e4ab6a4..117bbeda3 100644 --- a/Source/WebKit2/UIProcess/API/C/WKContext.cpp +++ b/Source/WebKit2/UIProcess/API/C/WKContext.cpp @@ -32,6 +32,7 @@ #include "WebURLRequest.h" #include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> +#include <wtf/UnusedParam.h> #include <wtf/text/WTFString.h> using namespace WebKit; @@ -142,7 +143,12 @@ void WKContextSetShouldUseFontSmoothing(WKContextRef contextRef, bool useFontSmo void WKContextSetAdditionalPluginsDirectory(WKContextRef contextRef, WKStringRef pluginsDirectory) { +#if ENABLE(NETSCAPE_PLUGIN_API) toImpl(contextRef)->setAdditionalPluginsDirectory(toImpl(pluginsDirectory)->string()); +#else + UNUSED_PARAM(contextRef); + UNUSED_PARAM(pluginsDirectory); +#endif } void WKContextRegisterURLSchemeAsEmptyDocument(WKContextRef contextRef, WKStringRef urlScheme) @@ -224,7 +230,11 @@ WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef contextRef WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef contextRef) { +#if ENABLE(NETSCAPE_PLUGIN_API) return toAPI(toImpl(contextRef)->pluginSiteDataManager()); +#else + return 0; +#endif } WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef contextRef) |