diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 10:36:47 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 10:36:47 (GMT) |
| commit | bb35b65bbfba82e0dd0ac306d3dab54436cdaff6 (patch) | |
| tree | 8174cb262a960ff7b2e4aa8f1aaf154db71d2636 /src/3rdparty/webkit/WebCore/page/PageGroup.h | |
| parent | 4b27d0d887269583a0f76e922948f8c25e96ab88 (diff) | |
| download | Qt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.zip Qt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.tar.gz Qt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.tar.bz2 | |
Update src/3rdparty/webkit from trunk.
Imported from 839d8709327f925aacb3b6362c06152594def97e
in branch qtwebkit-2.0 of repository
git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git
Rubber-stamped-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/webkit/WebCore/page/PageGroup.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/page/PageGroup.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebCore/page/PageGroup.h b/src/3rdparty/webkit/WebCore/page/PageGroup.h index c233cd1..446f0c7 100644 --- a/src/3rdparty/webkit/WebCore/page/PageGroup.h +++ b/src/3rdparty/webkit/WebCore/page/PageGroup.h @@ -70,17 +70,17 @@ namespace WebCore { bool hasLocalStorage() { return m_localStorage; } #endif - void addUserScriptToWorld(unsigned worldID, const String& source, const KURL&, + void addUserScriptToWorld(DOMWrapperWorld*, const String& source, const KURL&, PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist, UserScriptInjectionTime); - void addUserStyleSheetToWorld(unsigned worldID, const String& source, const KURL&, + void addUserStyleSheetToWorld(DOMWrapperWorld*, const String& source, const KURL&, PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist); - void removeUserScriptFromWorld(unsigned, const KURL&); - void removeUserStyleSheetFromWorld(unsigned, const KURL&); + void removeUserScriptFromWorld(DOMWrapperWorld*, const KURL&); + void removeUserStyleSheetFromWorld(DOMWrapperWorld*, const KURL&); - void removeUserScriptsFromWorld(unsigned); - void removeUserStyleSheetsFromWorld(unsigned); + void removeUserScriptsFromWorld(DOMWrapperWorld*); + void removeUserStyleSheetsFromWorld(DOMWrapperWorld*); void removeAllUserContent(); |