Title: [175277] trunk/Source/WebCore
- Revision
- 175277
- Author
- [email protected]
- Date
- 2014-10-28 15:38:44 -0700 (Tue, 28 Oct 2014)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (175276 => 175277)
--- trunk/Source/WebCore/ChangeLog 2014-10-28 22:36:36 UTC (rev 175276)
+++ trunk/Source/WebCore/ChangeLog 2014-10-28 22:38:44 UTC (rev 175277)
@@ -1,3 +1,20 @@
+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):
+
2014-10-27 Ada Chan <[email protected]>
Introduce a new abstract class called AudioProducer and keep a set of AudioProducers
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (175276 => 175277)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-10-28 22:36:36 UTC (rev 175276)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-10-28 22:38:44 UTC (rev 175277)
@@ -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
