Title: [178812] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 178812
- Author
- [email protected]
- Date
- 2015-01-21 00:11:11 -0800 (Wed, 21 Jan 2015)
Log Message
Merged r175277. rdar://problem/19419795
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178811 => 178812)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 08:10:08 UTC (rev 178811)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 08:11:11 UTC (rev 178812)
@@ -1,5 +1,26 @@
2015-01-21 Babak Shafiei <[email protected]>
+ Merge r175277.
+
+ 2014-10-24 Jeffrey Pfau <[email protected]>
+
+ FrameProgressTracker expects Page to not have detached
+ https://bugs.webkit.org/show_bug.cgi?id=138061
+
+ Reviewed by Alexey Proskuryakov.
+
+ In some cases, a Page may be detached from a Frame before its
+ FrameLoader is torn down, causing FrameProgressTracker's destructor
+ to hit a null pointer.
+
+ No new tests; it is impossible to reliably simulate the null pointer
+ case without intrusive code changes.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::FrameProgressTracker::~FrameProgressTracker):
+
+2015-01-21 Babak Shafiei <[email protected]>
+
Merge r175236.
2014-10-24 David Hyatt <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/FrameLoader.cpp (178811 => 178812)
--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/FrameLoader.cpp 2015-01-21 08:10:08 UTC (rev 178811)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/FrameLoader.cpp 2015-01-21 08:11:11 UTC (rev 178812)
@@ -189,8 +189,7 @@
~FrameProgressTracker()
{
- ASSERT(!m_inProgress || m_frame.page());
- if (m_inProgress)
+ if (m_inProgress && m_frame.page())
m_frame.page()->progress().progressCompleted(m_frame);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
