diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/chromium/public/WebFrameClient.h | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/chromium/public/WebFrameClient.h')
| -rw-r--r-- | Source/WebKit/chromium/public/WebFrameClient.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h index bc32d6d84..cc8923d80 100644 --- a/Source/WebKit/chromium/public/WebFrameClient.h +++ b/Source/WebKit/chromium/public/WebFrameClient.h @@ -93,7 +93,7 @@ public: // May return null. virtual WebApplicationCacheHost* createApplicationCacheHost(WebFrame*, WebApplicationCacheHostClient*) { return 0; } - + // Services ------------------------------------------------------------ // A frame specific cookie jar. May return null, in which case @@ -103,13 +103,15 @@ public: // General notifications ----------------------------------------------- - // This frame has been detached from the view. - // - // FIXME: Do not use this in new code. Currently this is used by code in - // Chromium that errantly caches WebKit objects. + // A child frame was created in this frame. This is called when the frame + // is created and initialized. + virtual void didCreateFrame(WebFrame* parent, WebFrame* child) { } + + // This frame has been detached from the view, but has not been closed yet. virtual void frameDetached(WebFrame*) { } - // This frame is about to be closed. + // This frame is about to be closed. This is called after frameDetached, + // when the document is being unloaded, due to new one committing. virtual void willClose(WebFrame*) { } // Load commands ------------------------------------------------------- @@ -406,6 +408,15 @@ public: WebSecurityOrigin target, WebDOMMessageEvent) { return false; } + virtual bool willCheckAndDispatchMessageEvent( + WebFrame* sourceFrame, + WebFrame* targetFrame, + WebSecurityOrigin target, + WebDOMMessageEvent event) + { + return willCheckAndDispatchMessageEvent(sourceFrame, target, event); + } + // 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. |
