Build fix when using NETWORK_SESSION after r193972.

Rubber-stamped by Joseph Pecoraro.

Renamed NetworkSessionDelegate to WKNetworkSessionDelegate to conform to the
newly-enforced style rule in check-for-inappropriate-objc-class-names.

* NetworkProcess/NetworkSession.h:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(toNSURLSessionAuthChallengeDisposition):
(-[WKNetworkSessionDelegate initWithNetworkSession:]):
(WebKit::NetworkSession::NetworkSession):
(-[NetworkSessionDelegate initWithNetworkSession:]): Deleted.

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 0eec9c7..7c69a5d 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,21 @@
 2015-12-16  Alex Christensen  <achristensen@webkit.org>
 
+        Build fix when using NETWORK_SESSION after r193972.
+
+        Rubber-stamped by Joseph Pecoraro.
+
+        Renamed NetworkSessionDelegate to WKNetworkSessionDelegate to conform to the 
+        newly-enforced style rule in check-for-inappropriate-objc-class-names.
+
+        * NetworkProcess/NetworkSession.h:
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (toNSURLSessionAuthChallengeDisposition):
+        (-[WKNetworkSessionDelegate initWithNetworkSession:]):
+        (WebKit::NetworkSession::NetworkSession):
+        (-[NetworkSessionDelegate initWithNetworkSession:]): Deleted.
+
+2015-12-16  Alex Christensen  <achristensen@webkit.org>
+
         Implement Web Timing when using NETWORK_SESSION
         https://bugs.webkit.org/show_bug.cgi?id=152285
 

diff --git a/Source/WebKit2/NetworkProcess/NetworkSession.h b/Source/WebKit2/NetworkProcess/NetworkSession.h
index 8aebd47..86d4246 100644 (file)
--- a/Source/WebKit2/NetworkProcess/NetworkSession.h
+++ b/Source/WebKit2/NetworkProcess/NetworkSession.h
@@ -29,7 +29,7 @@
 OBJC_CLASS NSURLSession;
 OBJC_CLASS NSURLSessionDataTask;
 OBJC_CLASS NSOperationQueue;
-OBJC_CLASS NetworkSessionDelegate;
+OBJC_CLASS WKNetworkSessionDelegate;
 
 #include <WebCore/FrameLoaderTypes.h>
 #include <WebCore/SessionID.h>
@@ -119,7 +119,7 @@ private:
     HashMap<uint64_t, NetworkDataTask*> m_dataTaskMap;
 #if PLATFORM(COCOA)
     RetainPtr<NSURLSession> m_session;
-    RetainPtr<NetworkSessionDelegate> m_sessionDelegate;
+    RetainPtr<WKNetworkSessionDelegate> m_sessionDelegate;
 #endif
 };
 

diff --git a/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm
index b5202b7..f527cbb 100644 (file)
--- a/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm
+++ b/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm
@@ -70,7 +70,7 @@ static NSURLSessionAuthChallengeDisposition toNSURLSessionAuthChallengeDispositi
     }
 }
 
-@interface NetworkSessionDelegate : NSObject <NSURLSessionDataDelegate> {
+@interface WKNetworkSessionDelegate : NSObject <NSURLSessionDataDelegate> {
     WebKit::NetworkSession* _session;
 }
 
@@ -78,7 +78,7 @@ static NSURLSessionAuthChallengeDisposition toNSURLSessionAuthChallengeDispositi
 
 @end
 
-@implementation NetworkSessionDelegate
+@implementation WKNetworkSessionDelegate
 
 - (id)initWithNetworkSession:(WebKit::NetworkSession&)session
 {
@@ -213,7 +213,7 @@ NetworkSession& NetworkSession::defaultSession()
 NetworkSession::NetworkSession(Type type, WebCore::SessionID sessionID)
     : m_sessionID(sessionID)
 {
-    m_sessionDelegate = adoptNS([[NetworkSessionDelegate alloc] initWithNetworkSession:*this]);
+    m_sessionDelegate = adoptNS([[WKNetworkSessionDelegate alloc] initWithNetworkSession:*this]);
 
     NSURLSessionConfiguration *configuration = configurationForType(type);