Changeset 63965 in webkit


Ignore:
Timestamp:
Jul 23, 2010 5:46:19 AM (14 years ago)
Author:
pfeldman@chromium.org
Message:

2010-07-23 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Chromium DevTools: migrate from utility context-based injected
script dispatch to upstream schema.

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

  • bindings/v8/ScriptProfile.cpp: (WebCore::ScriptProfile::title):
  • inspector/InspectorController.cpp: (WebCore::InspectorController::getProfile):
  • inspector/front-end/InjectedScriptAccess.js:

2010-07-23 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Reviewed by Yury Semikhatsky.

Chromium DevTools: migrate from utility context-based injected
script dispatch to upstream schema.

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

  • src/ToolsAgent.h:
  • src/WebDevToolsAgentImpl.cpp:
  • src/WebDevToolsAgentImpl.h:
  • src/js/DevToolsHostStub.js:
  • src/js/InspectorControllerImpl.js: (devtools.InspectorBackendImpl):
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r63964 r63965  
     12010-07-23  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Chromium DevTools: migrate from utility context-based injected
     6        script dispatch to upstream schema.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=42883
     9
     10        * bindings/v8/ScriptProfile.cpp:
     11        (WebCore::ScriptProfile::title):
     12        * inspector/InspectorController.cpp:
     13        (WebCore::InspectorController::getProfile):
     14        * inspector/front-end/InjectedScriptAccess.js:
     15
    1162010-07-23  Pavel Feldman  <pfeldman@chromium.org>
    217

  • trunk/WebCore/bindings/v8/ScriptProfile.cpp

    r63964 r63965  
    4141String ScriptProfile::title() const
    4242{
     43    v8::HandleScope scope;
    4344    return toWebCoreString(m_profile->GetTitle());
    4445}

  • trunk/WebCore/inspector/InspectorController.cpp

    r63964 r63965  
    114114#include "JSScriptProfile.h"
    115115#else
     116#include "ScriptScope.h"
    116117#include "V8ScriptProfile.h"
    117118#endif
    … …  
    15611562        return;
    15621563    ProfilesMap::iterator it = m_profiles.find(uid);
    1563     if (it != m_profiles.end())
     1564    if (it != m_profiles.end()) {
    15641565#if USE(JSC)
    15651566        m_frontend->didGetProfile(callId, toJS(m_frontend->scriptState(), it->second.get()));
    15661567#else
     1568        ScriptScope scope(m_frontend->scriptState());
    15671569        m_frontend->didGetProfile(callId, toV8(it->second.get()));
    15681570#endif
     1571    }
    15691572}
    15701573

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

    r63964 r63965  
    3636InjectedScriptAccess.get = function(injectedScriptId)
    3737{
    38     return new InjectedScriptAccess(injectedScriptId);
     38    if (typeof injectedScriptId === "number")
     39        return new InjectedScriptAccess(injectedScriptId);
     40
     41    console.error("Access to injected script with no id");
     42    console.trace();
    3943}
    4044

  • trunk/WebKit/chromium/ChangeLog

    r63964 r63965  
     12010-07-23  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Reviewed by Yury Semikhatsky.
     4
     5        Chromium DevTools: migrate from utility context-based injected
     6        script dispatch to upstream schema.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=42883
     9
     10        * src/ToolsAgent.h:
     11        * src/WebDevToolsAgentImpl.cpp:
     12        * src/WebDevToolsAgentImpl.h:
     13        * src/js/DevToolsHostStub.js:
     14        * src/js/InspectorControllerImpl.js:
     15        (devtools.InspectorBackendImpl):
     16
    1172010-07-23  Pavel Feldman  <pfeldman@chromium.org>
    218

  • trunk/WebKit/chromium/src/ToolsAgent.h

    r63964 r63965  
    4242    METHOD2(dispatchOnInspectorController, int /* call_id */, \
    4343        String /* message */) \
    44     \
    45     /* Dispatches given function on the InjectedScript object */ \
    46     METHOD5(dispatchOnInjectedScript, int /* call_id */, \
    47         int /* injected_script_id */, String /* function_name */, \
    48         String /* json_args */, bool /* async */)
    4944
    5045DEFINE_RPC_CLASS(ToolsAgent, TOOLS_AGENT_STRUCT)

  • trunk/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

    r63964 r63965  
    317317}
    318318
    319 void WebDevToolsAgentImpl::dispatchOnInjectedScript(int callId, int injectedScriptId, const String& functionName, const String& jsonArgs, bool async)
    320 {
    321     inspectorController()->inspectorBackend()->dispatchOnInjectedScript(
    322         callId,
    323         injectedScriptId,
    324         functionName,
    325         jsonArgs,
    326         async);
    327 }
    328 
    329319void WebDevToolsAgentImpl::dispatchMessageFromFrontend(const WebDevToolsMessageData& data)
    330320{

  • trunk/WebKit/chromium/src/WebDevToolsAgentImpl.h

    r63964 r63965  
    7474    // ToolsAgent implementation.
    7575    virtual void dispatchOnInspectorController(int callId, const WebCore::String& message);
    76     virtual void dispatchOnInjectedScript(int callId, int injectedScriptId, const WebCore::String& functionName, const WebCore::String& jsonArgs, bool async);
    7776
    7877    // WebDevToolsAgentPrivate implementation.

  • trunk/WebKit/chromium/src/js/DevToolsHostStub.js

    r63964 r63965  
    3838    window["RemoteProfilerAgent"] = {};
    3939    window["RemoteToolsAgent"] = {
    40         dispatchOnInjectedScript: function() {},
    4140        dispatchOnInspectorController: function() {}
    4241    };

  • trunk/WebKit/chromium/src/js/InspectorControllerImpl.js

    r63964 r63965  
    5050    this.installInspectorControllerDelegate_("disableSearchingForNode");
    5151    this.installInspectorControllerDelegate_("disableTimeline");
     52    this.installInspectorControllerDelegate_("dispatchOnInjectedScript");
    5253    this.installInspectorControllerDelegate_("enableMonitoringXHR");
    5354    this.installInspectorControllerDelegate_("enableResourceTracking");
    … …  
    127128
    128129/**
    129  * @override
    130  */
    131 devtools.InspectorBackendImpl.prototype.dispatchOnInjectedScript = function(callId, injectedScriptId, methodName, argsString, async)
    132 {
    133     // Encode injectedScriptId into callId
    134     if (typeof injectedScriptId !== "number")
    135         injectedScriptId = 0;
    136     RemoteToolsAgent.dispatchOnInjectedScript(callId, injectedScriptId, methodName, argsString, async);
    137 };
    138 
    139 
    140 /**
    141130 * Installs delegating handler into the inspector controller.
    142131 * @param {string} methodName Method to install delegating handler for.
Note: See TracChangeset for help on using the changeset viewer.