Changeset 56974 in webkit

Timestamp:

Apr 1, 2010 11:34:28 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-01 MORITA Hajime <​morrita@google.com>

Reviewed by Darin Adler.

setting document.title doesn't change document.title value
​https://bugs.webkit.org/show_bug.cgi?id=36802

• fast/dom/Document/script-tests/title-with-multiple-children.js: Added.
• fast/dom/Document/title-with-multiple-children-expected.txt: Added.
• fast/dom/Document/title-with-multiple-children.html: Added.

2010-04-01 MORITA Hajime <​morrita@google.com>

Reviewed by Darin Adler.

setting document.title doesn't change document.title value
​https://bugs.webkit.org/show_bug.cgi?id=36802

An entity of "value" argument on HTMLTitleElement::setTitle() could be
Document::m_title and be changed during HTMLTitleElement::setText().
Fix copying the argument to keep the original value.

Test: fast/dom/Document/title-with-multiple-children.html

• html/HTMLTitleElement.cpp: (WebCore::HTMLTitleElement::setText):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Document/script-tests/title-with-multiple-children.js (added)
• LayoutTests/fast/dom/Document/title-with-multiple-children-expected.txt (added)
• LayoutTests/fast/dom/Document/title-with-multiple-children.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLTitleElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-01  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Darin Adler.
+
+        setting document.title doesn't change document.title value 
+        https://bugs.webkit.org/show_bug.cgi?id=36802
+
+        * fast/dom/Document/script-tests/title-with-multiple-children.js: Added.
+        * fast/dom/Document/title-with-multiple-children-expected.txt: Added.
+        * fast/dom/Document/title-with-multiple-children.html: Added.
+
 2010-04-01  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-01  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Darin Adler.
+
+        setting document.title doesn't change document.title value 
+        https://bugs.webkit.org/show_bug.cgi?id=36802
+
+        An entity of "value" argument on HTMLTitleElement::setTitle() could be
+        Document::m_title and be changed during HTMLTitleElement::setText(). 
+        Fix copying the argument to keep the original value.
+        
+        Test: fast/dom/Document/title-with-multiple-children.html
+
+        * html/HTMLTitleElement.cpp:
+        (WebCore::HTMLTitleElement::setText):
+
 2010-04-01  Luiz Agostini  <luiz.agostini@openbossa.org>
 

trunk/WebCore/html/HTMLTitleElement.cpp

@@ -85 +85 @@
         static_cast<Text*>(firstChild())->setData(value, ec);
     else {  
+        // We make a copy here because entity of "value" argument can be Document::m_title,
+        // which goes empty during removeChildren() invocation below,
+        // which causes HTMLTitleElement::childrenChanged(), which ends up Document::setTitle().
+        String valueCopy(value);
+
         if (numChildren > 0)
             removeChildren();
-    
-        appendChild(document()->createTextNode(value.impl()), ec);
+
+        appendChild(document()->createTextNode(valueCopy.impl()), ec);
     }
 }