Title: [190791] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 190791
- Author
- matthew_han...@apple.com
- Date
- 2015-10-09 07:21:40 -0700 (Fri, 09 Oct 2015)
Log Message
Merge r189979. rdar://problem/23033080
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (190790 => 190791)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-09 14:21:37 UTC (rev 190790)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-09 14:21:40 UTC (rev 190791)
@@ -1,5 +1,28 @@
2015-10-08 Matthew Hanson <matthew_han...@apple.com>
+ Merge r189979. rdar://problem/23033080
+
+ 2015-09-18 Chris Dumez <cdu...@apple.com>
+
+ WebContent crash in WebCore::MemoryPressureHandler::releaseCriticalMemory() with GuardMalloc when preparing to suspend
+ https://bugs.webkit.org/show_bug.cgi?id=149350
+
+ Reviewed by Antti Koivisto.
+
+ in MemoryPressureHandler::releaseCriticalMemory(), iterate over a copy of
+ Document::allDocuments() instead of iterating over allDocuments() directly.
+ Also make sure the Documents are ref'd inside the copy.
+
+ This is needed because clearing the StyleResolver of a Document may cause
+ Documents to be unref'd and removed from the allDocument() HashSet.
+
+ No new tests, already covered by existing tests.
+
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::releaseCriticalMemory):
+
+2015-10-08 Matthew Hanson <matthew_han...@apple.com>
+
Merge r189834. rdar://problem/22807373
2015-09-15 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/MemoryPressureHandler.cpp (190790 => 190791)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-10-09 14:21:37 UTC (rev 190790)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-10-09 14:21:40 UTC (rev 190791)
@@ -129,7 +129,9 @@
{
ReliefLogger log("Discard StyleResolvers");
- for (auto* document : Document::allDocuments())
+ Vector<RefPtr<Document>> documents;
+ copyToVector(Document::allDocuments(), documents);
+ for (auto& document : documents)
document->clearStyleResolver();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
