[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

Tue Jan 5 23:52:41 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 4064e811b819e8048416370c6c0da172099ed90f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 20:53:12 2009 +0000

    2009-12-17  Pavel Feldman  <pfeldman at dhcp-172-28-174-220.spb.corp.google.com>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Incorrect Doctype.
    
            REGRESSION(4.0.4-TOT):Web Inspector: Incorrect Doctype
            https://bugs.webkit.org/show_bug.cgi?id=32671
    
            * inspector/elements-panel-structure-expected.txt:
            * inspector/elements-panel-structure.html:
    2009-12-17  Pavel Feldman  <pfeldman at dhcp-172-28-174-220.spb.corp.google.com>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Incorrect Doctype.
    
            REGRESSION(4.0.4-TOT):Web Inspector: Incorrect Doctype
            https://bugs.webkit.org/show_bug.cgi?id=32671
    
            * inspector/InspectorDOMAgent.cpp:
            (WebCore::InspectorDOMAgent::buildObjectForNode):
            * inspector/front-end/DOMAgent.js:
            (WebInspector.DOMNode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52279 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4305efa..d146492 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-17  Pavel Feldman  <pfeldman at dhcp-172-28-174-220.spb.corp.google.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Incorrect Doctype.
+
+        REGRESSION(4.0.4-TOT):Web Inspector: Incorrect Doctype
+        https://bugs.webkit.org/show_bug.cgi?id=32671
+
+        * inspector/elements-panel-structure-expected.txt:
+        * inspector/elements-panel-structure.html:
+
 2009-12-17  Chris Fleizach  <cfleizach at apple.com>
 
         Unreviewed layout test fix.
diff --git a/LayoutTests/inspector/elements-panel-structure-expected.txt b/LayoutTests/inspector/elements-panel-structure-expected.txt
index 35a054d..76efb25 100644
--- a/LayoutTests/inspector/elements-panel-structure-expected.txt
+++ b/LayoutTests/inspector/elements-panel-structure-expected.txt
@@ -1,6 +1,7 @@
 Tests that elements panel shows dom tree structure.
 
 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 <body onload="onload()">
diff --git a/LayoutTests/inspector/elements-panel-structure.html b/LayoutTests/inspector/elements-panel-structure.html
index 9afc1ce..652d1e1 100755
--- a/LayoutTests/inspector/elements-panel-structure.html
+++ b/LayoutTests/inspector/elements-panel-structure.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 <script src="inspector-test.js"></script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c8799e..29adef7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-17  Pavel Feldman  <pfeldman at dhcp-172-28-174-220.spb.corp.google.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Incorrect Doctype.
+
+        REGRESSION(4.0.4-TOT):Web Inspector: Incorrect Doctype
+        https://bugs.webkit.org/show_bug.cgi?id=32671
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::buildObjectForNode):
+        * inspector/front-end/DOMAgent.js:
+        (WebInspector.DOMNode):
+
 2009-12-17  Benjamin Otte  <otte at gnome.org>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 1aaf309..6a6ca5f 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -39,6 +39,7 @@
 #include "CookieJar.h"
 #include "DOMWindow.h"
 #include "Document.h"
+#include "DocumentType.h"
 #include "Event.h"
 #include "EventListener.h"
 #include "EventNames.h"
@@ -522,6 +523,12 @@ ScriptObject InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeTo
         if (children.length() > 0)
             value.set("children", children);
     }
+    if (node->nodeType() == Node::DOCUMENT_TYPE_NODE) {
+        DocumentType* docType = static_cast<DocumentType*>(node);
+        value.set("publicId", docType->publicId());
+        value.set("systemId", docType->systemId());
+        value.set("internalSubset", docType->internalSubset());
+    }
     return value;
 }
 
diff --git a/WebCore/inspector/front-end/DOMAgent.js b/WebCore/inspector/front-end/DOMAgent.js
index 4ccf843..9900cbb 100644
--- a/WebCore/inspector/front-end/DOMAgent.js
+++ b/WebCore/inspector/front-end/DOMAgent.js
@@ -60,12 +60,16 @@ WebInspector.DOMNode = function(doc, payload) {
     this.style = null;
     this._matchedCSSRules = [];
 
-    if (this.nodeType == Node.ELEMENT_NODE) {
+    if (this.nodeType === Node.ELEMENT_NODE) {
         // HTML and BODY from internal iframes should not overwrite top-level ones.
         if (!this.ownerDocument.documentElement && this.nodeName === "HTML")
             this.ownerDocument.documentElement = this;
         if (!this.ownerDocument.body && this.nodeName === "BODY")
             this.ownerDocument.body = this;
+    } else if (this.nodeType === Node.DOCUMENT_TYPE_NODE) {
+        this.publicId = payload.publicId;
+        this.systemId = payload.systemId;
+        this.internalSubset = payload.internalSubset;
     }
 }
 

-- 
WebKit Debian packaging

