diff options
author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebKit/mac/WebView/WebViewPrivate.h | |
parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebKit/mac/WebView/WebViewPrivate.h')
-rw-r--r-- | WebKit/mac/WebView/WebViewPrivate.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/WebKit/mac/WebView/WebViewPrivate.h b/WebKit/mac/WebView/WebViewPrivate.h index fa5d28c..99bd5fa 100644 --- a/WebKit/mac/WebView/WebViewPrivate.h +++ b/WebKit/mac/WebView/WebViewPrivate.h @@ -200,6 +200,9 @@ typedef enum { - (void)setMediaVolume:(float)volume; - (float)mediaVolume; +// Add visited links +- (void)addVisitedLinks:(NSArray *)visitedLinks; + @end @interface WebView (WebPrivate) @@ -459,6 +462,11 @@ Could be worth adding to the API. // SPI for DumpRenderTree - (BOOL)_isUsingAcceleratedCompositing; +// SPI for PluginHalter ++ (BOOL)_isNodeHaltedPlugin:(DOMNode *)node; ++ (BOOL)_hasPluginForNodeBeenHalted:(DOMNode *)node; ++ (void)_restartHaltedPluginForNode:(DOMNode *)node; + // Which pasteboard text is coming from in editing delegate methods such as shouldInsertNode. - (NSPasteboard *)_insertionPasteboard; @@ -471,10 +479,12 @@ Could be worth adding to the API. // Removes all white list entries created with _whiteListAccessFromOrigin. + (void)_resetOriginAccessWhiteLists; -+ (void)_addUserScriptToGroup:(NSString *)groupName source:(NSString *)source url:(NSURL *)url worldID:(unsigned)worldID whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist injectionTime:(WebUserScriptInjectionTime)injectionTime; -+ (void)_addUserStyleSheetToGroup:(NSString *)groupName source:(NSString *)source url:(NSURL *)url worldID:(unsigned)worldID whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist; -+ (void)_removeUserContentFromGroup:(NSString *)groupName url:(NSURL *)url worldID:(unsigned)worldID; -+ (void)_removeUserContentFromGroup:(NSString *)groupName worldID:(unsigned)worldID; ++ (void)_addUserScriptToGroup:(NSString *)groupName worldID:(unsigned)worldID source:(NSString *)source url:(NSURL *)url whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist injectionTime:(WebUserScriptInjectionTime)injectionTime; ++ (void)_addUserStyleSheetToGroup:(NSString *)groupName worldID:(unsigned)worldID source:(NSString *)source url:(NSURL *)url whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist; ++ (void)_removeUserScriptFromGroup:(NSString *)groupName worldID:(unsigned)worldID url:(NSURL *)url; ++ (void)_removeUserStyleSheetFromGroup:(NSString *)groupName worldID:(unsigned)worldID url:(NSURL *)url; ++ (void)_removeUserScriptsFromGroup:(NSString *)groupName worldID:(unsigned)worldID; ++ (void)_removeUserStyleSheetsFromGroup:(NSString *)groupName worldID:(unsigned)worldID; + (void)_removeAllUserContentFromGroup:(NSString *)groupName; /*! |