Title: [113675] trunk/Source/WebCore
- Revision
- 113675
- Author
- [email protected]
- Date
- 2012-04-09 21:42:20 -0700 (Mon, 09 Apr 2012)
Log Message
<http://webkit.org/b/83539> Web Inspector: ASSERT attempting to unbind null contentDocument
Avoid calling unbind with a null object. The HTMLFrameOwnerElement's
contentDocument can be null.
Patch by Joseph Pecoraro <[email protected]> on 2012-04-09
Reviewed by Timothy Hatcher.
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::unbind):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113674 => 113675)
--- trunk/Source/WebCore/ChangeLog 2012-04-10 04:27:56 UTC (rev 113674)
+++ trunk/Source/WebCore/ChangeLog 2012-04-10 04:42:20 UTC (rev 113675)
@@ -1,3 +1,15 @@
+2012-04-09 Joseph Pecoraro <[email protected]>
+
+ <http://webkit.org/b/83539> Web Inspector: ASSERT attempting to unbind null contentDocument
+
+ Avoid calling unbind with a null object. The HTMLFrameOwnerElement's
+ contentDocument can be null.
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::unbind):
+
2012-04-09 Jason Liu <[email protected]>
[BlackBerry] Parsed Cookie's m_isMaxAgeSet is not needed.
Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (113674 => 113675)
--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2012-04-10 04:27:56 UTC (rev 113674)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2012-04-10 04:42:20 UTC (rev 113675)
@@ -333,9 +333,11 @@
if (node->isFrameOwnerElement()) {
const HTMLFrameOwnerElement* frameOwner = static_cast<const HTMLFrameOwnerElement*>(node);
+ Document* contentDocument = frameOwner->contentDocument();
if (m_domListener)
- m_domListener->didRemoveDocument(frameOwner->contentDocument());
- unbind(frameOwner->contentDocument(), nodesMap);
+ m_domListener->didRemoveDocument(contentDocument);
+ if (contentDocument)
+ unbind(contentDocument, nodesMap);
}
if (node->isElementNode() && toElement(node)->hasShadowRoot()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
