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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b450212a77ce932622bd363727b7c6c1f1bca103
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 22:12:17 2010 +0000

    2010-07-20  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Fix fast/dom/title-content-write-set.html for HTML5 tree builder
            https://bugs.webkit.org/show_bug.cgi?id=42668
    
            When I split parserAppendData from appendData, it was tempting to cut
            the function at dispatchModifiedEvent, but that's not quite right.  We
            still need to notify the parent that it's children have changed.
    
            * dom/CharacterData.cpp:
            (WebCore::CharacterData::appendDataCommon):
            (WebCore::CharacterData::parserAppendData):
            (WebCore::CharacterData::appendData):
            * dom/CharacterData.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0d56de0..7a73a0d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-20  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Fix fast/dom/title-content-write-set.html for HTML5 tree builder
+        https://bugs.webkit.org/show_bug.cgi?id=42668
+
+        When I split parserAppendData from appendData, it was tempting to cut
+        the function at dispatchModifiedEvent, but that's not quite right.  We
+        still need to notify the parent that it's children have changed.
+
+        * dom/CharacterData.cpp:
+        (WebCore::CharacterData::appendDataCommon):
+        (WebCore::CharacterData::parserAppendData):
+        (WebCore::CharacterData::appendData):
+        * dom/CharacterData.h:
+
 2010-07-20  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebCore/dom/CharacterData.cpp b/WebCore/dom/CharacterData.cpp
index 5fbb6f2..408281e 100644
--- a/WebCore/dom/CharacterData.cpp
+++ b/WebCore/dom/CharacterData.cpp
@@ -59,7 +59,7 @@ String CharacterData::substringData(unsigned offset, unsigned count, ExceptionCo
     return m_data->substring(offset, count);
 }
 
-PassRefPtr<StringImpl> CharacterData::parserAppendData(const String& arg)
+PassRefPtr<StringImpl> CharacterData::appendDataCommon(const String& arg)
 {
     String newStr = m_data;
     newStr.append(arg);
@@ -76,9 +76,18 @@ PassRefPtr<StringImpl> CharacterData::parserAppendData(const String& arg)
     return oldStr.release();
 }
 
+void CharacterData::parserAppendData(const String& arg)
+{
+    appendDataCommon(arg);
+    // We don't call dispatchModifiedEvent here because we don't want the
+    // parser to dispatch DOM mutation events.
+    if (parentNode())
+        parentNode()->childrenChanged();
+}
+
 void CharacterData::appendData(const String& arg, ExceptionCode&)
 {
-    RefPtr<StringImpl> oldStr = parserAppendData(arg);
+    RefPtr<StringImpl> oldStr = appendDataCommon(arg);
     dispatchModifiedEvent(oldStr.get());
 }
 
diff --git a/WebCore/dom/CharacterData.h b/WebCore/dom/CharacterData.h
index ecc0cf7..03f35ca 100644
--- a/WebCore/dom/CharacterData.h
+++ b/WebCore/dom/CharacterData.h
@@ -43,7 +43,7 @@ public:
     StringImpl* dataImpl() { return m_data.get(); }
 
     // Like appendData, but optimized for the parser (e.g., no mutation events).
-    PassRefPtr<StringImpl> parserAppendData(const String&);
+    void parserAppendData(const String&);
 
 protected:
     CharacterData(Document* document, const String& text, ConstructionType type)
@@ -66,6 +66,7 @@ private:
     virtual bool offsetInCharacters() const;
 
     void checkCharDataOperation(unsigned offset, ExceptionCode&);
+    PassRefPtr<StringImpl> appendDataCommon(const String& arg);
 
     RefPtr<StringImpl> m_data;
 };

-- 
WebKit Debian packaging