[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 11:33:24 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit e77a48d9583f0b83e548a9ff7f6aad4cc4e54be5
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 09:05:33 2010 +0000

    2010-07-27  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Inspector should display CDATA section data
            https://bugs.webkit.org/show_bug.cgi?id=16259
    
            WebCore:
            * inspector/InspectorDOMAgent.cpp:
            (WebCore::InspectorDOMAgent::buildObjectForNode):
            * inspector/front-end/ElementsTreeOutline.js:
            ():
    
            LayoutTests:
            * inspector/elements-panel-xhtml-structure-expected.txt:
            * inspector/elements-panel-xhtml-structure.xhtml:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64267 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a342732..7882432 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-27  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Inspector should display CDATA section data
+        https://bugs.webkit.org/show_bug.cgi?id=16259
+
+        * inspector/elements-panel-xhtml-structure-expected.txt:
+        * inspector/elements-panel-xhtml-structure.xhtml:
+
 2010-07-29  Alex Nicolaou  <anicolao at chromium.org>
 
         Reviewed by Dirk Schulze.
diff --git a/LayoutTests/inspector/elements-panel-xhtml-structure-expected.txt b/LayoutTests/inspector/elements-panel-xhtml-structure-expected.txt
index 8ec5093..7c07093 100644
--- a/LayoutTests/inspector/elements-panel-xhtml-structure-expected.txt
+++ b/LayoutTests/inspector/elements-panel-xhtml-structure-expected.txt
@@ -3,7 +3,7 @@ Tests that elements panel shows XML dom tree structure with closing tags for all
 Paragraph BR test
 Next line
 
-
+ 
 application/xhtml+xml 
 <HTML xmlns="http://www.w3.org/1999/xhtml">
 <Head>…
@@ -17,6 +17,7 @@ application/xhtml+xml
 <br>
 </br>"Next line"
 </p>
+<![CDATA[ CData Content ]]>
 <img alt="Random Image">
 </img>
 <pre id="outputPre">
diff --git a/LayoutTests/inspector/elements-panel-xhtml-structure.xhtml b/LayoutTests/inspector/elements-panel-xhtml-structure.xhtml
index 6ef668f..d5f0491 100644
--- a/LayoutTests/inspector/elements-panel-xhtml-structure.xhtml
+++ b/LayoutTests/inspector/elements-panel-xhtml-structure.xhtml
@@ -111,6 +111,7 @@ Tests that elements panel shows XML dom tree structure with closing tags for all
 <hr></hr>
 <p>Paragraph BR test<br/>Next line
 </p>
+<![CDATA[ CData Content ]]>
 
 <img alt="Random Image"></img>
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3755218..0596a4d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-27  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Inspector should display CDATA section data
+        https://bugs.webkit.org/show_bug.cgi?id=16259
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::buildObjectForNode):
+        * inspector/front-end/ElementsTreeOutline.js:
+        ():
+
 2010-07-28  Kavita Kanetkar  <kkanetkar at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 3a14830..ad40464 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -774,6 +774,7 @@ PassRefPtr<InspectorObject> InspectorDOMAgent::buildObjectForNode(Node* node, in
     switch (node->nodeType()) {
         case Node::TEXT_NODE:
         case Node::COMMENT_NODE:
+        case Node::CDATA_SECTION_NODE:
             nodeValue = node->nodeValue();
             break;
         case Node::ATTRIBUTE_NODE:
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index 7247ba0..3cd22ae 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -1320,6 +1320,10 @@ WebInspector.ElementsTreeElement.prototype = {
                     info.title += " [" + node.internalSubset + "]";
                 info.title += "&gt;</span>";
                 break;
+
+            case Node.CDATA_SECTION_NODE:
+                info.title = "<span class=\"webkit-html-text-node\">&lt;![CDATA[" + node.nodeValue.escapeHTML() + "]]&gt;</span>";
+                break;
             default:
                 info.title = this.treeOutline.nodeNameToCorrectCase(node.nodeName).collapseWhitespace().escapeHTML();
         }

-- 
WebKit Debian packaging

