Title: [199591] trunk/Source/WebCore
- Revision
- 199591
- Author
- [email protected]
- Date
- 2016-04-15 09:44:14 -0700 (Fri, 15 Apr 2016)
Log Message
[COCOA] Do not unnecessarily initialize ResourceResponse::m_httpVersion as part of common fields
https://bugs.webkit.org/show_bug.cgi?id=156606
Reviewed by Darin Adler.
Do not unnecessarily initialize ResourceResponse::m_httpVersion as part of common fields.
We previously initialized m_httpVersion when calling platformLazyInit(CommonFieldsOnly),
even though this is not a common field. The corresponding getter/setter in
HTTPResponseBase call lazyInit(AllFields).
* platform/network/cf/ResourceResponseCFNet.cpp:
(WebCore::ResourceResponse::platformLazyInit):
* platform/network/cocoa/ResourceResponseCocoa.mm:
(WebCore::ResourceResponse::platformLazyInit):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (199590 => 199591)
--- trunk/Source/WebCore/ChangeLog 2016-04-15 16:39:00 UTC (rev 199590)
+++ trunk/Source/WebCore/ChangeLog 2016-04-15 16:44:14 UTC (rev 199591)
@@ -1,3 +1,21 @@
+2016-04-15 Chris Dumez <[email protected]>
+
+ [COCOA] Do not unnecessarily initialize ResourceResponse::m_httpVersion as part of common fields
+ https://bugs.webkit.org/show_bug.cgi?id=156606
+
+ Reviewed by Darin Adler.
+
+ Do not unnecessarily initialize ResourceResponse::m_httpVersion as part of common fields.
+
+ We previously initialized m_httpVersion when calling platformLazyInit(CommonFieldsOnly),
+ even though this is not a common field. The corresponding getter/setter in
+ HTTPResponseBase call lazyInit(AllFields).
+
+ * platform/network/cf/ResourceResponseCFNet.cpp:
+ (WebCore::ResourceResponse::platformLazyInit):
+ * platform/network/cocoa/ResourceResponseCocoa.mm:
+ (WebCore::ResourceResponse::platformLazyInit):
+
2016-04-15 John Wilander <[email protected]>
Refactor WebSockets handshake to use StringView instead of String for header validation.
Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (199590 => 199591)
--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2016-04-15 16:39:00 UTC (rev 199590)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2016-04-15 16:44:14 UTC (rev 199591)
@@ -86,7 +86,6 @@
CFHTTPMessageRef httpResponse = CFURLResponseGetHTTPResponse(m_cfResponse.get());
if (httpResponse) {
- m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(httpResponse)).get()).convertToASCIIUppercase();
m_httpStatusCode = CFHTTPMessageGetResponseStatusCode(httpResponse);
if (initLevel < AllFields) {
@@ -104,6 +103,8 @@
if (m_initLevel < AllFields && initLevel == AllFields) {
CFHTTPMessageRef httpResponse = CFURLResponseGetHTTPResponse(m_cfResponse.get());
if (httpResponse) {
+ m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(httpResponse)).get()).convertToASCIIUppercase();
+
RetainPtr<CFStringRef> statusLine = adoptCF(CFHTTPMessageCopyResponseStatusLine(httpResponse));
m_httpStatusText = extractReasonPhraseFromHTTPStatusLine(statusLine.get());
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (199590 => 199591)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2016-04-15 16:39:00 UTC (rev 199590)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2016-04-15 16:44:14 UTC (rev 199591)
@@ -186,8 +186,6 @@
if ([m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]]) {
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
- CFHTTPMessageRef messageRef = CFURLResponseGetHTTPResponse([httpResponse _CFURLResponse]);
- m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(messageRef)).get()).convertToASCIIUppercase();
m_httpStatusCode = [httpResponse statusCode];
if (initLevel < AllFields) {
@@ -213,6 +211,9 @@
else
m_httpStatusText = AtomicString("OK", AtomicString::ConstructFromLiteral);
+ CFHTTPMessageRef messageRef = CFURLResponseGetHTTPResponse([httpResponse _CFURLResponse]);
+ m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(messageRef)).get()).convertToASCIIUppercase();
+
NSDictionary *headers = [httpResponse allHeaderFields];
for (NSString *name in headers)
m_httpHeaderFields.set(name, [headers objectForKey:name]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
