diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/mac')
| -rw-r--r-- | Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm | 5 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/mac/WebProcessMac.mm | 4 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm b/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm index c3575744f..467c3e01c 100644 --- a/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm +++ b/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm @@ -80,8 +80,9 @@ static OSStatus webSecItemAdd(CFDictionaryRef query, CFTypeRef* result) OwnPtr<SecItemResponseData> response = sendSeqItemRequest(SecItemRequestData::Add, query); if (!response) return errSecInteractionNotAllowed; - - *result = response->resultObject().leakRef(); + + if (result) + *result = response->resultObject().leakRef(); return response->resultCode(); } diff --git a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm index 7d67e1e68..7d0d69c26 100644 --- a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm +++ b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm @@ -252,6 +252,10 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters WebInspector::setLocalizedStringsPath(parameters.webInspectorLocalizedStringsPath); m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port(); + +#if ENABLE(NOTIFICATIONS) + m_notificationManager.initialize(parameters.notificationPermissions); +#endif // rdar://9118639 accessibilityFocusedUIElement in NSApplication defaults to use the keyWindow. Since there's // no window in WK2, NSApplication needs to use the focused page's focused element. diff --git a/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm b/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm index b5a3fe07d..4e2b15532 100644 --- a/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm +++ b/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm @@ -29,9 +29,9 @@ #import "CommandLine.h" #import "EnvironmentUtilities.h" #import "EnvironmentVariables.h" -#import "RunLoop.h" #import "WebProcess.h" #import "WebSystemInterface.h" +#import <WebCore/RunLoop.h> #import <WebKit2/WKView.h> #import <WebKitSystemInterface.h> #import <mach/mach_error.h> @@ -43,8 +43,8 @@ #import <stdio.h> #import <sysexits.h> #import <unistd.h> -#import <wtf/RetainPtr.h> #import <wtf/MainThread.h> +#import <wtf/RetainPtr.h> #import <wtf/text/CString.h> #import <wtf/text/StringBuilder.h> |