From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebKit2/WebProcess/mac/WebProcessMac.mm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Source/WebKit2/WebProcess/mac/WebProcessMac.mm') diff --git a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm index fc06d2c..92b36b8 100644 --- a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm +++ b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm @@ -26,6 +26,7 @@ #import "config.h" #import "WebProcess.h" +#import "FullKeyboardAccessWatcher.h" #import "SandboxExtension.h" #import "WebProcessCreationParameters.h" #import @@ -110,6 +111,11 @@ void WebProcess::platformClearResourceCaches() [[NSURLCache sharedURLCache] removeAllCachedResponses]; } +bool WebProcess::fullKeyboardAccessEnabled() +{ + return [FullKeyboardAccessWatcher fullKeyboardAccessEnabled]; +} + #if ENABLE(WEB_PROCESS_SANDBOX) static void appendSandboxParameterPath(Vector& vector, const char* name, const char* path) { @@ -179,7 +185,7 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters NSUInteger cacheMemoryCapacity = parameters.nsURLCacheMemoryCapacity; NSUInteger cacheDiskCapacity = parameters.nsURLCacheDiskCapacity; - NSString *nsCachePath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:parameters.nsURLCachePath.data() length:parameters.nsURLCachePath.length()]; + NSString *nsCachePath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:parameters.nsURLCachePath.data() length:strlen(parameters.nsURLCachePath.data())]; RetainPtr parentProcessURLCache(AdoptNS, [[NSURLCache alloc] initWithMemoryCapacity:cacheMemoryCapacity diskCapacity:cacheDiskCapacity diskPath:nsCachePath]); [NSURLCache setSharedURLCache:parentProcessURLCache.get()]; } @@ -187,7 +193,7 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port(); } -void WebProcess::platformShutdown() +void WebProcess::platformTerminate() { } -- cgit v1.1