Changeset 64653 in webkit

Timestamp:

Aug 4, 2010 8:26:33 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-08-04 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: use InspectorValue to push dispatch results from the injected script
​https://bugs.webkit.org/show_bug.cgi?id=43483

• bindings/js/JSInjectedScriptHostCustom.cpp: (WebCore::JSInjectedScriptHost::reportDidDispatchOnInjectedScript):
• bindings/v8/custom/V8InjectedScriptHostCustom.cpp: (WebCore::V8InjectedScriptHost::reportDidDispatchOnInjectedScriptCallback):
• inspector/InjectedScript.cpp: (WebCore::InjectedScript::dispatch):
• inspector/InjectedScript.h:
• inspector/InjectedScriptHost.cpp: (WebCore::InjectedScriptHost::reportDidDispatchOnInjectedScript): (WebCore::InjectedScriptHost::remoteFrontend):
• inspector/InjectedScriptHost.h:
• inspector/Inspector.idl:
• inspector/InspectorBackend.cpp: (WebCore::InspectorBackend::dispatchOnInjectedScript):
• inspector/InspectorController.cpp: (WebCore::InspectorController::didContinue):
• inspector/InspectorFrontend.cpp:
• inspector/InspectorFrontend.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSInjectedScriptHostCustom.cpp (modified) (3 diffs)
• bindings/v8/custom/V8InjectedScriptHostCustom.cpp (modified) (2 diffs)
• inspector/InjectedScript.cpp (modified) (3 diffs)
• inspector/InjectedScript.h (modified) (2 diffs)
• inspector/InjectedScriptHost.cpp (modified) (3 diffs)
• inspector/InjectedScriptHost.h (modified) (3 diffs)
• inspector/Inspector.idl (modified) (1 diff)
• inspector/InspectorBackend.cpp (modified) (2 diffs)
• inspector/InspectorController.cpp (modified) (1 diff)
• inspector/InspectorFrontend.cpp (modified) (3 diffs)
• inspector/InspectorFrontend.h (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-04  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: use InspectorValue to push dispatch results from the injected script
+        https://bugs.webkit.org/show_bug.cgi?id=43483
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::reportDidDispatchOnInjectedScript):
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::V8InjectedScriptHost::reportDidDispatchOnInjectedScriptCallback):
+        * inspector/InjectedScript.cpp:
+        (WebCore::InjectedScript::dispatch):
+        * inspector/InjectedScript.h:
+        * inspector/InjectedScriptHost.cpp:
+        (WebCore::InjectedScriptHost::reportDidDispatchOnInjectedScript):
+        (WebCore::InjectedScriptHost::remoteFrontend):
+        * inspector/InjectedScriptHost.h:
+        * inspector/Inspector.idl:
+        * inspector/InspectorBackend.cpp:
+        (WebCore::InspectorBackend::dispatchOnInjectedScript):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::didContinue):
+        * inspector/InspectorFrontend.cpp:
+        * inspector/InspectorFrontend.h:
+
 2010-08-04  Abhishek Arya  <inferno@chromium.org>
 

trunk/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp

@@ -49 +49 @@
 #include "InspectorController.h"
 #include "InspectorResource.h"
+#include "InspectorValues.h"
 #include "JSDOMWindow.h"
 #include "JSDOMWindowCustom.h"
@@ -56 +57 @@
 #include "Page.h"
 #if ENABLE(DOM_STORAGE)
-#include "SerializedScriptValue.h"
 #include "Storage.h"
 #include "JSStorage.h"
@@ -202 +202 @@
     int callId = exec->argument(0).asInt32();
     
-    RefPtr<SerializedScriptValue> result(SerializedScriptValue::create(exec, exec->argument(1)));
+    RefPtr<InspectorValue> result = ScriptValue(exec->argument(1)).toInspectorValue(exec);
     
     bool isException;
     if (!exec->argument(2).getBoolean(isException))
         return jsUndefined();
-    impl()->reportDidDispatchOnInjectedScript(callId, result.get(), isException);
+    impl()->reportDidDispatchOnInjectedScript(callId, result, isException);
     return jsUndefined();
 }

trunk/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

@@ -38 +38 @@
 #include "InjectedScriptHost.h"
 #include "InspectorController.h"
+#include "InspectorValues.h"
 #include "Node.h"
 #include "Page.h"
 #include "ScriptDebugServer.h"
-#include "SerializedScriptValue.h"
 
 #include "V8Binding.h"
@@ -216 +216 @@
     InjectedScriptHost* host = V8InjectedScriptHost::toNative(args.Holder());
     int callId = args[0]->ToInt32()->Value();
-    RefPtr<SerializedScriptValue> result(SerializedScriptValue::create(args[1]));
+    RefPtr<InspectorValue> result = ScriptValue(args[1]).toInspectorValue(ScriptState::current());
     bool isException = args[2]->ToBoolean()->Value();
-    host->reportDidDispatchOnInjectedScript(callId, result.get(), isException);
+    host->reportDidDispatchOnInjectedScript(callId, result, isException);
     return v8::Undefined();
 }

trunk/WebCore/inspector/InjectedScript.cpp

@@ -36 +36 @@
 #include "InspectorValues.h"
 #include "PlatformString.h"
-#include "SerializedScriptValue.h"
 #include "ScriptFunctionCall.h"
 
@@ -46 +45 @@
 }
 
-void InjectedScript::dispatch(long callId, const String& methodName, const String& arguments, bool async, RefPtr<SerializedScriptValue>* result, bool* hadException) 
+void InjectedScript::dispatch(long callId, const String& methodName, const String& arguments, bool async, RefPtr<InspectorValue>* result, bool* hadException) 
 {
     ASSERT(!hasNoValue());
@@ -62 +61 @@
     ScriptValue resultValue = function.call(*hadException);
     if (!*hadException)
-        *result = resultValue.serialize(m_injectedScriptObject.scriptState());
+        *result = resultValue.toInspectorValue(m_injectedScriptObject.scriptState());
 }
 

trunk/WebCore/inspector/InjectedScript.h

@@ -40 +40 @@
 
 class InspectorValue;
-class SerializedScriptValue;
 class String;
 
@@ -50 +49 @@
     bool hasNoValue() const { return m_injectedScriptObject.hasNoValue(); }
 
-    void dispatch(long callId, const String& methodName, const String& arguments, bool async, RefPtr<SerializedScriptValue>* result, bool* hadException);
+    void dispatch(long callId, const String& methodName, const String& arguments, bool async, RefPtr<InspectorValue>* result, bool* hadException);
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     PassRefPtr<InspectorValue> callFrames();

trunk/WebCore/inspector/InjectedScriptHost.cpp

@@ -46 +46 @@
 #include "InspectorResource.h"
 #include "Pasteboard.h"
+#include "RemoteInspectorFrontend.h"
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -143 +144 @@
 #endif
 
-void InjectedScriptHost::reportDidDispatchOnInjectedScript(long callId, SerializedScriptValue* result, bool isException)
-{
-    if (InspectorFrontend* frontend = inspectorFrontend())
+void InjectedScriptHost::reportDidDispatchOnInjectedScript(long callId, PassRefPtr<InspectorValue> result, bool isException)
+{
+    if (RemoteInspectorFrontend* frontend = remoteFrontend())
         frontend->didDispatchOnInjectedScript(callId, result, isException);
 }
@@ -186 +187 @@
 }
 
+RemoteInspectorFrontend* InjectedScriptHost::remoteFrontend()
+{
+    if (!m_inspectorController)
+        return 0;
+    return m_inspectorController->m_remoteFrontend.get();
+}
+
 pair<long, ScriptObject> InjectedScriptHost::injectScript(const String& source, ScriptState* scriptState)
 {

trunk/WebCore/inspector/InjectedScriptHost.h

@@ -46 +46 @@
 class InspectorFrontend;
 class Node;
-class SerializedScriptValue;
+class RemoteInspectorFrontend;
 class Storage;
 
@@ -83 +83 @@
     void didDestroyWorker(long id);
 #endif
-    void reportDidDispatchOnInjectedScript(long callId, SerializedScriptValue* result, bool isException);
+    void reportDidDispatchOnInjectedScript(long callId, PassRefPtr<InspectorValue> result, bool isException);
 
     pair<long, ScriptObject> injectScript(const String& source, ScriptState*);
@@ -97 +97 @@
     InspectorDOMAgent* inspectorDOMAgent();
     InspectorFrontend* inspectorFrontend();
+    RemoteInspectorFrontend* remoteFrontend();
     ScriptObject createInjectedScript(const String& source, ScriptState* scriptState, long id);
 

trunk/WebCore/inspector/Inspector.idl

@@ -113 +113 @@
 #endif
         [handler=Backend] void setInjectedScriptSource(in String scriptSource);
-        [handler=Backend] void dispatchOnInjectedScript(in long callId, in long injectedScriptId, in String methodName, in String arguments, in boolean async);
-
+        [handler=Backend] void dispatchOnInjectedScript(in long callId, in long injectedScriptId, in String methodName, in String arguments, in boolean async, out Value result, out boolean isException);
         [handler=Controller] void addScriptToEvaluateOnLoad(in String scriptSource);
         [handler=Controller] void removeAllScriptsToEvaluateOnLoad();

trunk/WebCore/inspector/InspectorBackend.cpp

@@ -95 +95 @@
 void InspectorBackend::dispatchOnInjectedScript(long callId, long injectedScriptId, const String& methodName, const String& arguments, bool async)
 {
-    InspectorFrontend* frontend = inspectorFrontend();
+    RemoteInspectorFrontend* frontend = remoteFrontend();
     if (!frontend)
         return;
@@ -111 +111 @@
         return;
 
-    RefPtr<SerializedScriptValue> result;
+    RefPtr<InspectorValue> result;
     bool hadException = false;
     injectedScript.dispatch(callId, methodName, arguments, async, &result, &hadException);
     if (async)
         return;  // InjectedScript will return result asynchronously by means of ::reportDidDispatchOnInjectedScript.
-    frontend->didDispatchOnInjectedScript(callId, result.get(), hadException);
+    frontend->didDispatchOnInjectedScript(callId, result, hadException);
 }
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -1857 +1857 @@
 {
     m_pausedScriptState = 0;
-    m_frontend->resumedScript();
+    m_remoteFrontend->resumedScript();
 }
 

trunk/WebCore/inspector/InspectorFrontend.cpp

@@ -45 +45 @@
 #include "ScriptString.h"
 #include "ScriptValue.h"
-#include "SerializedScriptValue.h"
 #include <wtf/OwnPtr.h>
 
@@ -287 +286 @@
 }
 
-void InspectorFrontend::pausedScript(SerializedScriptValue* callFrames)
-{
-    ScriptValue callFramesValue = ScriptValue::deserialize(scriptState(), callFrames);
-    ScriptFunctionCall function(m_webInspector, "dispatch");
-    function.appendArgument("pausedScript");
-    function.appendArgument(callFramesValue);
-    function.call();
-}
-
-void InspectorFrontend::resumedScript()
-{
-    callSimpleFunction("resumedScript");
-}
-
 void InspectorFrontend::profilerWasEnabled()
 {
@@ -365 +350 @@
     function.appendArgument(cookies);
     function.appendArgument(cookiesString);
-    function.call();
-}
-
-void InspectorFrontend::didDispatchOnInjectedScript(long callId, SerializedScriptValue* result, bool isException)
-{
-    ScriptFunctionCall function(m_webInspector, "dispatch"); 
-    function.appendArgument("didDispatchOnInjectedScript");
-    function.appendArgument(callId);
-    if (isException)
-        function.appendArgument("");
-    else {
-        ScriptValue resultValue = ScriptValue::deserialize(scriptState(), result);
-        function.appendArgument(resultValue);
-    }
-    function.appendArgument(isException);
     function.call();
 }

trunk/WebCore/inspector/InspectorFrontend.h

@@ -39 +39 @@
 namespace WebCore {
     class ConsoleMessage;
-    class Database;
     class Frame;
     class InspectorClient;
@@ -46 +45 @@
     class Node;
     class ScriptString;
-    class SerializedScriptValue;
     class Storage;
 
@@ -98 +96 @@
         void restoredBreakpoint(const String& sourceID, const String& url, int line, bool enabled, const String& condition);
         void failedToParseScriptSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage);
-        void pausedScript(SerializedScriptValue* callFrames);
-        void resumedScript();
 
         void profilerWasEnabled();
@@ -133 +129 @@
 
         void didGetCookies(long callId, const ScriptArray& cookies, const String& cookiesString);
-        void didDispatchOnInjectedScript(long callId, SerializedScriptValue* result, bool isException);
 
         void contextMenuItemSelected(int itemId);