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/webkitwebview.cpp | |
| 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/webkitwebview.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebview.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp index 1a54ea877..4b5244211 100644 --- a/Source/WebKit/gtk/webkit/webkitwebview.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp @@ -119,10 +119,6 @@ #include "DeviceOrientationClientGtk.h" #endif -#if ENABLE(MEDIA_STREAM) -#include "UserMediaClientGtk.h" -#endif - /** * SECTION:webkitwebview * @short_description: The central class of the WebKitGTK+ API @@ -3555,7 +3551,8 @@ static void webkit_web_view_init(WebKitWebView* webView) #endif #if ENABLE(MEDIA_STREAM) - WebCore::provideUserMediaTo(priv->corePage, new UserMediaClientGtk); + priv->userMediaClient = adoptPtr(new UserMediaClientGtk); + WebCore::provideUserMediaTo(priv->corePage, priv->userMediaClient.get()); #endif if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) { |