Title: [109931] trunk/Source/WebCore
- Revision
- 109931
- Author
- [email protected]
- Date
- 2012-03-06 09:57:46 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt][WK2] Crash in Frame.cpp when loading index.hu
https://bugs.webkit.org/show_bug.cgi?id=80165
Guard against possible null document, which can happen
when unsetting a document in a frame.
Patch by Allan Sandfeld Jensen <[email protected]> on 2012-03-06
Reviewed by Kenneth Rohde Christiansen.
* page/Frame.cpp:
(WebCore::Frame::setDocument):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109930 => 109931)
--- trunk/Source/WebCore/ChangeLog 2012-03-06 17:54:43 UTC (rev 109930)
+++ trunk/Source/WebCore/ChangeLog 2012-03-06 17:57:46 UTC (rev 109931)
@@ -1,3 +1,16 @@
+2012-03-06 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt][WK2] Crash in Frame.cpp when loading index.hu
+ https://bugs.webkit.org/show_bug.cgi?id=80165
+
+ Guard against possible null document, which can happen
+ when unsetting a document in a frame.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * page/Frame.cpp:
+ (WebCore::Frame::setDocument):
+
2012-03-06 Lucas Forschler <[email protected]>
WebCore build exceeds address space on 32-bit Windows builds.
Modified: trunk/Source/WebCore/page/Frame.cpp (109930 => 109931)
--- trunk/Source/WebCore/page/Frame.cpp 2012-03-06 17:54:43 UTC (rev 109930)
+++ trunk/Source/WebCore/page/Frame.cpp 2012-03-06 17:57:46 UTC (rev 109931)
@@ -314,10 +314,10 @@
}
// Suspend document if this frame was created in suspended state.
- if (activeDOMObjectsAndAnimationsSuspended()) {
- document()->suspendScriptedAnimationControllerCallbacks();
- animation()->suspendAnimationsForDocument(document());
- document()->suspendActiveDOMObjects(ActiveDOMObject::PageWillBeSuspended);
+ if (m_doc && activeDOMObjectsAndAnimationsSuspended()) {
+ m_doc->suspendScriptedAnimationControllerCallbacks();
+ m_animationController.suspendAnimationsForDocument(m_doc.get());
+ m_doc->suspendActiveDOMObjects(ActiveDOMObject::PageWillBeSuspended);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
