git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: be303c4)
Reviewed by Chris.
authormjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 28 Aug 2004 00:31:08 +0000 (00:31 +0000)
committermjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 28 Aug 2004 00:31:08 +0000 (00:31 +0000)
- fixed <rdar://problem/3778043> REGRESSION: innerHTML is broken, breaks automated iBench testing
- also fixed outerHTML, which would spill over past the node for whch it was supposed to get HTML

        * khtml/html/html_elementimpl.cpp:
        (HTMLElementImpl::outerHTML):
        * khtml/xml/dom2_rangeimpl.cpp:
        (DOM::RangeImpl::toHTML):
        * khtml/xml/dom_nodeimpl.cpp:
        (NodeImpl::toHTML):
        (NodeImpl::recursive_toString):
        (NodeImpl::recursive_toHTML):
        * khtml/xml/dom_nodeimpl.h:
        * kwq/WebCoreBridge.mm:
        (-[WebCoreBridge markupStringFromNode:nodes:]):

- added new layout tests to cover the problems I fixed

* layout-tests/fast/innerHTML/001-expected.txt: Added.
        * layout-tests/fast/innerHTML/001.html: Added.
        * layout-tests/fast/innerHTML/002-expected.txt: Added.
        * layout-tests/fast/innerHTML/002.html: Added.
        * layout-tests/fast/innerHTML/003-expected.txt: Added.
        * layout-tests/fast/innerHTML/003.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7396 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
LayoutTests/fast/innerHTML/001-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/innerHTML/001.html [new file with mode: 0644] patch | blob
LayoutTests/fast/innerHTML/002-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/innerHTML/002.html [new file with mode: 0644] patch | blob
LayoutTests/fast/innerHTML/003-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/innerHTML/003.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog-2005-08-23 patch | blob | history
WebCore/khtml/html/html_elementimpl.cpp patch | blob | history
WebCore/khtml/xml/dom2_rangeimpl.cpp patch | blob | history
WebCore/khtml/xml/dom_nodeimpl.cpp patch | blob | history
WebCore/khtml/xml/dom_nodeimpl.h patch | blob | history
WebCore/kwq/WebCoreBridge.mm patch | blob | history

