Changeset 26356 in webkit

Timestamp:

Oct 11, 2007, 2:30:54 AM (17 years ago)

Author:

lars

Message:

Ensure that setting innerHTML on an element doesn't do
weird things with the document.
Fixes most issues with ​http://bugs.webkit.org/show_bug.cgi?id=15456

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/innerHTML/innerHTML-changing-document-properties-expected.txt (added)
• LayoutTests/fast/innerHTML/innerHTML-changing-document-properties.xhtml (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/XMLTokenizer.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-10-11  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by Simon, testcase written by Erik.
+
+        Ensure that setting innerHTML on an element doesn't do
+        weird things with the document.
+        Fixes most issues with http://bugs.webkit.org/show_bug.cgi?id=15456
+
+        * fast/innerHTML/innerHTML-changing-document-properties-expected.txt: Added.
+        * fast/innerHTML/innerHTML-changing-document-properties.xhtml: Added.
+
 2007-10-10  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-11  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by Erik Seidel and Simon.
+
+        Ensure that setting innerHTML on an element doesn't do
+        weird things with the document.
+        Fixes most issues with http://bugs.webkit.org/show_bug.cgi?id=15456
+
+        Test: fast/innerHTML/innerHTML-changing-document-properties.xhtml
+
+        * dom/XMLTokenizer.cpp:
+        (WebCore::XMLTokenizer::write):
+        (WebCore::XMLTokenizer::startDocument):
+        (WebCore::XMLTokenizer::end):
+        (WebCore::):
+
 2007-10-10  George Staikos  <staikos@kde.org>
 

trunk/WebCore/dom/XMLTokenizer.cpp

@@ -599 +599 @@
                 String encoding = attrs.get("encoding");
                 ExceptionCode ec = 0;
-                if (!version.isEmpty())
-                    m_doc->setXMLVersion(version, ec);
-                if (!encoding.isEmpty())
-                    m_doc->setXMLEncoding(encoding);
+                if (!m_parsingFragment) {
+                    if (!version.isEmpty())
+                        m_doc->setXMLVersion(version, ec);
+                    if (!encoding.isEmpty())
+                        m_doc->setXMLEncoding(encoding);
+                }
             }
         }
@@ -928 +930 @@
 {
     ExceptionCode ec = 0;
-    
+
     if (version)
         m_doc->setXMLVersion(toString(version), ec);
@@ -1242 +1244 @@
     
     setCurrentNode(0);
-    m_doc->finishedParsing();    
+    if (!m_parsingFragment)
+        m_doc->finishedParsing();    
 }
 
@@ -1716 +1719 @@
     ExceptionCode ec = 0;
 
-    m_doc->setXMLStandalone(m_stream.isStandaloneDocument(), ec);
+    if (!m_parsingFragment)
+        m_doc->setXMLStandalone(m_stream.isStandaloneDocument(), ec);
 }
 
@@ -1978 +1982 @@
         setIsXHTMLDocument(true); // controls if we replace entities or not.
     }
-    m_doc->setDocType(new DocumentType(m_doc, name, publicId, systemId));
-    
-}
-#endif
-}
-
-
+    if (!m_parsingFragment)
+        m_doc->setDocType(new DocumentType(m_doc, name, publicId, systemId));
+    
+}
+#endif
+}
+
+