LayoutTests/ChangeLog

2012-08-06  Andrei Poenaru  <poenaru@adobe.com>

        Web Inspector: Protocol: Add "namedFlowCreated" and "namedFlowRemoved" events

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

        Reviewed by NOBODY (OOPS!).

        Modified test so that it validates the implemented events.

        * inspector/styles/protocol-css-regions-commands-expected.txt:

        * inspector/styles/protocol-css-regions-commands.html:

2012-08-06  Takashi Toyoshima  <toyoshim@chromium.org>

        Unreviewed, rebaseline for Mac10.6 against r124752

LayoutTests/inspector/styles/protocol-css-regions-commands-expected.txt

1 Tests the following commands:

1Tests the following commands and events:

getNamedFlowCollection Bug 91607

getFlowByName Bug 91855

5namedFlowCreated Bug 92739

6namedFlowRemoved Bug 92739

Running: testGetNamedFlowCollection

@@Running: testGetFlowByName2

=== Name Flow "flow4" from main document ===

There is no Named Flow "flow4" in the main document

Running: testNamedFlowCreated

NamedFlowCreated: "tmpNamedFlow"

Running: testNamedFlowRemoved

NamedFlowRemoved: "tmpNamedFlow"

LayoutTests/inspector/styles/protocol-css-regions-commands.html

@@function createDynamicElements()

    runTest();

}

function createNamedFlow()

{

    var article = document.createElement("article");

    article.id = "tmpArticle";

    article.style.webkitFlowInto = "tmpNamedFlow";

    document.body.appendChild(article);

}

function removeNamedFlow()

{

    var article = document.getElementById("tmpArticle");

    document.body.removeChild(article);

}

function test()

{

    WebInspector.showPanel("elements");

@@function test()

        function testNamedFlowCreated(next)

        {

            WebInspector.cssModel.addEventListener(WebInspector.CSSStyleModel.Events.NamedFlowCreated, callback, this);

            InspectorTest.evaluateInPage("createNamedFlow()");

            function callback(event)

            {

                WebInspector.cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.NamedFlowCreated, callback, this);

                if (event.data.name !== "tmpNamedFlow") {

                    Inspector.addResult("[!] Failed");

                    InspectorTest.completeTest();

                    return;

                }

                InspectorTest.addResult("NamedFlowCreated: \"tmpNamedFlow\"");

                next();

            }

        },

        function testNamedFlowRemoved(next)

        {

            WebInspector.cssModel.addEventListener(WebInspector.CSSStyleModel.Events.NamedFlowRemoved, callback, this);

            InspectorTest.evaluateInPage("removeNamedFlow()");

            function callback(event)

            {

                WebInspector.cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.NamedFlowRemoved, callback, this);

                if (event.data.name !== "tmpNamedFlow") {

                    Inspector.addResult("[!] Failed");

                    InspectorTest.completeTest();

                    return;

                }

                InspectorTest.addResult("NamedFlowRemoved: \"tmpNamedFlow\"");

                next();

            }

        }

    ]);

}

</script>

@@function test()

<body onload="createDynamicElements()">

<p>

109 Tests the following commands:

164Tests the following commands and events:

<ul>

    <li>getNamedFlowCollection <a href="https://bugs.webkit.org/show_bug.cgi?id=91607">Bug 91607</a></li>

    <li>getFlowByName <a href="https://bugs.webkit.org/show_bug.cgi?id=91855">Bug 91855</a></li>

168 <li>namedFlowCreated <a href="https://bugs.webkit.org/show_bug.cgi?id=92739">Bug 92739</a></li>

169 <li>namedFlowRemoved <a href="https://bugs.webkit.org/show_bug.cgi?id=92739">Bug 92739</a></li>

</ul>

</p>

Source/WebCore/ChangeLog

