diff options
author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
tree | 6982576c228bcd1a7efe98afed544d840751094c /WebKit/mac/WebView/WebFrameViewInternal.h | |
parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebKit/mac/WebView/WebFrameViewInternal.h')
-rw-r--r-- | WebKit/mac/WebView/WebFrameViewInternal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/mac/WebView/WebFrameViewInternal.h b/WebKit/mac/WebView/WebFrameViewInternal.h index 726b62e..9d7fd80 100644 --- a/WebKit/mac/WebView/WebFrameViewInternal.h +++ b/WebKit/mac/WebView/WebFrameViewInternal.h @@ -39,7 +39,8 @@ - (void)_setWebFrame:(WebFrame *)webFrame; - (float)_verticalPageScrollDistance; + (NSMutableDictionary *)_viewTypesAllowImageTypeOmission:(BOOL)allowImageTypeOmission; -+ (Class)_viewClassForMIMEType:(NSString *)MIMEType; +- (Class)_viewClassForMIMEType:(NSString *)MIMEType; ++ (Class)_viewClassForMIMEType:(NSString *)MIMEType allowingPlugins:(BOOL)allowPlugins; + (BOOL)_canShowMIMETypeAsHTML:(NSString *)MIMEType; - (WebDynamicScrollBarsView *)_scrollView; - (void)_install; |