Merge r177518 - Web Inspector: ASSERT seen closing/opening multiple i…

…nspectors

https://bugs.webkit.org/show_bug.cgi?id=139783

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-12-18
Reviewed by Timothy Hatcher.

* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::nodeForObjectId):

Canonical link: https://commits.webkit.org/154760.288@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@178358 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

@@ -1,3 +1,13 @@
+2014-12-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        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  <cdumez@apple.com>
 
         REGRESSION (r163928): Animated GIFs are not resumed when translated into view using -webkit-transform

Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1954,6 +1954,9 @@ Node* InspectorDOMAgent::nodeForPath(const String& path)
 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);
 }