[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
eric at webkit.org
eric at webkit.org
Wed Feb 10 22:18:17 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 022bf6604c63ec0aca772b470ef2b9a30c600b54
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Feb 7 12:52:21 2010 +0000
2010-02-07 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: Fragment-held Elements Not Shown in Inspector.
https://bugs.webkit.org/show_bug.cgi?id=34680
* inspector/console-dirxml-expected.txt:
* inspector/console-dirxml.html:
2010-02-07 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: Fragment-held Elements Not Shown in Inspector.
https://bugs.webkit.org/show_bug.cgi?id=34680
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::pushChildNodesToFrontend):
(WebCore::InspectorDOMAgent::buildObjectForNode):
* inspector/front-end/ElementsTreeOutline.js:
(WebInspector.ElementsTreeElement.prototype._nodeTitleInfo):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54470 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7a6cdf6..0e47d49 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-07 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: Fragment-held Elements Not Shown in Inspector.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34680
+
+ * inspector/console-dirxml-expected.txt:
+ * inspector/console-dirxml.html:
+
2010-02-07 Csaba Osztrogonác <ossy at webkit.org>
Rubber-stamped by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/inspector/console-dirxml-expected.txt b/LayoutTests/inspector/console-dirxml-expected.txt
index b69d2c3..08b450e 100644
--- a/LayoutTests/inspector/console-dirxml-expected.txt
+++ b/LayoutTests/inspector/console-dirxml-expected.txt
@@ -1,5 +1,11 @@
-CONSOLE MESSAGE: line 9: [object HTMLDocument]
+CONSOLE MESSAGE: line 12: [object HTMLDocument]
+CONSOLE MESSAGE: line 13: [object DocumentFragment]
+CONSOLE MESSAGE: line 14: [object HTMLParagraphElement]
+CONSOLE MESSAGE: line 15: [object HTMLParagraphElement]
Tests that console logging dumps proper messages.
-console-dirxml.html:9Document
+console-dirxml.html:12Document
+console-dirxml.html:13Document Fragment
+console-dirxml.html:14<p>
+console-dirxml.html:15[<p>]
diff --git a/LayoutTests/inspector/console-dirxml.html b/LayoutTests/inspector/console-dirxml.html
index 41ff791..c9a8f7f 100755
--- a/LayoutTests/inspector/console-dirxml.html
+++ b/LayoutTests/inspector/console-dirxml.html
@@ -6,7 +6,13 @@
function doit()
{
+ var fragment = document.createDocumentFragment();
+ fragment.appendChild(document.createElement("p"));
+
console.dirxml(document);
+ console.dirxml(fragment);
+ console.dirxml(fragment.firstChild);
+ console.log([fragment.firstChild]);
dumpConsoleMessages();
}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 334bc77..5f491f5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-07 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: Fragment-held Elements Not Shown in Inspector.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34680
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::pushChildNodesToFrontend):
+ (WebCore::InspectorDOMAgent::buildObjectForNode):
+ * inspector/front-end/ElementsTreeOutline.js:
+ (WebInspector.ElementsTreeElement.prototype._nodeTitleInfo):
+
2010-02-07 Jian Li <jianli at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 8b0b6f8..0387f30 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -204,7 +204,7 @@ bool InspectorDOMAgent::pushDocumentToFrontend()
void InspectorDOMAgent::pushChildNodesToFrontend(long nodeId)
{
Node* node = nodeForId(nodeId);
- if (!node || (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE))
+ if (!node || (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE && node->nodeType() != Node::DOCUMENT_FRAGMENT_NODE))
return;
if (m_childrenRequested.contains(nodeId))
return;
@@ -464,7 +464,7 @@ ScriptObject InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeTo
value.set("localName", localName);
value.set("nodeValue", nodeValue);
- if (node->nodeType() == Node::ELEMENT_NODE || node->nodeType() == Node::DOCUMENT_NODE) {
+ if (node->nodeType() == Node::ELEMENT_NODE || node->nodeType() == Node::DOCUMENT_NODE || node->nodeType() == Node::DOCUMENT_FRAGMENT_NODE) {
int nodeCount = innerChildNodeCount(node);
value.set("childNodeCount", nodeCount);
ScriptArray children = buildArrayForContainerChildren(node, depth, nodesMap);
@@ -478,7 +478,7 @@ ScriptObject InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeTo
HTMLFrameOwnerElement* frameOwner = static_cast<HTMLFrameOwnerElement*>(node);
value.set("documentURL", documentURLString(frameOwner->contentDocument()));
}
- } else {
+ } else if (node->nodeType() == Node::DOCUMENT_NODE) {
Document* document = static_cast<Document*>(node);
value.set("documentURL", documentURLString(document));
}
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index 8d8d5db..4a8dae0 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -925,6 +925,10 @@ WebInspector.ElementsTreeElement.prototype = {
info.title = "Document";
break;
+ case Node.DOCUMENT_FRAGMENT_NODE:
+ info.title = "Document Fragment";
+ break;
+
case Node.ELEMENT_NODE:
info.title = "<span class=\"webkit-html-tag\"><" + node.nodeName.toLowerCase().escapeHTML();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list