diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
| commit | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (patch) | |
| tree | c88c45e80c9c44506e7cdf9a3bb39ebf82a8cd5b /Source/WebKit/gtk/webkit/webkitwebviewprivate.h | |
| parent | be01689f43cf6882cf670d33df49ead1f570c53a (diff) | |
| download | qtwebkit-b1e9e47fa11f608ae16bc07f97a2acf95bf80272.tar.gz | |
Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)
Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebviewprivate.h')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebviewprivate.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebviewprivate.h b/Source/WebKit/gtk/webkit/webkitwebviewprivate.h index 0bc5a56fa..4c65d0f55 100644 --- a/Source/WebKit/gtk/webkit/webkitwebviewprivate.h +++ b/Source/WebKit/gtk/webkit/webkitwebviewprivate.h @@ -34,6 +34,10 @@ #include <webkit/webkitwebview.h> #include <wtf/gobject/GOwnPtr.h> +#if ENABLE(MEDIA_STREAM) +#include "UserMediaClientGtk.h" +#endif + namespace WebKit { WebCore::Page* core(WebKitWebView*); WebKitWebView* kit(WebCore::Page*); @@ -104,6 +108,10 @@ struct _WebKitWebViewPrivate { #if ENABLE(ICONDATABASE) gulong iconLoadedHandler; #endif + +#if ENABLE(MEDIA_STREAM) + OwnPtr<WebKit::UserMediaClientGtk> userMediaClient; +#endif }; void webkit_web_view_notify_ready(WebKitWebView*); |