summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/public/WebFrameClient.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-15 16:08:57 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-15 16:08:57 +0200
commit5466563f4b5b6b86523e3f89bb7f77e5b5270c78 (patch)
tree8caccf7cd03a15207cde3ba282c88bf132482a91 /Source/WebKit/chromium/public/WebFrameClient.h
parent33b26980cb24288b5a9f2590ccf32a949281bb79 (diff)
downloadqtwebkit-5466563f4b5b6b86523e3f89bb7f77e5b5270c78.tar.gz
Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)
WebKit update which introduces the QtWebKitWidgets module that contains the WK1 widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're working on completing the entire split as part of https://bugs.webkit.org/show_bug.cgi?id=99314
Diffstat (limited to 'Source/WebKit/chromium/public/WebFrameClient.h')
-rw-r--r--Source/WebKit/chromium/public/WebFrameClient.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h
index b4fccebc2..73980bf7f 100644
--- a/Source/WebKit/chromium/public/WebFrameClient.h
+++ b/Source/WebKit/chromium/public/WebFrameClient.h
@@ -62,6 +62,7 @@ class WebMediaPlayer;
class WebMediaPlayerClient;
class WebNode;
class WebPlugin;
+class WebRTCPeerConnectionHandler;
class WebSharedWorker;
class WebSharedWorkerClient;
class WebSocketStreamHandle;
@@ -398,28 +399,25 @@ public:
// A WebSocket object is going to open new stream connection.
virtual void willOpenSocketStream(WebSocketStreamHandle*) { }
+ // MediaStream -----------------------------------------------------
+
+ // A new WebRTCPeerConnectionHandler is created.
+ virtual void willStartUsingPeerConnectionHandler(WebFrame*, WebRTCPeerConnectionHandler*) { }
+
// Messages ------------------------------------------------------
// Notifies the embedder that a postMessage was issued on this frame, and
// gives the embedder a chance to handle it instead of WebKit. Returns true
// if the embedder handled it.
virtual bool willCheckAndDispatchMessageEvent(
- WebFrame* source,
- WebSecurityOrigin target,
- WebDOMMessageEvent) { return false; }
-
- virtual bool willCheckAndDispatchMessageEvent(
WebFrame* sourceFrame,
WebFrame* targetFrame,
WebSecurityOrigin target,
- WebDOMMessageEvent event)
- {
- return willCheckAndDispatchMessageEvent(sourceFrame, target, event);
- }
+ WebDOMMessageEvent event) { return false; }
// Asks the embedder if a specific user agent should be used for the given
// URL. Non-empty strings indicate an override should be used. Otherwise,
- // WebKitPlatformSupport::userAgent() will be called to provide one.
+ // Platform::current()->userAgent() will be called to provide one.
virtual WebString userAgentOverride(WebFrame*, const WebURL& url) { return WebString(); }
protected: