Changeset 63891 in webkit

Timestamp:

Jul 22, 2010 7:33:54 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-07-22 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: should be possible to convert console message arguments to InspectorValues
​https://bugs.webkit.org/show_bug.cgi?id=42457

Now it is possible to convert simple JavaScript objects to
InspectorValues.

• bindings/js/ScriptValue.cpp: (WebCore::jsToInspectorValue): (WebCore::ScriptValue::toInspectorValue):
• bindings/js/ScriptValue.h:
• bindings/v8/ScriptValue.cpp: (WebCore::v8ToInspectorValue): (WebCore::ScriptValue::toInspectorValue):
• bindings/v8/ScriptValue.h:
• inspector/ConsoleMessage.cpp: console notifications are pushed to RemoteInspectorFrontend instead of InspectorFrontend. (WebCore::ConsoleMessage::CallFrame::buildInspectorObject): (WebCore::ConsoleMessage::addToFrontend): (WebCore::ConsoleMessage::updateRepeatCountInConsole):
• inspector/ConsoleMessage.h:
• inspector/InjectedScript.cpp: (WebCore::InjectedScript::wrapForConsole): return InspectorValue instead of SerializedScriptValue
• inspector/InjectedScript.h:
• inspector/Inspector.idl:
• inspector/InspectorBackend.cpp: (WebCore::InspectorBackend::clearConsoleMessages): send response directly from the backend (WebCore::InspectorBackend::remoteFrontend):
• inspector/InspectorBackend.h:
• inspector/InspectorController.cpp: (WebCore::InspectorController::addConsoleMessage): (WebCore::InspectorController::clearConsoleMessages): don't send notification to the front end, it will be send either from InspectorBackend.cpp if it was a user request or reset message will be send to the front end if the messages are cleared due to page navigation. (WebCore::InspectorController::populateScriptObjects):
• inspector/front-end/ConsoleView.js:
• inspector/front-end/inspector.js:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptValue.cpp (modified) (2 diffs)
• bindings/js/ScriptValue.h (modified) (2 diffs)
• bindings/v8/ScriptValue.cpp (modified) (2 diffs)
• bindings/v8/ScriptValue.h (modified) (2 diffs)
• inspector/ConsoleMessage.cpp (modified) (3 diffs)
• inspector/ConsoleMessage.h (modified) (3 diffs)
• inspector/InjectedScript.cpp (modified) (3 diffs)
• inspector/InjectedScript.h (modified) (2 diffs)
• inspector/Inspector.idl (modified) (3 diffs)
• inspector/InspectorBackend.cpp (modified) (3 diffs)
• inspector/InspectorBackend.h (modified) (3 diffs)
• inspector/InspectorBackend.idl (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (3 diffs)
• inspector/front-end/ConsoleView.js (modified) (2 diffs)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-22  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: should be possible to convert console message arguments to InspectorValues
+        https://bugs.webkit.org/show_bug.cgi?id=42457
+
+        Now it is possible to convert simple JavaScript objects to
+        InspectorValues.
+
+        * bindings/js/ScriptValue.cpp:
+        (WebCore::jsToInspectorValue):
+        (WebCore::ScriptValue::toInspectorValue):
+        * bindings/js/ScriptValue.h:
+        * bindings/v8/ScriptValue.cpp:
+        (WebCore::v8ToInspectorValue):
+        (WebCore::ScriptValue::toInspectorValue):
+        * bindings/v8/ScriptValue.h:
+        * inspector/ConsoleMessage.cpp: console notifications are pushed to RemoteInspectorFrontend instead of InspectorFrontend.
+        (WebCore::ConsoleMessage::CallFrame::buildInspectorObject):
+        (WebCore::ConsoleMessage::addToFrontend):
+        (WebCore::ConsoleMessage::updateRepeatCountInConsole):
+        * inspector/ConsoleMessage.h:
+        * inspector/InjectedScript.cpp:
+        (WebCore::InjectedScript::wrapForConsole): return InspectorValue instead of SerializedScriptValue
+        * inspector/InjectedScript.h:
+        * inspector/Inspector.idl:
+        * inspector/InspectorBackend.cpp:
+        (WebCore::InspectorBackend::clearConsoleMessages): send response directly from the backend
+        (WebCore::InspectorBackend::remoteFrontend):
+        * inspector/InspectorBackend.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::addConsoleMessage):
+        (WebCore::InspectorController::clearConsoleMessages): don't send notification to the front end,
+        it will be send either from InspectorBackend.cpp if it was a user request or reset message will
+        be send to the front end if the messages are cleared due to page navigation.
+        (WebCore::InspectorController::populateScriptObjects):
+        * inspector/front-end/ConsoleView.js:
+        * inspector/front-end/inspector.js:
+
 2010-07-22  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/bindings/js/ScriptValue.cpp