2012-08-06  Andrei Poenaru  <poenaru@adobe.com>

        Web Inspector: Protocol: Add "namedFlowCreated" and "namedFlowRemoved" events

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

        Reviewed by NOBODY (OOPS!).

        Implemented "namedFlowCreated" and "namedFlowRemoved" events.

        Modified test: inspector/styles/protocol-css-regions-commands.html.

        * dom/WebKitNamedFlowCollection.cpp:

        (WebCore::WebKitNamedFlowCollection::ensureFlowWithName):

        (WebCore::WebKitNamedFlowCollection::discardNamedFlow):

        * inspector/Inspector.json:

        * inspector/InspectorCSSAgent.cpp:

        (WebCore::InspectorCSSAgent::reset):

        (WebCore::InspectorCSSAgent::didCreateNamedFlow):

        (WebCore):

        (WebCore::InspectorCSSAgent::didRemoveNamedFlow):

        (WebCore::InspectorCSSAgent::getNamedFlowCollection):

        * inspector/InspectorCSSAgent.h:

        (InspectorCSSAgent):

        * inspector/InspectorInstrumentation.cpp:

        (WebCore):

        (WebCore::InspectorInstrumentation::didCreateNamedFlowImpl):

        (WebCore::InspectorInstrumentation::didRemoveNamedFlowImpl):

        * inspector/InspectorInstrumentation.h:

        (InspectorInstrumentation):

        (WebCore::InspectorInstrumentation::didCreateNamedFlow):

        (WebCore):

        (WebCore::InspectorInstrumentation::didRemoveNamedFlow):

        * inspector/front-end/CSSStyleModel.js:

        (WebInspector.CSSStyleModel.prototype._namedFlowCreated.callback):

        (WebInspector.CSSStyleModel.prototype._namedFlowCreated):

        (WebInspector.CSSStyleModel.prototype._namedFlowRemoved.callback):

        (WebInspector.CSSStyleModel.prototype._namedFlowRemoved):

        (WebInspector.CSSDispatcher.prototype.styleSheetChanged):

        (WebInspector.CSSDispatcher.prototype.namedFlowCreated):

        (WebInspector.CSSDispatcher.prototype.namedFlowRemoved):

2012-08-06  Sergey Rogulenko  <rogulenko@google.com>

        Web Inspector: a tiny refactoring of Highlighter in InspectorDOMAgent

Source/WebCore/dom/WebKitNamedFlowCollection.cpp

#include "WebKitNamedFlowCollection.h"

#include "Document.h"

34#include "InspectorInstrumentation.h"

#include "WebKitNamedFlow.h"

#include <wtf/text/StringHash.h>

@@PassRefPtr<WebKitNamedFlow> WebKitNamedFlowCollection::ensureFlowWithName(const

    RefPtr<WebKitNamedFlow> newFlow = WebKitNamedFlow::create(this, flowName);

    m_namedFlows.add(newFlow.get());

83 InspectorInstrumentation::didCreateNamedFlow(m_document, newFlow->name());

84

    return newFlow.release();

}

@@void WebKitNamedFlowCollection::discardNamedFlow(WebKitNamedFlow* namedFlow)

    ASSERT(m_namedFlows.contains(namedFlow));

    m_namedFlows.remove(namedFlow);

98

99 InspectorInstrumentation::didRemoveNamedFlow(m_document, namedFlow->name());

}

void WebKitNamedFlowCollection::documentDestroyed()

Source/WebCore/inspector/Inspector.json

                    { "name": "styleSheetId", "$ref": "StyleSheetId" }

                ],

                "description": "Fired whenever a stylesheet is changed as a result of the client operation."

            },

            {

                "name": "namedFlowCreated",

                "parameters": [

                    { "name": "nodeId", "$ref": "DOM.NodeId", "description": "The document node id." },

                    { "name": "namedFlow", "type": "string", "description": "Identifier of the new Named Flow." }

                ],

                "description": "Fires when a Named Flow is created.",

                "hidden": true

            },

            {

                "name": "namedFlowRemoved",

                "parameters": [

                    { "name": "nodeId", "$ref": "DOM.NodeId", "description": "The document node id." },

                    { "name": "namedFlow", "type": "string", "description": "Identifier of the removed Named Flow." }

                ],

                "description": "Fires when a Named Flow is removed: has no associated content nodes and regions.",

                "hidden": true

Source/WebCore/inspector/InspectorCSSAgent.cpp

@@void InspectorCSSAgent::reset()

    m_cssStyleSheetToInspectorStyleSheet.clear();

    m_nodeToInspectorStyleSheet.clear();

    m_documentToInspectorStyleSheet.clear();

519 m_namedFlowCollectionsRequested.clear();

    resetPseudoStates();

}

@@void InspectorCSSAgent::mediaQueryResultChanged()

        m_frontend->mediaQueryResultChanged();

}

void InspectorCSSAgent::didCreateNamedFlow(Document* document, const AtomicString& name)

{

    int nodeId = m_domAgent->boundNodeId(document);

    if (!nodeId || !m_namedFlowCollectionsRequested.contains(nodeId))

        return;

    m_frontend->namedFlowCreated(nodeId, name.string());

}

void InspectorCSSAgent::didRemoveNamedFlow(Document* document, const AtomicString& name)

{

    int nodeId = m_domAgent->boundNodeId(document);

    if (!nodeId || !m_namedFlowCollectionsRequested.contains(nodeId))

        return;

    m_frontend->namedFlowRemoved(nodeId, name.string());

}

bool InspectorCSSAgent::forcePseudoState(Element* element, CSSSelector::PseudoType pseudoType)

{

    if (m_nodeIdToForcedPseudoState.isEmpty())

@@void InspectorCSSAgent::getNamedFlowCollection(ErrorString* errorString, int nod

    if (!document)

        return;

833 m_namedFlowCollectionsRequested.add(nodeId);

834

    Vector<String> namedFlowsVector = document->namedFlows()->namedFlowsNames();

    RefPtr<TypeBuilder::Array<String> > namedFlows = TypeBuilder::Array<String>::create();

Source/WebCore/inspector/InspectorCSSAgent.h

#include "SecurityContext.h"

#include <wtf/HashMap.h>

39#include <wtf/HashSet.h>

#include <wtf/PassRefPtr.h>

#include <wtf/RefPtr.h>

@@public:

    virtual void disable(ErrorString*);

    void reset();

    void mediaQueryResultChanged();

101 void didCreateNamedFlow(Document*, const AtomicString& name);

102 void didRemoveNamedFlow(Document*, const AtomicString& name);

    virtual void getComputedStyleForNode(ErrorString*, int nodeId, const RefPtr<InspectorArray>* forcedPseudoClasses, RefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty> >&);

    virtual void getInlineStylesForNode(ErrorString*, int nodeId, RefPtr<TypeBuilder::CSS::CSSStyle>& inlineStyle, RefPtr<TypeBuilder::CSS::CSSStyle>& attributes);

@@private:

    NodeToInspectorStyleSheet m_nodeToInspectorStyleSheet;

    DocumentToViaInspectorStyleSheet m_documentToInspectorStyleSheet;

    NodeIdToForcedPseudoState m_nodeIdToForcedPseudoState;

175 HashSet<int> m_namedFlowCollectionsRequested;

    int m_lastStyleSheetId;

Source/WebCore/inspector/InspectorInstrumentation.cpp

@@void InspectorInstrumentation::willPopShadowRootImpl(InstrumentingAgents* instru

        domAgent->willPopShadowRoot(host, root);

}

void InspectorInstrumentation::didCreateNamedFlowImpl(InstrumentingAgents* instrumentingAgents, Document* document, const AtomicString& name)

{

    if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())

        cssAgent->didCreateNamedFlow(document, name);

}

void InspectorInstrumentation::didRemoveNamedFlowImpl(InstrumentingAgents* instrumentingAgents, Document* document, const AtomicString& name)

{

    if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())

        cssAgent->didRemoveNamedFlow(document, name);

}

void InspectorInstrumentation::mouseDidMoveOverElementImpl(InstrumentingAgents* instrumentingAgents, const HitTestResult& result, unsigned modifierFlags)

{

    if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())

Source/WebCore/inspector/InspectorInstrumentation.h

@@public:

    static void mediaQueryResultChanged(Document*);

    static void didPushShadowRoot(Element* host, ShadowRoot*);

    static void willPopShadowRoot(Element* host, ShadowRoot*);

116 static void didCreateNamedFlow(Document*, const AtomicString& name);

117 static void didRemoveNamedFlow(Document*, const AtomicString& name);

    static void mouseDidMoveOverElement(Page*, const HitTestResult&, unsigned modifierFlags);

    static bool handleMousePress(Page*);

@@private:

    static void mediaQueryResultChangedImpl(InstrumentingAgents*);

    static void didPushShadowRootImpl(InstrumentingAgents*, Element* host, ShadowRoot*);

    static void willPopShadowRootImpl(InstrumentingAgents*, Element* host, ShadowRoot*);

295 static void didCreateNamedFlowImpl(InstrumentingAgents*, Document*, const AtomicString& name);

296 static void didRemoveNamedFlowImpl(InstrumentingAgents*, Document*, const AtomicString& name);

    static void mouseDidMoveOverElementImpl(InstrumentingAgents*, const HitTestResult&, unsigned modifierFlags);

    static bool handleMousePressImpl(InstrumentingAgents*);

@@inline void InspectorInstrumentation::willPopShadowRoot(Element* host, ShadowRoo

#endif

}

inline void InspectorInstrumentation::didCreateNamedFlow(Document* document, const AtomicString& name)

{

#if ENABLE(INSPECTOR)

    FAST_RETURN_IF_NO_FRONTENDS(void());

    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))

        didCreateNamedFlowImpl(instrumentingAgents, document, name);

#endif

}

inline void InspectorInstrumentation::didRemoveNamedFlow(Document* document, const AtomicString& name)

{

#if ENABLE(INSPECTOR)

    FAST_RETURN_IF_NO_FRONTENDS(void());

    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))

        didRemoveNamedFlowImpl(instrumentingAgents, document, name);

#endif

}

inline void InspectorInstrumentation::mouseDidMoveOverElement(Page* page, const HitTestResult& result, unsigned modifierFlags)

{

#if ENABLE(INSPECTOR)

Source/WebCore/inspector/front-end/CSSStyleModel.js

@@WebInspector.CSSStyleModel.parseRuleArrayPayload = function(ruleArray)

WebInspector.CSSStyleModel.Events = {

    StyleSheetChanged: "StyleSheetChanged",

59 MediaQueryResultChanged: "MediaQueryResultChanged"

    MediaQueryResultChanged: "MediaQueryResultChanged",

    NamedFlowCreated: "NamedFlowCreated",

    NamedFlowRemoved: "NamedFlowRemoved"

}

WebInspector.CSSStyleModel.prototype = {

@@WebInspector.CSSStyleModel.prototype = {

    },

    /**

     * @param {DOMAgent.NodeId} documentNodeId

     * @param {string} name

     */

    _namedFlowCreated: function(documentNodeId, name)

    {

        if (!this.hasEventListeners(WebInspector.CSSStyleModel.Events.NamedFlowCreated))

            return;

        /**

        * @param {WebInspector.DOMDocument} root

        */

        function callback(root)

        {

            // FIXME: At the moment we only want support for NamedFlows in the main document

            if (documentNodeId !== root.id)

                return;

            this.dispatchEventToListeners(WebInspector.CSSStyleModel.Events.NamedFlowCreated, { documentNodeId: documentNodeId, name: name });

        }

        WebInspector.domAgent.requestDocument(callback.bind(this));

    },

    /**

     * @param {DOMAgent.NodeId} documentNodeId

     * @param {string} name

     */

    _namedFlowRemoved: function(documentNodeId, name)

    {

        if (!this.hasEventListeners(WebInspector.CSSStyleModel.Events.NamedFlowRemoved))

            return;

        /**

        * @param {WebInspector.DOMDocument} root

        */

        function callback(root)

        {

            // FIXME: At the moment we only want support for NamedFlows in the main document

            if (documentNodeId !== root.id)

                return;

            this.dispatchEventToListeners(WebInspector.CSSStyleModel.Events.NamedFlowRemoved, { documentNodeId: documentNodeId, name: name });

        }

        WebInspector.domAgent.requestDocument(callback.bind(this));

    },

    /**

     * @param {CSSAgent.StyleSheetId} styleSheetId

     * @param {string} newText

     * @param {boolean} majorChange

@@WebInspector.CSSDispatcher.prototype = {

    styleSheetChanged: function(styleSheetId)

    {

        this._cssModel._fireStyleSheetChanged(styleSheetId);

    },

    /**

     * @param {DOMAgent.NodeId} documentNodeId

     * @param {string} name

     */

    namedFlowCreated: function(documentNodeId, name)

    {

        this._cssModel._namedFlowCreated(documentNodeId, name);

    },

    /**

     * @param {DOMAgent.NodeId} documentNodeId

     * @param {string} name

     */

    namedFlowRemoved: function(documentNodeId, name)

    {

        this._cssModel._namedFlowRemoved(documentNodeId, name);

    }

}