diff --git a/LayoutTests/fast/innerHTML/001-expected.txt b/LayoutTests/fast/innerHTML/001-expected.txt
new file mode 100644 (file)
index 0000000..1215ca5
--- /dev/null
+++ b/LayoutTests/fast/innerHTML/001-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 784x18
+        RenderText {TEXT} at (0,0) size 191x18
+          text run at (0,0) width 191: "this text should show up twice"
+      RenderBlock {DIV} at (0,18) size 784x18
+        RenderText {TEXT} at (0,0) size 191x18
+          text run at (0,0) width 191: "this text should show up twice"
diff --git a/LayoutTests/fast/innerHTML/001.html b/LayoutTests/fast/innerHTML/001.html
new file mode 100644 (file)
index 0000000..eb51913
--- /dev/null
+++ b/LayoutTests/fast/innerHTML/001.html
@@ -0,0 +1,10 @@
+<html>
+<body>
+<div id="x">this text should show up twice</div>
+<div id="y"></div>
+<script language="JavaScript">
+document.getElementById("y").innerHTML = document.getElementById("x").innerHTML;
+</script>
+</body>
+</html>
+
diff --git a/LayoutTests/fast/innerHTML/002-expected.txt b/LayoutTests/fast/innerHTML/002-expected.txt
new file mode 100644 (file)
index 0000000..5b417de
--- /dev/null
+++ b/LayoutTests/fast/innerHTML/002-expected.txt
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 784x18
+        RenderInline {B} at (0,0) size 230x18
+          RenderText {TEXT} at (0,0) size 230x18
+            text run at (0,0) width 230: "this text should be bold both times"
+      RenderBlock {DIV} at (0,18) size 784x18
+        RenderInline {B} at (0,0) size 230x18
+          RenderText {TEXT} at (0,0) size 230x18
+            text run at (0,0) width 230: "this text should be bold both times"
diff --git a/LayoutTests/fast/innerHTML/002.html b/LayoutTests/fast/innerHTML/002.html
new file mode 100644 (file)
index 0000000..275b490
--- /dev/null
+++ b/LayoutTests/fast/innerHTML/002.html
@@ -0,0 +1,10 @@
+<html>
+<body>
+<div id="x"><b>this text should be bold both times</b></div>
+<div id="y"></div>
+<script language="JavaScript">
+document.getElementById("y").innerHTML = document.getElementById("x").innerHTML;
+</script>
+</body>
+</html>
+
diff --git a/LayoutTests/fast/innerHTML/003-expected.txt b/LayoutTests/fast/innerHTML/003-expected.txt
new file mode 100644 (file)
index 0000000..620cd92
--- /dev/null
+++ b/LayoutTests/fast/innerHTML/003-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 784x18
+        RenderText {TEXT} at (0,0) size 191x18
+          text run at (0,0) width 191: "this text should show up twice"
+      RenderBlock {DIV} at (0,18) size 784x18
+        RenderBlock {DIV} at (0,0) size 784x18
+          RenderText {TEXT} at (0,0) size 191x18
+            text run at (0,0) width 191: "this text should show up twice"
+      RenderBlock {DIV} at (0,36) size 784x18
+        RenderText {TEXT} at (0,0) size 187x18
+          text run at (0,0) width 187: "this text should show up once"
diff --git a/LayoutTests/fast/innerHTML/003.html b/LayoutTests/fast/innerHTML/003.html
new file mode 100644 (file)
index 0000000..daff18c
--- /dev/null
+++ b/LayoutTests/fast/innerHTML/003.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<div id="x">this text should show up twice</div>
+<div id="y"></div>
+<div>this text should show up once</div>
+<script language="JavaScript">
+document.getElementById("y").innerHTML = document.getElementById("x").outerHTML;
+</script>
+</body>
+</html>
+
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2e24eb1b055f28fde0a239b57aa73c3b76d34eac..e5ed944d536139ca852d68564e0bc0ec379a1bd4 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,31 @@
+2004-08-27  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Chris.
+
+       - fixed <rdar://problem/3778043> REGRESSION: innerHTML is broken, breaks automated iBench testing
+       - also fixed outerHTML, which would spill over past the node for whch it was supposed to get HTML
+       
+        * khtml/html/html_elementimpl.cpp:
+        (HTMLElementImpl::outerHTML):
+        * khtml/xml/dom2_rangeimpl.cpp:
+        (DOM::RangeImpl::toHTML):
+        * khtml/xml/dom_nodeimpl.cpp:
+        (NodeImpl::toHTML):
+        (NodeImpl::recursive_toString):
+        (NodeImpl::recursive_toHTML):
+        * khtml/xml/dom_nodeimpl.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge markupStringFromNode:nodes:]):
+
+       - added new layout tests to cover the problems I fixed
+        
+       * layout-tests/fast/innerHTML/001-expected.txt: Added.
+        * layout-tests/fast/innerHTML/001.html: Added.
+        * layout-tests/fast/innerHTML/002-expected.txt: Added.
+        * layout-tests/fast/innerHTML/002.html: Added.
+        * layout-tests/fast/innerHTML/003-expected.txt: Added.
+        * layout-tests/fast/innerHTML/003.html: Added.
+
 2004-08-27  David Hyatt  <hyatt@apple.com>
 
        Fix for 3739239, getComputedStyle of top not being implemented broke a site that checked for it.
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 8da433f55cdc3c3cca95ac1c638e2025010d17f8..bf668b0efa7ca5eda17093bf648b2b5dc38ef592 100644 (file)
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -698,7 +698,7 @@ DOMString HTMLElementImpl::innerHTML() const
 
 DOMString HTMLElementImpl::outerHTML() const
 {
-    return recursive_toHTML(true);
+    return recursive_toHTML();
 }
 
 DOMString HTMLElementImpl::innerText() const
diff --git a/WebCore/khtml/xml/dom2_rangeimpl.cpp b/WebCore/khtml/xml/dom2_rangeimpl.cpp
index 4248777a8e635af00db8283d42801b21eaaaa59e..27f582844f740d0f87fdf9958f490cce5c71dc61 100644 (file)
--- a/WebCore/khtml/xml/dom2_rangeimpl.cpp
+++ b/WebCore/khtml/xml/dom2_rangeimpl.cpp
@@ -850,7 +850,7 @@ DOMString RangeImpl::toHTML(QPtrList<NodeImpl> *nodes)
     }
     NodeImpl::Id id = commonAncestor->id();
     bool onlyIncludeChildren = (id != ID_TABLE && id != ID_OL && id != ID_UL);
-    return commonAncestor->recursive_toHTML(onlyIncludeChildren, this, nodes);
+    return commonAncestor->recursive_toHTML(onlyIncludeChildren, true, this, nodes);
 }
 
 DOMString RangeImpl::text() const
diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index dd3452bb4c096c9c3e009ca98c2c72b05aecbc66..4d15094eed8a402d8cd2a0699a2b51d4d8d0828a 100644 (file)
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -254,11 +254,7 @@ NodeImpl *NodeImpl::addChild(NodeImpl *)
 
 QString NodeImpl::toHTML() const
 {
-    NodeImpl* fc = firstChild();
-    if ( fc )
-        return fc->recursive_toHTML(true);
-
-    return "";
+    return recursive_toHTML(true);
 }
 
 static QString escapeHTML( const QString& in )