@@ -30 +30 @@
 #include "ScriptValue.h"
 
+#include "InspectorValues.h"
 #include "SerializedScriptValue.h"
 
@@ -94 +95 @@
 }
 
+static PassRefPtr<InspectorValue> jsToInspectorValue(ScriptState* scriptState, JSValue value)
+{
+    if (!value) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }
+    if (value.isNull() || value.isUndefined())
+        return InspectorValue::null();
+    if (value.isBoolean())
+        return InspectorBasicValue::create(value.getBoolean());
+    if (value.isNumber())
+        return InspectorBasicValue::create(value.uncheckedGetNumber());
+    if (value.isString()) {
+        UString s = value.getString(scriptState);
+        return InspectorString::create(String(s.data(), s.size()));
+    }
+    if (value.isObject()) {
+        if (isJSArray(&scriptState->globalData(), value)) {
+            RefPtr<InspectorArray> inspectorArray = InspectorArray::create();
+            JSArray* array = asArray(value);
+            unsigned length = array->length();
+            for (unsigned i = 0; i < length; i++) {
+                JSValue element = array->getIndex(i);
+                RefPtr<InspectorValue> elementValue = jsToInspectorValue(scriptState, element);
+                if (!elementValue) {
+                    ASSERT_NOT_REACHED();
+                    elementValue = InspectorValue::null();
+                }
+                inspectorArray->push(elementValue);
+            }
+            return inspectorArray;
+        }
+        RefPtr<InspectorObject> inspectorObject = InspectorObject::create();
+        JSObject* object = value.getObject();
+        PropertyNameArray propertyNames(scriptState);
+        object->getOwnPropertyNames(scriptState, propertyNames);
+        for (size_t i = 0; i < propertyNames.size(); i++) {
+            const Identifier& name =  propertyNames[i];
+            JSValue propertyValue = object->get(scriptState, name);
+            RefPtr<InspectorValue> inspectorValue = jsToInspectorValue(scriptState, propertyValue);
+            if (!inspectorValue) {
+                ASSERT_NOT_REACHED();
+                inspectorValue = InspectorValue::null();
+            }
+            inspectorObject->set(String(name.data(), name.size()), inspectorValue);
+        }
+        return inspectorObject;
+    }
+    return 0;
+}
+
+PassRefPtr<InspectorValue> ScriptValue::toInspectorValue(ScriptState* scriptState) const
+{
+    return jsToInspectorValue(scriptState, m_value.get());
+}
+
 } // namespace WebCore

trunk/WebCore/bindings/js/ScriptValue.h

@@ -41 +41 @@
 namespace WebCore {
 
+class InspectorValue;
 class SerializedScriptValue;
 
@@ -62 +63 @@
     static ScriptValue undefined() { return ScriptValue(JSC::jsUndefined()); }
 
+    PassRefPtr<InspectorValue> toInspectorValue(ScriptState*) const;
+
 private:
     JSC::ProtectedJSValue m_value;

trunk/WebCore/bindings/v8/ScriptValue.cpp

@@ -32 +32 @@
 #include "ScriptValue.h"
 
+#include "InspectorValues.h"
 #include "ScriptScope.h"
 #include "SerializedScriptValue.h"
@@ -67 +68 @@
 }
 
