Title: [194168] trunk/Source/WebKit2
- Revision
- 194168
- Author
- [email protected]
- Date
- 2015-12-16 12:06:00 -0800 (Wed, 16 Dec 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (194167 => 194168)
--- trunk/Source/WebKit2/ChangeLog 2015-12-16 19:49:52 UTC (rev 194167)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-16 20:06:00 UTC (rev 194168)
@@ -1,5 +1,21 @@
2015-12-16 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
Implement Web Timing when using NETWORK_SESSION
https://bugs.webkit.org/show_bug.cgi?id=152285
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (194167 => 194168)
--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2015-12-16 19:49:52 UTC (rev 194167)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2015-12-16 20:06:00 UTC (rev 194168)
@@ -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 @@
HashMap<uint64_t, NetworkDataTask*> m_dataTaskMap;
#if PLATFORM(COCOA)
RetainPtr<NSURLSession> m_session;
- RetainPtr<NetworkSessionDelegate> m_sessionDelegate;
+ RetainPtr<WKNetworkSessionDelegate> m_sessionDelegate;
#endif
};
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (194167 => 194168)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2015-12-16 19:49:52 UTC (rev 194167)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2015-12-16 20:06:00 UTC (rev 194168)
@@ -70,7 +70,7 @@
}
}
-@interface NetworkSessionDelegate : NSObject <NSURLSessionDataDelegate> {
+@interface WKNetworkSessionDelegate : NSObject <NSURLSessionDataDelegate> {
WebKit::NetworkSession* _session;
}
@@ -78,7 +78,7 @@
@end
-@implementation NetworkSessionDelegate
+@implementation WKNetworkSessionDelegate
- (id)initWithNetworkSession:(WebKit::NetworkSession&)session
{
@@ -213,7 +213,7 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