@@ -283,12 +279,12 @@ static QString escapeHTML( const QString& in )
     return s;
 }
 
-QString NodeImpl::recursive_toString(const NodeImpl *startNode, bool onlyIncludeChildren, const DOM::RangeImpl *range, QPtrList<NodeImpl> *nodes)
+QString NodeImpl::recursive_toString(const NodeImpl *startNode, bool onlyIncludeChildren, bool includeSiblings, const DOM::RangeImpl *range, QPtrList<NodeImpl> *nodes)
 
 {
     QString me = "";
 
-    for (const NodeImpl *current = startNode; current != NULL; current = current->nextSibling()) {
+    for (const NodeImpl *current = startNode; current != NULL; current = includeSiblings ? current->nextSibling() : NULL) {
         bool include = true;
         if (onlyIncludeChildren) {
             // Don't include the HTML of this node, but include the children in the next recursion.
@@ -348,7 +344,7 @@ QString NodeImpl::recursive_toString(const NodeImpl *startNode, bool onlyInclude
         if (!current->isHTMLElement() || endTag[current->id()] != FORBIDDEN) {
             // print children
             if (NodeImpl *n = current->firstChild()) {
-                me += recursive_toString(n, false, range, nodes);
+                me += recursive_toString(n, false, true, range, nodes);
             }
             // Print my ending tag
             if (include && current->nodeType() != Node::TEXT_NODE && current->nodeType() != Node::DOCUMENT_NODE) {
@@ -364,9 +360,9 @@ QString NodeImpl::recursive_toString(const NodeImpl *startNode, bool onlyInclude
 
 }
 
-QString NodeImpl::recursive_toHTML(bool onlyIncludeChildren, const DOM::RangeImpl *range, QPtrList<NodeImpl> *nodes) const
+QString NodeImpl::recursive_toHTML(bool onlyIncludeChildren, bool includeSiblings, const DOM::RangeImpl *range, QPtrList<NodeImpl> *nodes) const
 {      
-    return NodeImpl::recursive_toString(this, onlyIncludeChildren, range, nodes);
+    return NodeImpl::recursive_toString(this, onlyIncludeChildren, includeSiblings, range, nodes);
 }
 
 void NodeImpl::recursive_completeURLs(QString baseURL)
diff --git a/WebCore/khtml/xml/dom_nodeimpl.h b/WebCore/khtml/xml/dom_nodeimpl.h
index b65f6c1cec9cda598a4fa17cddcc70e299998c2e..dbb5ab6297d725bb2d3abb9bb66737ea20d49265 100644 (file)
--- a/WebCore/khtml/xml/dom_nodeimpl.h
+++ b/WebCore/khtml/xml/dom_nodeimpl.h
@@ -260,8 +260,8 @@ public:
     
     virtual bool isInline() const;
     virtual QString toHTML() const;
-    QString recursive_toHTML(bool onlyIncludeChildren=false, const DOM::RangeImpl *range=NULL, QPtrList<NodeImpl> *nodes=NULL) const;
-    static QString recursive_toString(const NodeImpl *startNode, bool onlyIncludeChildren=false, const DOM::RangeImpl *range=NULL, QPtrList<NodeImpl> *nodes=NULL);
+    QString recursive_toHTML(bool onlyIncludeChildren=false, bool includeSiblings = false, const DOM::RangeImpl *range=NULL, QPtrList<NodeImpl> *nodes=NULL) const;
+    static QString recursive_toString(const NodeImpl *startNode, bool onlyIncludeChildren, bool includeSiblings, const DOM::RangeImpl *range, QPtrList<NodeImpl> *nodes);
     void recursive_completeURLs(QString baseURL);
     
     virtual bool isContentEditable() const;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index ede632a8043856326748316430b8018e29918b8a..d68a9519bd724abfd7c6197faa11fe8757a91b9a 100644 (file)
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -508,7 +508,7 @@ static bool initializedKJS = FALSE;
     if (nodes) {
         nodeList = new QPtrList<NodeImpl>;
     }
-    NSString *markupString = [node _nodeImpl]->recursive_toHTML(false, NULL, nodeList).getNSString();
+    NSString *markupString = [node _nodeImpl]->recursive_toHTML(false, false, NULL, nodeList).getNSString();
     if (nodes) {
         *nodes = [self nodesFromList:nodeList];
         delete nodeList;
Mirror of the WebKit open source project from svn.webkit.org.