diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebCore/platform/mac | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebCore/platform/mac')
| -rw-r--r-- | WebCore/platform/mac/WebCoreSystemInterface.h | 4 | ||||
| -rw-r--r-- | WebCore/platform/mac/WebCoreSystemInterface.mm | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/platform/mac/WebCoreSystemInterface.h b/WebCore/platform/mac/WebCoreSystemInterface.h index 7cac443..758639d 100644 --- a/WebCore/platform/mac/WebCoreSystemInterface.h +++ b/WebCore/platform/mac/WebCoreSystemInterface.h @@ -48,7 +48,6 @@ typedef struct _NSRect NSRect; @class NSFont; @class NSImage; @class NSMenu; -@class NSMutableArray; @class NSMutableURLRequest; @class NSString; @class NSTextFieldCell; @@ -132,6 +131,7 @@ extern void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL); extern void (*wkQTMovieSelectPreferredAlternates)(QTMovie*); extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL); extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*); +extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL); extern void (*wkSetDragImage)(NSImage*, NSPoint offset); extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL); extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL); @@ -171,10 +171,8 @@ extern BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *); extern BOOL (*wkUseSharedMediaUI)(); #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) -extern NSMutableArray *(*wkNoteOpenPanelFiles)(NSArray *); extern void* wkGetHyphenationLocationBeforeIndex; #else -extern void* wkNoteOpenPanelFiles; extern CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index); #endif diff --git a/WebCore/platform/mac/WebCoreSystemInterface.mm b/WebCore/platform/mac/WebCoreSystemInterface.mm index 52e0064..1882674 100644 --- a/WebCore/platform/mac/WebCoreSystemInterface.mm +++ b/WebCore/platform/mac/WebCoreSystemInterface.mm @@ -67,6 +67,7 @@ void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL); void (*wkQTMovieSelectPreferredAlternates)(QTMovie*); void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL); void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*); +void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL); void (*wkSetDragImage)(NSImage*, NSPoint offset); void (*wkSetPatternBaseCTM)(CGContextRef, CGAffineTransform); void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point); @@ -113,9 +114,7 @@ BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *); #endif #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) -NSMutableArray *(*wkNoteOpenPanelFiles)(NSArray *); void* wkGetHyphenationLocationBeforeIndex; #else -void* wkNoteOpenPanelFiles; CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index); #endif |