Changeset 145342 in webkit

Timestamp:

Mar 11, 2013 12:16:56 AM (11 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: [Elements] XSLT transformation result from the xml-stylesheet PI not rendered
​https://bugs.webkit.org/show_bug.cgi?id=111313

Reviewed by Vsevolod Vlasov.

Source/WebCore:

Frame document update upon XSL transformation was never instrumented.
This change instruments the Document::applyXSLTransform() method to that end.

Test: http/tests/inspector/styles/xsl-transformed.xml

• dom/Document.cpp:

(WebCore::Document::applyXSLTransform): Instrumented.

• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::frameDocumentUpdated): Invoked upon applyXSLTransform().

• inspector/InspectorDOMAgent.h:
• inspector/InspectorInstrumentation.cpp:

(WebCore::InspectorInstrumentation::frameDocumentUpdatedImpl): Added.

• inspector/InspectorInstrumentation.h:

(WebCore::InspectorInstrumentation::didCommitLoad): Drive-by: simplified.
(WebCore::InspectorInstrumentation::frameDocumentUpdated): Added.

LayoutTests:

• http/tests/inspector/styles/resources/xsl-transformed.xsl: Added.
• http/tests/inspector/styles/xsl-transformed-expected.txt: Added.
• http/tests/inspector/styles/xsl-transformed.xml: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/styles/resources/xsl-transformed.xsl (added)
• LayoutTests/http/tests/inspector/styles/xsl-transformed-expected.txt (added)
• LayoutTests/http/tests/inspector/styles/xsl-transformed.xml (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorDOMAgent.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorDOMAgent.h (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-07  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [Elements] XSLT transformation result from the xml-stylesheet PI not rendered
+        https://bugs.webkit.org/show_bug.cgi?id=111313
+
+        Reviewed by Vsevolod Vlasov.
+
+        * http/tests/inspector/styles/resources/xsl-transformed.xsl: Added.
+        * http/tests/inspector/styles/xsl-transformed-expected.txt: Added.
+        * http/tests/inspector/styles/xsl-transformed.xml: Added.
+
 2013-03-10  Matt Falkenhagen  <falken@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-07  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [Elements] XSLT transformation result from the xml-stylesheet PI not rendered
+        https://bugs.webkit.org/show_bug.cgi?id=111313
+
+        Reviewed by Vsevolod Vlasov.
+
+        Frame document update upon XSL transformation was never instrumented.
+        This change instruments the Document::applyXSLTransform() method to that end.
+
+        Test: http/tests/inspector/styles/xsl-transformed.xml
+
+        * dom/Document.cpp:
+        (WebCore::Document::applyXSLTransform): Instrumented.
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::frameDocumentUpdated): Invoked upon applyXSLTransform().
+        * inspector/InspectorDOMAgent.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::frameDocumentUpdatedImpl): Added.
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::didCommitLoad): Drive-by: simplified.
+        (WebCore::InspectorInstrumentation::frameDocumentUpdated): Added.
+
 2013-03-10  Matt Falkenhagen  <falken@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4242 +4242 @@
         return;
     // FIXME: If the transform failed we should probably report an error (like Mozilla does).
-    processor->createDocumentFromSource(newSource, resultEncoding, resultMIMEType, this, frame());
+    Frame* ownerFrame = frame();
+    processor->createDocumentFromSource(newSource, resultEncoding, resultMIMEType, this, ownerFrame);
+    InspectorInstrumentation::frameDocumentUpdated(ownerFrame);
 }
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1673 +1673 @@
 }
 
+void InspectorDOMAgent::frameDocumentUpdated(Frame* frame)
+{
+    Document* document = frame->document();
+    if (!document)
+        return;
+
+    Page* page = frame->page();
+    ASSERT(page);
+    if (frame != page->mainFrame())
+        return;
+
+    // Only update the main frame document, nested frame document updates are not required
+    // (will be handled by loadEventFired()).
+    setDocument(document);
+}
+
 Node* InspectorDOMAgent::nodeForPath(const String& path)
 {

trunk/Source/WebCore/inspector/InspectorDOMAgent.h

@@ -172 +172 @@
     void didPushShadowRoot(Element* host, ShadowRoot*);
     void willPopShadowRoot(Element* host, ShadowRoot*);
+    void frameDocumentUpdated(Frame*);
 
     int pushNodeToFrontend(ErrorString*, int documentNodeId, Node*);

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -938 +938 @@
 }
 
+void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
+{
+    InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
+    if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
+        return;
+
+    if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
+        domAgent->frameDocumentUpdated(frame);
+}
+
 void InspectorInstrumentation::loaderDetachedFromFrameImpl(InstrumentingAgents* instrumentingAgents, DocumentLoader* loader)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -214 +214 @@
     static void frameDetachedFromParent(Frame*);
     static void didCommitLoad(Frame*, DocumentLoader*);
+    static void frameDocumentUpdated(Frame*);
     static void loaderDetachedFromFrame(Frame*, DocumentLoader*);
     static void frameStartedLoading(Frame*);
@@ -416 +417 @@
     static void frameDetachedFromParentImpl(InstrumentingAgents*, Frame*);
     static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*);
+    static void frameDocumentUpdatedImpl(InstrumentingAgents*, Frame*);
     static void loaderDetachedFromFrameImpl(InstrumentingAgents*, DocumentLoader*);
     static void frameStartedLoadingImpl(InstrumentingAgents*, Frame*);
@@ -1642 +1644 @@
 {
 #if ENABLE(INSPECTOR)
-    if (!frame)
-        return;
-    Page* page = frame->page();
-    if (!page)
-        return;
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        didCommitLoadImpl(instrumentingAgents, page, loader);
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
+        didCommitLoadImpl(instrumentingAgents, frame->page(), loader);
 #else
     UNUSED_PARAM(frame);
     UNUSED_PARAM(loader);
+#endif
+}
+
+inline void InspectorInstrumentation::frameDocumentUpdated(Frame* frame)
+{
+#if ENABLE(INSPECTOR)
+    FAST_RETURN_IF_NO_FRONTENDS(void());
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
+        frameDocumentUpdatedImpl(instrumentingAgents, frame);
+#else
+    UNUSED_PARAM(frame);
 #endif
 }