Try to fix the Mountain Lion build.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Jun 2014 04:16:04 +0000 (04:16 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Jun 2014 04:16:04 +0000 (04:16 +0000)
* UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@170140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

index 52fe312..b8f202a 100644 (file)
@@ -1,3 +1,11 @@
+2014-06-18  Dan Bernstein  <mitz@apple.com>
+
+        Try to fix the Mountain Lion build.
+
+        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame):
+
 2014-06-18  Tim Horton  <timothy_horton@apple.com>
 
         Remove RemoteLayerBackingStore’s RemoteLayerTreeContext pointer
index 5f579b6..9d92ca8 100644 (file)
 
 #if WK_API_ENABLED
 
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+typedef NS_ENUM(NSInteger, NSURLSessionAuthChallengeDisposition);
+#endif
+
 static const WKNavigationActionPolicy _WKNavigationActionPolicyDownload = (WKNavigationActionPolicy)(WKNavigationActionPolicyAllow + 1);
 
 static const WKNavigationResponsePolicy _WKNavigationResponsePolicyBecomeDownload = (WKNavigationResponsePolicy)(WKNavigationResponsePolicyAllow + 1);
index 3803609..64b1f5f 100644 (file)
@@ -602,6 +602,7 @@ bool NavigationState::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame
 
 void NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame(WebPageProxy*, WebFrameProxy*, AuthenticationChallengeProxy* authenticationChallenge)
 {
+#if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     if (m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallengeCompletionHandler) {
         ASSERT(authenticationChallenge->protectionSpace()->authenticationScheme() != WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested);
         auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
@@ -645,6 +646,7 @@ void NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame(Web
         ];
         return;
     }
+#endif
 
     if (!m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallenge)
         return;