diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebKit/mac/WebView/WebViewData.h | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebKit/mac/WebView/WebViewData.h')
| -rw-r--r-- | WebKit/mac/WebView/WebViewData.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/WebKit/mac/WebView/WebViewData.h b/WebKit/mac/WebView/WebViewData.h index 91d83a7..6ec94a7 100644 --- a/WebKit/mac/WebView/WebViewData.h +++ b/WebKit/mac/WebView/WebViewData.h @@ -43,6 +43,9 @@ namespace WebCore { @class WebPreferences; @class WebTextCompletionController; @protocol WebFormDelegate; +#if ENABLE(VIDEO) +@class WebVideoFullscreenController; +#endif extern BOOL applicationIsTerminating; extern int pluginDatabaseClientCount; @@ -64,6 +67,7 @@ extern int pluginDatabaseClientCount; id editingDelegate; id editingDelegateForwarder; id scriptDebugDelegate; + id historyDelegate; WebInspector *inspector; WebNodeHighlight *currentNodeHighlight; @@ -86,6 +90,7 @@ extern int pluginDatabaseClientCount; WebResourceDelegateImplementationCache resourceLoadDelegateImplementations; WebFrameLoadDelegateImplementationCache frameLoadDelegateImplementations; WebScriptDebugDelegateImplementationCache scriptDebugDelegateImplementations; + WebHistoryDelegateImplementationCache historyDelegateImplementations; void *observationInfo; @@ -100,6 +105,7 @@ extern int pluginDatabaseClientCount; BOOL hoverFeedbackSuspended; BOOL usesPageCache; BOOL catchesDelegateExceptions; + BOOL cssAnimationsSuspended; NSColor *backgroundColor; @@ -157,5 +163,8 @@ extern int pluginDatabaseClientCount; NSEvent *autoscrollTriggerEvent; CFRunLoopTimerRef updateMouseoverTimer; +#if ENABLE(VIDEO) + WebVideoFullscreenController *fullscreenController; +#endif } @end |