[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 407086683a341d5c9c65a4e7c8ce3a8a2529dbde
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 23:02:56 2010 +0000

    2010-07-20  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.
    
            Fix fast/dom/title-content-write-set.html for HTML5 tree builder
            https://bugs.webkit.org/show_bug.cgi?id=42668
    
            Address some late-breaking review comments.
    
            * dom/CharacterData.cpp:
            (WebCore::CharacterData::appendDataCommon):
            (WebCore::CharacterData::parserAppendData):
            (WebCore::CharacterData::appendData):
            (WebCore::CharacterData::insertData):
            (WebCore::CharacterData::replaceData):
            * dom/CharacterData.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 309096a..9ea12c1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-20  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed.
+
+        Fix fast/dom/title-content-write-set.html for HTML5 tree builder
+        https://bugs.webkit.org/show_bug.cgi?id=42668
+
+        Address some late-breaking review comments.
+
+        * dom/CharacterData.cpp:
+        (WebCore::CharacterData::appendDataCommon):
+        (WebCore::CharacterData::parserAppendData):
+        (WebCore::CharacterData::appendData):
+        (WebCore::CharacterData::insertData):
+        (WebCore::CharacterData::replaceData):
+        * dom/CharacterData.h:
+
 2010-07-20  Daniel Erat  <derat at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebCore/dom/CharacterData.cpp b/WebCore/dom/CharacterData.cpp
index 408281e..7accbfb 100644
--- a/WebCore/dom/CharacterData.cpp
+++ b/WebCore/dom/CharacterData.cpp
@@ -59,10 +59,10 @@ String CharacterData::substringData(unsigned offset, unsigned count, ExceptionCo
     return m_data->substring(offset, count);
 }
 
-PassRefPtr<StringImpl> CharacterData::appendDataCommon(const String& arg)
+PassRefPtr<StringImpl> CharacterData::appendDataCommon(const String& data)
 {
     String newStr = m_data;
-    newStr.append(arg);
+    newStr.append(data);
 
     RefPtr<StringImpl> oldStr = m_data;
     m_data = newStr.impl();
@@ -76,29 +76,29 @@ PassRefPtr<StringImpl> CharacterData::appendDataCommon(const String& arg)
     return oldStr.release();
 }
 
-void CharacterData::parserAppendData(const String& arg)
+void CharacterData::parserAppendData(const String& data)
 {
-    appendDataCommon(arg);
+    appendDataCommon(data);
     // 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&)
+void CharacterData::appendData(const String& data, ExceptionCode&)
 {
-    RefPtr<StringImpl> oldStr = appendDataCommon(arg);
+    RefPtr<StringImpl> oldStr = appendDataCommon(data);
     dispatchModifiedEvent(oldStr.get());
 }
 
-void CharacterData::insertData(unsigned offset, const String& arg, ExceptionCode& ec)
+void CharacterData::insertData(unsigned offset, const String& data, ExceptionCode& ec)
 {
     checkCharDataOperation(offset, ec);
     if (ec)
         return;
 
     String newStr = m_data;
-    newStr.insert(arg, offset);
+    newStr.insert(data, offset);
 
     RefPtr<StringImpl> oldStr = m_data;
     m_data = newStr.impl();
@@ -111,7 +111,7 @@ void CharacterData::insertData(unsigned offset, const String& arg, ExceptionCode
 
     dispatchModifiedEvent(oldStr.get());
     
-    document()->textInserted(this, offset, arg.length());
+    document()->textInserted(this, offset, data.length());
 }
 
 void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionCode& ec)
@@ -143,7 +143,7 @@ void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionCode& e
     document()->textRemoved(this, offset, realCount);
 }
 
-void CharacterData::replaceData(unsigned offset, unsigned count, const String& arg, ExceptionCode& ec)
+void CharacterData::replaceData(unsigned offset, unsigned count, const String& data, ExceptionCode& ec)
 {
     checkCharDataOperation(offset, ec);
     if (ec)
@@ -157,7 +157,7 @@ void CharacterData::replaceData(unsigned offset, unsigned count, const String& a
 
     String newStr = m_data;
     newStr.remove(offset, realCount);
-    newStr.insert(arg, offset);
+    newStr.insert(data, offset);
 
     RefPtr<StringImpl> oldStr = m_data;
     m_data = newStr.impl();
@@ -172,7 +172,7 @@ void CharacterData::replaceData(unsigned offset, unsigned count, const String& a
     
     // update the markers for spell checking and grammar checking
     document()->textRemoved(this, offset, realCount);
-    document()->textInserted(this, offset, arg.length());
+    document()->textInserted(this, offset, data.length());
 }
 
 String CharacterData::nodeValue() const
diff --git a/WebCore/dom/CharacterData.h b/WebCore/dom/CharacterData.h
index 03f35ca..94e812b 100644
--- a/WebCore/dom/CharacterData.h
+++ b/WebCore/dom/CharacterData.h
@@ -66,7 +66,7 @@ private:
     virtual bool offsetInCharacters() const;
 
     void checkCharDataOperation(unsigned offset, ExceptionCode&);
-    PassRefPtr<StringImpl> appendDataCommon(const String& arg);
+    PassRefPtr<StringImpl> appendDataCommon(const String&);
 
     RefPtr<StringImpl> m_data;
 };

-- 
WebKit Debian packaging