DevTools: injected script per context(WebCore part)

inspector/ConsoleMessage.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 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 36 matching lines @@
     , m_groupLevel(g)
     , m_repeatCount(1)
 {
 }
 
 ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, ScriptCallStack* callStack, unsigned g, bool storeTrace)
     : m_source(s)
     , m_type(t)
     , m_level(l)
 #if ENABLE(INSPECTOR)
-    , m_wrappedArguments(callStack->at(0).argumentCount())
+    , m_arguments(callStack->at(0).argumentCount())
+    , m_scriptState(callStack->state())
 #endif
     , m_frames(storeTrace ? callStack->size() : 0)
     , m_groupLevel(g)
     , m_repeatCount(1)
 {
     const ScriptCallFrame& lastCaller = callStack->at(0);
     m_line = lastCaller.lineNumber();
     m_url = lastCaller.sourceURL().string();
 
     // FIXME: For now, just store function names as strings.
     // As ScriptCallStack start storing line number and source URL for all
     // frames, refactor to use that, as well.
     if (storeTrace) {
         for (unsigned i = 0; i < callStack->size(); ++i)
             m_frames[i] = callStack->at(i).functionName();
     }
 
 #if ENABLE(INSPECTOR)
     for (unsigned i = 0; i < lastCaller.argumentCount(); ++i)
-        m_wrappedArguments[i] = ScriptObject::quarantineValue(callStack->state(), lastCaller.argumentAt(i));
+        m_arguments[i] = lastCaller.argumentAt(i);
 #endif
 }
 
 #if ENABLE(INSPECTOR)
 void ConsoleMessage::addToConsole(InspectorFrontend* frontend)
 {
     ScriptObject jsonObj = frontend->newScriptObject();
     jsonObj.set("source", static_cast<int>(m_source));
     jsonObj.set("type", static_cast<int>(m_type));
     jsonObj.set("level", static_cast<int>(m_level));
     jsonObj.set("line", static_cast<int>(m_line));
     jsonObj.set("url", m_url);
     jsonObj.set("groupLevel", static_cast<int>(m_groupLevel));
     jsonObj.set("repeatCount", static_cast<int>(m_repeatCount));
-    frontend->addConsoleMessage(jsonObj, m_frames, m_wrappedArguments,  m_message);
+    frontend->addConsoleMessage(jsonObj, m_frames, m_scriptState, m_arguments,  m_message);
 }
 
 void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend* frontend)
 {
     frontend->updateConsoleMessageRepeatCount(m_repeatCount);
 }
 #endif // ENABLE(INSPECTOR)
 
 bool ConsoleMessage::isEqual(ScriptState* state, ConsoleMessage* msg) const
 {
 #if ENABLE(INSPECTOR)
-    if (msg->m_wrappedArguments.size() != m_wrappedArguments.size())
+    if (msg->m_arguments.size() != m_arguments.size())
         return false;
-    if (!state && msg->m_wrappedArguments.size())
+    if (!state && msg->m_arguments.size())
         return false;
 
-    ASSERT_ARG(state, state || msg->m_wrappedArguments.isEmpty());
+    ASSERT_ARG(state, state || msg->m_arguments.isEmpty());
 
-    for (size_t i = 0; i < msg->m_wrappedArguments.size(); ++i) {
-        if (!m_wrappedArguments[i].isEqual(state, msg->m_wrappedArguments[i]))
+    for (size_t i = 0; i < msg->m_arguments.size(); ++i) {
+        if (!m_arguments[i].isEqual(state, msg->m_arguments[i]))
             return false;
     }
 #else
     UNUSED_PARAM(state);
 #endif // ENABLE(INSPECTOR)
 
     size_t frameCount = msg->m_frames.size();
     if (frameCount != m_frames.size())
         return false;
 
     for (size_t i = 0; i < frameCount; ++i) {
         if (m_frames[i] != msg->m_frames[i])
             return false;
     }
 
     return msg->m_source == m_source
         && 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_groupLevel == m_groupLevel;
 }
 
 } // namespace WebCore