+static PassRefPtr<InspectorValue> v8ToInspectorValue(v8::Handle<v8::Value> value)
+{
+    if (value.IsEmpty()) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }
+    if (value->IsNull() || value->IsUndefined())
+        return InspectorValue::null();
+    if (value->IsBoolean())
+        return InspectorBasicValue::create(value->BooleanValue());
+    if (value->IsNumber())
+        return InspectorBasicValue::create(value->NumberValue());
+    if (value->IsString())
+        return InspectorString::create(toWebCoreString(value));
+    if (value->IsArray()) {
+        v8::HandleScope handleScope;
+        v8::Handle<v8::Array> array = v8::Handle<v8::Array>::Cast(value);
+        RefPtr<InspectorArray> inspectorArray = InspectorArray::create();
+        uint32_t length = array->Length();
+        for (uint32_t i = 0; i < length; i++) {
+            v8::Local<v8::Value> value = array->Get(v8::Int32::New(i));
+            RefPtr<InspectorValue> element = v8ToInspectorValue(value);
+            if (!element) {
+                ASSERT_NOT_REACHED();
+                element = InspectorValue::null();
+            }
+            inspectorArray->push(element);
+        }
+        return inspectorArray;
+    }
+    if (value->IsObject()) {
+        RefPtr<InspectorObject> inspectorObject = InspectorObject::create();
+
+        v8::HandleScope handleScope;
+        v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value);
+        v8::Local<v8::Array> propertyNames = object->GetPropertyNames();
+        uint32_t length = propertyNames->Length();
+        for (uint32_t i = 0; i < length; i++) {
+            v8::Local<v8::Value> name = propertyNames->Get(v8::Int32::New(i));
+            RefPtr<InspectorValue> propertyValue = v8ToInspectorValue(object->Get(name));
+            if (!propertyValue) {
+                ASSERT_NOT_REACHED();
+                continue;
+            }
+            inspectorObject->set(toWebCoreStringWithNullCheck(name), propertyValue);
+        }
+        return inspectorObject;
+    }
+    return 0;
+}
+
+PassRefPtr<InspectorValue> ScriptValue::toInspectorValue(ScriptState*) const
+{
+    return v8ToInspectorValue(m_value);
+}
+
 } // namespace WebCore

trunk/WebCore/bindings/v8/ScriptValue.h

@@ -44 +44 @@
 namespace WebCore {
 
+class InspectorValue;
 class SerializedScriptValue;
 
@@ -152 +153 @@
     String toString(ScriptState*) const;
 
+    PassRefPtr<InspectorValue> toInspectorValue(ScriptState*) const;
+
 private:
     mutable v8::Persistent<v8::Value> m_value;

trunk/WebCore/inspector/ConsoleMessage.cpp

@@ -35 +35 @@
 #include "InjectedScriptHost.h"
 #include "InspectorFrontend.h"
+#include "InspectorValues.h"
+#include "RemoteInspectorFrontend.h"
 #include "ScriptCallStack.h"
 #include "ScriptObject.h"
-#include "SerializedScriptValue.h"
 
 namespace WebCore {
@@ -60 +61 @@
 }
 
-ScriptObject ConsoleMessage::CallFrame::buildObject(InspectorFrontend* frontend) const
+PassRefPtr<InspectorObject> ConsoleMessage::CallFrame::buildInspectorObject() const
 {
-    ScriptObject frame = frontend->newScriptObject();
-    frame.set("functionName", m_functionName);
-    frame.set("sourceURL", m_sourceURL.string());
-    frame.set("lineNumber", m_lineNumber);
+    RefPtr<InspectorObject> frame = InspectorObject::create();
+    frame->setString("functionName", m_functionName);
+    frame->setString("sourceURL", m_sourceURL.string());
+    frame->setNumber("lineNumber", m_lineNumber);
     return frame;
 }
@@ -110 +111 @@
 
 #if ENABLE(INSPECTOR)
-void ConsoleMessage::addToFrontend(InspectorFrontend* frontend, InjectedScriptHost* injectedScriptHost)
+void ConsoleMessage::addToFrontend(RemoteInspectorFrontend* frontend, InjectedScriptHost* injectedScriptHost)
 {
-    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));
-    jsonObj.set("message", m_message);
+    RefPtr<InspectorObject> jsonObj = InspectorObject::create();
+    jsonObj->setNumber("source", static_cast<int>(m_source));
+    jsonObj->setNumber("type", static_cast<int>(m_type));
+    jsonObj->setNumber("level", static_cast<int>(m_level));
+    jsonObj->setNumber("line", static_cast<int>(m_line));
+    jsonObj->setString("url", m_url);
+    jsonObj->setNumber("groupLevel", static_cast<int>(m_groupLevel));
+    jsonObj->setNumber("repeatCount", static_cast<int>(m_repeatCount));
+    jsonObj->setString("message", m_message);
     if (!m_arguments.isEmpty()) {
-        ScriptArray jsonArgs = frontend->newScriptArray();
+        RefPtr<InspectorArray> jsonArgs = InspectorArray::create();
         InjectedScript injectedScript = injectedScriptHost->injectedScriptFor(m_scriptState.get());
         for (unsigned i = 0; i < m_arguments.size(); ++i) {
-            RefPtr<SerializedScriptValue> serializedValue = injectedScript.wrapForConsole(m_arguments[i]);
-            if (!jsonArgs.set(i, serializedValue.get())) {
+            RefPtr<InspectorValue> inspectorValue = injectedScript.wrapForConsole(m_arguments[i]);
+            if (!inspectorValue) {
                 ASSERT_NOT_REACHED();
                 return;
             }
+            jsonArgs->push(inspectorValue);
         }
-        jsonObj.set("parameters", jsonArgs);
+        jsonObj->set("parameters", jsonArgs);
     }
     if (!m_frames.isEmpty()) {
-        ScriptArray frames = frontend->newScriptArray();
+        RefPtr<InspectorArray> frames = InspectorArray::create();
         for (unsigned i = 0; i < m_frames.size(); i++)
-            frames.set(i, m_frames.at(i).buildObject(frontend));
-        jsonObj.set("stackTrace", frames);
+            frames->push(m_frames.at(i).buildInspectorObject());
+        jsonObj->set("stackTrace", frames);
     }
     frontend->addConsoleMessage(jsonObj);
 }
 
