Attachment 62122 Details for Bug 42668 – Patch for landing

[patch] Patch for landing

bug-42668-20100720151759.patch (text/plain), 4.37 KB, created by Adam Barth on 2010-07-20 15:18:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Barth

Created: 2010-07-20 15:18:01 PDT

Size: 4.37 KB

patch

obsolete

>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 63779)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2010-07-20  Adam Barth  <abarth@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  Adam Barth  <abarth@webkit.org>
> 
>         Reviewed by Darin Adler.
>Index: WebCore/dom/CharacterData.cpp
>===================================================================
>--- WebCore/dom/CharacterData.cpp	(revision 63779)
>+++ WebCore/dom/CharacterData.cpp	(working copy)
>@@ -59,10 +59,10 @@ String CharacterData::substringData(unsi
>     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::ap
>     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 
> 
>     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 
>     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
> 
>     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
>     
>     // 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
>Index: WebCore/dom/CharacterData.h
>===================================================================
>--- WebCore/dom/CharacterData.h	(revision 63779)
>+++ WebCore/dom/CharacterData.h	(working copy)
>@@ -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;
> };

Actions: View | Formatted Diff | Diff

Attachments on bug 42668: 62113 | 62121 | 62122