Title: [191153] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 191153
- Author
- matthew_han...@apple.com
- Date
- 2015-10-15 17:13:28 -0700 (Thu, 15 Oct 2015)
Log Message
Rollout r188531. rdar://problem/22707497
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191152 => 191153)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-16 00:09:38 UTC (rev 191152)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-16 00:13:28 UTC (rev 191153)
@@ -1,5 +1,9 @@
2015-10-15 Matthew Hanson <matthew_han...@apple.com>
+ Rollout r188531. rdar://problem/22707497
+
+2015-10-15 Matthew Hanson <matthew_han...@apple.com>
+
Merge r191077. rdar://problem/22993325
2015-10-14 Alex Christensen <achristen...@webkit.org>
Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp (191152 => 191153)
--- branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp 2015-10-16 00:09:38 UTC (rev 191152)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp 2015-10-16 00:13:28 UTC (rev 191153)
@@ -203,12 +203,12 @@
ASSERT(!response.isNull());
ASSERT(m_state == Initialized);
+ TemporaryChange<bool> callingDidReceiveResponse(m_callingDidReceiveResponse, true);
+
// Reference the object in this method since the additional processing can do
// anything including removing the last reference to this object; one example of this is 3266216.
Ref<SubresourceLoader> protect(*this);
- TemporaryChange<bool> callingDidReceiveResponse(m_callingDidReceiveResponse, true);
-
if (shouldIncludeCertificateInfo())
response.includeCertificateInfo();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