-void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend* frontend)
+void ConsoleMessage::updateRepeatCountInConsole(RemoteInspectorFrontend* frontend)
 {
     frontend->updateConsoleMessageRepeatCount(m_repeatCount);

trunk/WebCore/inspector/ConsoleMessage.h

@@ -41 +41 @@
 namespace WebCore {
 class InjectedScriptHost;
-class InspectorFrontend;
+class InspectorObject;
+class RemoteInspectorFrontend;
 class ScriptCallFrame;
 class ScriptCallStack;
@@ -52 +53 @@
 
 #if ENABLE(INSPECTOR)
-    void addToFrontend(InspectorFrontend*, InjectedScriptHost*);
-    void updateRepeatCountInConsole(InspectorFrontend* frontend);
+    void addToFrontend(RemoteInspectorFrontend*, InjectedScriptHost*);
+    void updateRepeatCountInConsole(RemoteInspectorFrontend* frontend);
 #endif
     void incrementCount() { ++m_repeatCount; }
@@ -67 +68 @@
         CallFrame();
         bool isEqual(const CallFrame& o) const;
-        ScriptObject buildObject(InspectorFrontend* frontend) const;
+        PassRefPtr<InspectorObject> buildInspectorObject() const;
 
     private:

trunk/WebCore/inspector/InjectedScript.cpp

@@ -34 +34 @@
 #if ENABLE(INSPECTOR)
 
+#include "InspectorValues.h"
 #include "PlatformString.h"
 #include "SerializedScriptValue.h"
@@ -74 +75 @@
 #endif
 
-PassRefPtr<SerializedScriptValue> InjectedScript::wrapForConsole(ScriptValue value)
+PassRefPtr<InspectorValue> InjectedScript::wrapForConsole(ScriptValue value)
 {
     ASSERT(!hasNoValue());
@@ -83 +84 @@
     ScriptValue r = wrapFunction.call(hadException);
     if (hadException)
-        return SerializedScriptValue::create("<exception>");
-    return r.serialize(m_injectedScriptObject.scriptState());
+        return InspectorString::create("<exception>");
+    return r.toInspectorValue(m_injectedScriptObject.scriptState());
 }
 

trunk/WebCore/inspector/InjectedScript.h

@@ -39 +39 @@
 namespace WebCore {
 
+class InspectorValue;
 class SerializedScriptValue;
 class String;
@@ -53 +54 @@
     PassRefPtr<SerializedScriptValue> callFrames();
 #endif
-    PassRefPtr<SerializedScriptValue> wrapForConsole(ScriptValue);
+    PassRefPtr<InspectorValue> wrapForConsole(ScriptValue);
     void releaseWrapperObjectGroup(const String&);
 

trunk/WebCore/inspector/Inspector.idl

@@ -33 +33 @@
 module core {
     interface [Conditional=INSPECTOR] Inspector {
+        [notify] void addConsoleMessage(out Object messageObj);
         [notify] void addRecordToTimeline(out Object record);
         [notify] void addNodesToSearchResult(out Array nodeIds);
@@ -42 +43 @@
         [notify] void setDetachedRoot(out Object root);
         [notify] void setDocument(out Value root);
+        [notify] void updateConsoleMessageExpiredCount(out unsigned long count);
+        [notify] void updateConsoleMessageRepeatCount(out unsigned long count);
 
         void storeLastActivePanel(in String panelName);
@@ -118 +121 @@
         void pushNodeByPathToFrontend(in long callId, in String path, out long nodeId);
 
-        void clearConsoleMessages();
+        void clearConsoleMessages(in long callId);
 
         void highlightDOMNode(in long nodeId);

trunk/WebCore/inspector/InspectorBackend.cpp

@@ -50 +50 @@
 #include "Page.h"
 #include "Pasteboard.h"
+#include "RemoteInspectorFrontend.h"
 #include "ScriptArray.h"
 #include "ScriptBreakpoint.h"
@@ -413 +414 @@
 }
 
-void InspectorBackend::clearConsoleMessages()
-{
-    if (m_inspectorController)
+void InspectorBackend::clearConsoleMessages(long callId)
+{
+    if (m_inspectorController) {
         m_inspectorController->clearConsoleMessages();
+        if (RemoteInspectorFrontend* frontend = remoteFrontend())
+            frontend->didClearConsoleMessages(callId);
+    }
 }
 
@@ -598 +602 @@
 }
 
+RemoteInspectorFrontend* InspectorBackend::remoteFrontend()
+{
+    if (!m_inspectorController)
+        return 0;
+    return m_inspectorController->m_remoteFrontend.get();
+}
+
 void InspectorBackend::addScriptToEvaluateOnLoad(const String& source)
 {

trunk/WebCore/inspector/InspectorBackend.h

@@ -44 +44 @@
 class InspectorFrontend;
 class Node;
+class RemoteInspectorFrontend;
 class Storage;
 
@@ -134 +135 @@
     void pushNodeByPathToFrontend(long callId, const String& path);
 
-    void clearConsoleMessages();
+    void clearConsoleMessages(long callId);
 
     void getStyles(long callId, long nodeId, bool authOnly);
@@ -180 +181 @@
 #endif
     InspectorFrontend* inspectorFrontend();
+    RemoteInspectorFrontend* remoteFrontend();
     Node* nodeForId(long nodeId);
 

trunk/WebCore/inspector/InspectorBackend.idl

@@ -108 +108 @@
         void pushNodeByPathToFrontend(in long callId, in DOMString path);
 
-        void clearConsoleMessages();
+        void clearConsoleMessages(in long callId);
 
         void highlightDOMNode(in long nodeId);

trunk/WebCore/inspector/InspectorController.cpp

@@ -364 +364 @@
         m_previousMessage->incrementCount();
         if (m_frontend)
-            m_previousMessage->updateRepeatCountInConsole(m_frontend.get());
+            m_previousMessage->updateRepeatCountInConsole(m_remoteFrontend.get());
     } else {
         m_previousMessage = consoleMessage.get();
         m_consoleMessages.append(consoleMessage);
         if (m_frontend)
-            m_previousMessage->addToFrontend(m_frontend.get(), m_injectedScriptHost.get());
+            m_previousMessage->addToFrontend(m_remoteFrontend.get(), m_injectedScriptHost.get());
     }
 
@@ -387 +387 @@
     if (m_domAgent)
         m_domAgent->releaseDanglingNodes();
-    if (m_frontend)
-        m_frontend->clearConsoleMessages();
 }
 
@@ -657 +655 @@
 
     if (m_expiredConsoleMessageCount)
-        m_frontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
+        m_remoteFrontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
     unsigned messageCount = m_consoleMessages.size();
     for (unsigned i = 0; i < messageCount; ++i)
-        m_consoleMessages[i]->addToFrontend(m_frontend.get(), m_injectedScriptHost.get());
+        m_consoleMessages[i]->addToFrontend(m_remoteFrontend.get(), m_injectedScriptHost.get());
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)

trunk/WebCore/inspector/front-end/ConsoleView.js

@@ -297 +297 @@
     requestClearMessages: function()
     {
-        InspectorBackend.clearConsoleMessages();
+        InspectorBackend.clearConsoleMessages(WebInspector.Callback.wrap(this.clearMessages.bind(this)));
     },
 
@@ -1128 +1128 @@
     }
 }
+
+WebInspector.didClearConsoleMessages = WebInspector.Callback.processCallback;

trunk/WebCore/inspector/front-end/inspector.js

@@ -1128 +1128 @@
 {
     this.currentPanel = this.panels.audits;
-}
-
-WebInspector.clearConsoleMessages = function()
-{
-    WebInspector.console.clearMessages();
 }