Title: [178358] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 178358
- Author
- [email protected]
- Date
- 2015-01-13 04:05:42 -0800 (Tue, 13 Jan 2015)
Log Message
Merge r177518 - Web Inspector: ASSERT seen closing/opening multiple inspectors
https://bugs.webkit.org/show_bug.cgi?id=139783
Patch by Joseph Pecoraro <[email protected]> on 2014-12-18
Reviewed by Timothy Hatcher.
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::nodeForObjectId):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (178357 => 178358)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 11:55:37 UTC (rev 178357)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 12:05:42 UTC (rev 178358)
@@ -1,3 +1,13 @@
+2014-12-18 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: ASSERT seen closing/opening multiple inspectors
+ https://bugs.webkit.org/show_bug.cgi?id=139783
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::nodeForObjectId):
+
2014-12-16 Chris Dumez <[email protected]>
REGRESSION (r163928): Animated GIFs are not resumed when translated into view using -webkit-transform
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMAgent.cpp (178357 => 178358)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-01-13 11:55:37 UTC (rev 178357)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-01-13 12:05:42 UTC (rev 178358)
@@ -1954,6 +1954,9 @@
Node* InspectorDOMAgent::nodeForObjectId(const String& objectId)
{
InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
+ if (injectedScript.hasNoValue())
+ return nullptr;
+
Deprecated::ScriptValue value = injectedScript.findObjectById(objectId);
return InspectorDOMAgent::scriptValueAsNode(value);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
