WebCore/ChangeLog

2010-06-22  Pavel Feldman  <pfeldman@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Web Inspector: move nodeByPath from InjectedScript to InspectorBackend.

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

        * inspector/InjectedScriptHost.cpp:

        * inspector/InjectedScriptHost.h:

        * inspector/InjectedScriptHost.idl:

        * inspector/InspectorBackend.cpp:

        (WebCore::InspectorBackend::pushNodeByPathToFrontend):

        * inspector/InspectorBackend.h:

        * inspector/InspectorBackend.idl:

        * inspector/InspectorDOMAgent.cpp:

        (WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):

        (WebCore::InspectorDOMAgent::nodeForPath):

        * inspector/InspectorDOMAgent.h:

        * inspector/InspectorFrontend.cpp:

        (WebCore::InspectorFrontend::didPushNodeByPathToFrontend):

        * inspector/InspectorFrontend.h:

        * inspector/front-end/DOMAgent.js:

        * inspector/front-end/ElementsPanel.js:

        (WebInspector.ElementsPanel.prototype.setDocument):

        * inspector/front-end/InjectedScript.js:

        * inspector/front-end/InjectedScriptAccess.js:

2010-06-22  Yuta Kitamura  <yutak@chromium.org>

        Reviewed by Alexey Proskuryakov.

WebCore/inspector/InjectedScriptHost.cpp

@@long InjectedScriptHost::pushNodePathToFrontend(Node* node, bool withChildren, b

    return id;

}

long InjectedScriptHost::pushNodeByPathToFrontend(const String& path)

{

    InspectorDOMAgent* domAgent = inspectorDOMAgent();

    if (!domAgent)

        return 0;

    Node* node = domAgent->nodeForPath(path);

    if (!node)

        return 0;

    return domAgent->pushNodePathToFrontend(node);

}

long InjectedScriptHost::inspectedNode(unsigned long num)

