Title: [170609] trunk/Source/WebCore
- Revision
- 170609
- Author
- [email protected]
- Date
- 2014-06-30 15:52:32 -0700 (Mon, 30 Jun 2014)
Log Message
Unreviewed, rolling out r170578.
https://bugs.webkit.org/show_bug.cgi?id=134462
causes assertions loading nytimes.com on iOS (Requested by
smfr on #webkit).
Reverted changeset:
"Create NSURLRequest lazily when USE(CFNETWORK) is enabled"
https://bugs.webkit.org/show_bug.cgi?id=134441
http://trac.webkit.org/changeset/170578
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170608 => 170609)
--- trunk/Source/WebCore/ChangeLog 2014-06-30 22:51:39 UTC (rev 170608)
+++ trunk/Source/WebCore/ChangeLog 2014-06-30 22:52:32 UTC (rev 170609)
@@ -1,3 +1,17 @@
+2014-06-30 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r170578.
+ https://bugs.webkit.org/show_bug.cgi?id=134462
+
+ causes assertions loading nytimes.com on iOS (Requested by
+ smfr on #webkit).
+
+ Reverted changeset:
+
+ "Create NSURLRequest lazily when USE(CFNETWORK) is enabled"
+ https://bugs.webkit.org/show_bug.cgi?id=134441
+ http://trac.webkit.org/changeset/170578
+
2014-06-30 Alex Christensen <[email protected]>
Reduce dynamic memory allocation in css jit.
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (170608 => 170609)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-06-30 22:51:39 UTC (rev 170608)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-06-30 22:52:32 UTC (rev 170609)
@@ -72,6 +72,9 @@
: ResourceRequestBase()
, m_cfRequest(cfRequest)
{
+#if PLATFORM(COCOA)
+ updateNSURLRequest();
+#endif
}
#else
ResourceRequest(NSURLRequest *nsRequest)
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (170608 => 170609)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-30 22:51:39 UTC (rev 170608)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-30 22:52:32 UTC (rev 170609)
@@ -196,7 +196,7 @@
m_cfRequest = adoptCF(cfRequest);
#if PLATFORM(COCOA)
- m_nsRequest = nullptr;
+ updateNSURLRequest();
#endif
}
@@ -231,7 +231,7 @@
m_cfRequest = adoptCF(cfRequest);
#if PLATFORM(COCOA)
- m_nsRequest = nullptr;
+ updateNSURLRequest();
#endif
}
@@ -343,7 +343,7 @@
wkSetRequestStorageSession(storageSession, cfRequest);
m_cfRequest = adoptCF(cfRequest);
#if PLATFORM(COCOA)
- m_nsRequest = nullptr;
+ updateNSURLRequest();
#endif
}
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (170608 => 170609)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-06-30 22:51:39 UTC (rev 170608)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-06-30 22:52:32 UTC (rev 170609)
@@ -53,10 +53,6 @@
NSURLRequest *ResourceRequest::nsURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
{
updatePlatformRequest(bodyPolicy);
-#if USE(CFNETWORK)
- if (!m_nsRequest)
- const_cast<ResourceRequest*>(this)->updateNSURLRequest();
-#endif
return [[m_nsRequest.get() retain] autorelease];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
