diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit/chromium/src/WebFrameImpl.h | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit/chromium/src/WebFrameImpl.h')
| -rw-r--r-- | Source/WebKit/chromium/src/WebFrameImpl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/src/WebFrameImpl.h b/Source/WebKit/chromium/src/WebFrameImpl.h index 2686aad1d..722ecf559 100644 --- a/Source/WebKit/chromium/src/WebFrameImpl.h +++ b/Source/WebKit/chromium/src/WebFrameImpl.h @@ -114,6 +114,7 @@ public: int worldID, const WebScriptSource* sources, unsigned numSources, int extensionGroup); virtual void setIsolatedWorldSecurityOrigin(int worldID, const WebSecurityOrigin&); + virtual void setIsolatedWorldContentSecurityPolicy(int worldID, const WebString&); virtual void addMessageToConsole(const WebConsoleMessage&); virtual void collectGarbage(); virtual bool checkIfRunInsecureContent(const WebURL&) const; |