diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp index 0ac5d932c..49e780baf 100644 --- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp +++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp @@ -57,6 +57,9 @@ #include "ProgressTracker.h" #include "ResourceHandleInternal.h" #include "ResourceLoader.h" +#if ENABLE(MEDIA_STREAM) +#include "RTCPeerConnectionHandlerChromium.h" +#endif #include "Settings.h" #include "SocketStreamHandleInternal.h" #include "WebDOMEvent.h" @@ -75,18 +78,17 @@ #include "WebPluginLoadObserver.h" #include "WebPluginParams.h" #include "WebSecurityOrigin.h" -#include "platform/WebSocketStreamHandle.h" #include "WebViewClient.h" #include "WebViewImpl.h" #include "WindowFeatures.h" #include "WrappedResourceRequest.h" #include "WrappedResourceResponse.h" -#include "platform/WebURL.h" -#include "platform/WebURLError.h" -#include "platform/WebVector.h" #include <public/Platform.h> #include <public/WebMimeRegistry.h> - +#include <public/WebSocketStreamHandle.h> +#include <public/WebURL.h> +#include <public/WebURLError.h> +#include <public/WebVector.h> #include <wtf/StringExtras.h> #include <wtf/text/CString.h> #include <wtf/text/WTFString.h> @@ -126,7 +128,7 @@ void FrameLoaderClientImpl::frameLoaderDestroyed() // serves to keep us alive until the FrameLoader is done with us. The // FrameLoader calls this method when it's going away. Therefore, we balance // out that extra reference, which may cause 'this' to be deleted. - m_webFrame->closing(); + ASSERT(!m_webFrame->frame()); m_webFrame->deref(); } @@ -1639,4 +1641,12 @@ void FrameLoaderClientImpl::dispatchWillOpenSocketStream(SocketStreamHandle* han m_webFrame->client()->willOpenSocketStream(SocketStreamHandleInternal::toWebSocketStreamHandle(handle)); } +#if ENABLE(MEDIA_STREAM) +void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(RTCPeerConnectionHandler* handler) +{ + m_webFrame->client()->willStartUsingPeerConnectionHandler(webFrame(), RTCPeerConnectionHandlerChromium::toWebRTCPeerConnectionHandler(handler)); +} +#endif + + } // namespace WebKit |