{

    InspectorDOMAgent* domAgent = inspectorDOMAgent();

WebCore/inspector/InjectedScriptHost.h

@@public:

    void copyText(const String& text);

    Node* nodeForId(long nodeId);

    long pushNodePathToFrontend(Node* node, bool withChildren, bool selectInUI);

71 long pushNodeByPathToFrontend(const String& path);

    long inspectedNode(unsigned long num);

#if ENABLE(DATABASE)

WebCore/inspector/InjectedScriptHost.idl

@@module core {

        void copyText(in DOMString text);

        [Custom] DOMObject nodeForId(in long nodeId);

        [Custom] int pushNodePathToFrontend(in DOMObject node, in boolean withChildren, in boolean selectInUI);

40 long pushNodeByPathToFrontend(in DOMString path);

        long inspectedNode(in unsigned long num);

#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER

WebCore/inspector/InspectorBackend.cpp

@@void InspectorBackend::searchCanceled()

        domAgent->searchCanceled();

}

void InspectorBackend::pushNodeByPathToFrontend(long callId, const String& path)

{

    InspectorDOMAgent* domAgent = inspectorDOMAgent();

    InspectorFrontend* frontend = inspectorFrontend();

    if (!domAgent || !frontend)

        return;

    long id = domAgent->pushNodeByPathToFrontend(path);

    frontend->didPushNodeByPathToFrontend(callId, id);

}

void InspectorBackend::clearConsoleMessages()

{

    if (m_inspectorController)

WebCore/inspector/InspectorBackend.h

@@public:

    void addInspectedNode(long nodeId);

    void performSearch(const String& query, bool runSynchronously);

    void searchCanceled();

133 void pushNodeByPathToFrontend(long callId, const String& path);

    void clearConsoleMessages();

WebCore/inspector/InspectorBackend.idl

@@module core {

        void addInspectedNode(in long nodeId);

        void performSearch(in DOMString query, in boolean runSynchronously);

        void searchCanceled();

108 void pushNodeByPathToFrontend(in long callId, in DOMString path);

        void clearConsoleMessages();

WebCore/inspector/InspectorDOMAgent.cpp

@@void InspectorDOMAgent::pushChildNodesToFrontend(long nodeId)

    m_frontend->setChildNodes(nodeId, children);

}

long InspectorDOMAgent::pushNodeByPathToFrontend(const String& path)

{

    Node* node = nodeForPath(path);

    if (!node)

        return 0;

    return pushNodePathToFrontend(node);

}

long InspectorDOMAgent::inspectedNode(unsigned long num)

{

    if (num < m_inspectedNodes.size())

@@Node* InspectorDOMAgent::nodeForId(long id)

    return 0;

}

Node* InspectorDOMAgent::nodeForPath(const String& path)

{

    // The path is of form "1,HTML,2,BODY,1,DIV"

    Node* node = mainFrameDocument();

    if (!node)

        return 0;

    Vector<String> pathTokens;

    path.split(",", false, pathTokens);

    for (size_t i = 0; i < pathTokens.size() - 1; i += 2) {

        bool success = true;

        unsigned childNumber = pathTokens[i].toUInt(&success);

        if (!success)

            return 0;

        if (childNumber >= innerChildNodeCount(node))

            return 0;

        Node* child = innerFirstChild(node);

        String childName = pathTokens[i + 1];

        for (size_t j = 0; child && j < childNumber; ++j)

            child = innerNextSibling(child);

        if (!child || child->nodeName() != childName)

            return 0;

        node = child;

    }

    return node;

}

void InspectorDOMAgent::getChildNodes(long callId, long nodeId)

{

    pushChildNodesToFrontend(nodeId);

@@bool InspectorDOMAgent::ruleAffectsNode(CSSStyleRule* rule, Node* node)

    return false;

}

Node* InspectorDOMAgent::nodeForPath(const String& path)

{

    // The path is of form "1,HTML,2,BODY,1,DIV"

    Node* node = mainFrameDocument();

    if (!node)

        return 0;

    Vector<String> pathTokens;

    path.split(",", false, pathTokens);

    for (size_t i = 0; i < pathTokens.size() - 1; i += 2) {

        bool success = true;

        unsigned childNumber = pathTokens[i].toUInt(&success);

        if (!success)

            return 0;

        if (childNumber >= innerChildNodeCount(node))

            return 0;

        Node* child = innerFirstChild(node);

        String childName = pathTokens[i + 1];

        for (size_t j = 0; child && j < childNumber; ++j)

            child = innerNextSibling(child);

        if (!child || child->nodeName() != childName)

            return 0;

        node = child;

    }

    return node;

}

ScriptArray InspectorDOMAgent::toArray(const Vector<String>& data)

{

    ScriptArray result = m_frontend->newScriptArray();

WebCore/inspector/InspectorDOMAgent.h

@@namespace WebCore {

        void didModifyDOMAttr(Element*);

        Node* nodeForId(long nodeId);

137 Node* nodeForPath(const String& path);

138137 long pushNodePathToFrontend(Node* node);

139138 void pushChildNodesToFrontend(long nodeId);

139 long pushNodeByPathToFrontend(const String& path);

        long inspectedNode(unsigned long num);

    private:

@@namespace WebCore {

        String shorthandValue(CSSStyleDeclaration*, const String& shorthandProperty);

        String shorthandPriority(CSSStyleDeclaration*, const String& shorthandProperty);

        bool ruleAffectsNode(CSSStyleRule*, Node*);

190 Node* nodeForPath(const String& path);

        ScriptArray toArray(const Vector<String>& data);

        void discardBindings();

WebCore/inspector/InspectorFrontend.cpp

#include "config.h"

#include "InspectorFrontend.h"

32

#if ENABLE(INSPECTOR)

#include "ConsoleMessage.h"

@@void InspectorFrontend::didSetOuterHTML(long callId, long nodeId)

    function.call();

}

void InspectorFrontend::didPushNodeByPathToFrontend(long callId, long nodeId)

{

    ScriptFunctionCall function(m_webInspector, "dispatch"); 

    function.appendArgument("didPushNodeByPathToFrontend");

    function.appendArgument(callId);

    function.appendArgument(nodeId);

    function.call();

}

void InspectorFrontend::didGetChildNodes(long callId)

{

    ScriptFunctionCall function(m_webInspector, "dispatch"); 

WebCore/inspector/InspectorFrontend.h

@@namespace WebCore {

        void didChangeTagName(long callId, long nodeId);

        void didGetOuterHTML(long callId, const String& outerHTML);

        void didSetOuterHTML(long callId, long nodeId);

150 void didPushNodeByPathToFrontend(long callId, long nodeId);

        void didGetStyles(long callId, const ScriptValue& styles);

        void didGetAllStyles(long callId, const ScriptArray& styles);

WebCore/inspector/front-end/DOMAgent.js

@@WebInspector.didRemoveNode = WebInspector.Callback.processCallback;

WebInspector.didChangeTagName = WebInspector.Callback.processCallback;

WebInspector.didGetOuterHTML = WebInspector.Callback.processCallback;

WebInspector.didSetOuterHTML = WebInspector.Callback.processCallback;

674WebInspector.didPushNodeByPathToFrontend = WebInspector.Callback.processCallback;

WebInspector.didGetEventListenersForNode = WebInspector.Callback.processCallback;

WebInspector.didGetStyles = WebInspector.Callback.processCallback;

WebCore/inspector/front-end/ElementsPanel.js

@@WebInspector.ElementsPanel.prototype = {

            selectNode.call(this, node);

        }

        if (this._selectedPathOnReset)

            InjectedScriptAccess.getDefault().nodeByPath(this._selectedPathOnReset, selectLastSelectedNode.bind(this));

        else

        if (this._selectedPathOnReset) {

            var callId = WebInspector.Callback.wrap(selectLastSelectedNode.bind(this));

            InspectorBackend.pushNodeByPathToFrontend(callId, this._selectedPathOnReset);

        } else

            selectNode.call(this);

        delete this._selectedPathOnReset;

    },

WebCore/inspector/front-end/InjectedScript.js

@@InjectedScript.pushNodeToFrontend = function(objectProxy)

    return InjectedScriptHost.pushNodePathToFrontend(object, false, false);

}

InjectedScript.nodeByPath = function(path)

{

    // We make this call through the injected script only to get a nice

    // callback for it.

    return InjectedScriptHost.pushNodeByPathToFrontend(path.join(","));

}

// Called from within InspectorController on the 'inspected page' side.

InjectedScript.createProxyObject = function(object, objectId, abbreviate)

{

WebCore/inspector/front-end/InjectedScriptAccess.js

@@InjectedScriptAccess._installHandler("getProperties");

InjectedScriptAccess._installHandler("getPrototypes");

InjectedScriptAccess._installHandler("openInInspectedWindow");

InjectedScriptAccess._installHandler("pushNodeToFrontend");

80 InjectedScriptAccess._installHandler("nodeByPath");

InjectedScriptAccess._installHandler("setPropertyValue");

InjectedScriptAccess._installHandler("evaluateOnSelf");