diff options
author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebKitLibraries/WebKitSystemInterface.h | |
parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
-rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index f6234fe..ed68410 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -130,6 +130,7 @@ CFStringRef WKCopyFullFontName(CGFontRef font); void WKSetPatternBaseCTM(CGContextRef, CGAffineTransform); void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint); +CGAffineTransform WKGetUserToBaseCTM(CGContextRef); #ifndef BUILDING_ON_TIGER void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t); @@ -228,6 +229,7 @@ typedef enum { WKMediaControllerFlagDisabled = 1 << 0, WKMediaControllerFlagPressed = 1 << 1, WKMediaControllerFlagDrawEndCaps = 1 << 3, + WKMediaControllerFlagFocused = 1 << 4 } WKMediaControllerThemeState; BOOL WKMediaControllerThemeAvailable(int themeStyle); @@ -289,7 +291,11 @@ BOOL WKIsLatchingWheelEvent(NSEvent *); void WKWindowSetAlpha(NSWindow *window, float alphaValue); void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScaledFrame); #endif - + +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) +NSMutableArray *WKNoteOpenPanelFiles(NSArray *paths); +#endif + #ifdef __cplusplus } #endif |