Changes to support a second VM.

Source/WebCore/inspector/ConsoleMessage.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 121 matching lines @@
     jsonObj->setString("source", messageSourceValue(m_source));
     // FIXME: only send out type for ConsoleAPI source messages.
     jsonObj->setString("type", messageTypeValue(m_type));
     jsonObj->setString("level", messageLevelValue(m_level));
     jsonObj->setNumber("line", static_cast<int>(m_line));
     jsonObj->setString("url", m_url);
     jsonObj->setNumber("repeatCount", static_cast<int>(m_repeatCount));
     jsonObj->setString("text", m_message);
     if (m_source == NetworkMessageSource && !m_requestId.isEmpty())
         jsonObj->setString("networkRequestId", m_requestId);
-    if (m_arguments && m_arguments->argumentCount()) {
-        InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
-        if (!injectedScript.hasNoValue()) {
-            RefPtr<InspectorArray> jsonArgs = InspectorArray::create();
-            for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) {
-                RefPtr<InspectorValue> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console");
-                if (!inspectorValue) {
-                    ASSERT_NOT_REACHED();
-                    return;
-                }
-                jsonArgs->pushValue(inspectorValue);
-            }
-            jsonObj->setArray("parameters", jsonArgs);
-        }
+    if (m_arguments) {
+        RefPtr<InspectorArray> jsonArgs = m_arguments->wrap(injectedScriptManager);
+        if (jsonArgs)
+            jsonObj->setArray("parameters", jsonArgs.release());
     }
     if (m_callStack)
         jsonObj->setArray("stackTrace", m_callStack->buildInspectorArray());
     frontend->messageAdded(jsonObj);
 }
 
 void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend::Console* frontend)
 {
     frontend->messageRepeatCountUpdated(m_repeatCount);
 }
@@ skipping 16 matching lines @@
         && msg->m_type == m_type
         && msg->m_level == m_level
         && msg->m_message == m_message
         && msg->m_line == m_line
         && msg->m_url == m_url
         && msg->m_requestId == m_requestId;
 }
 
 void ConsoleMessage::windowCleared(DOMWindow* window)
 {
-    if (!m_arguments)
-        return;
-    if (domWindowFromScriptState(m_arguments->globalState()) != window)
+    if (!m_arguments || m_arguments->domWindow() != window)
         return;
     if (!m_message)
         m_message = "<message collected>";
     m_arguments.clear();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)