Changeset 129371 in webkit

Timestamp:

Sep 24, 2012 8:38:03 AM (12 years ago)

Author:

Patrick Gansterer

Message:

Remove remaining WTF_DEPRECATED_STRING_OPERATORS from cpp files
​https://bugs.webkit.org/show_bug.cgi?id=97412

Reviewed by Adam Barth.

Source/WebCore:

• css/StylePropertySet.cpp: Removed useless define.

Source/WebKit/chromium:

• src/WebPageSerializerImpl.cpp:

(WebKit::WebPageSerializerImpl::openTagToString): Replaced operator+= with StringBuilder::append().
(WebKit::WebPageSerializerImpl::endTagToString): Ditto.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/StylePropertySet.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebPageSerializerImpl.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-24  Patrick Gansterer  <paroga@webkit.org>
+
+        Remove remaining WTF_DEPRECATED_STRING_OPERATORS from cpp files
+        https://bugs.webkit.org/show_bug.cgi?id=97412
+
+        Reviewed by Adam Barth.
+
+        * css/StylePropertySet.cpp: Removed useless define.
+
 2012-09-20  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/css/StylePropertySet.cpp

@@ -19 +19 @@
  * Boston, MA 02110-1301, USA.
  */
-
-#define WTF_DEPRECATED_STRING_OPERATORS
 
 #include "config.h"

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-24  Patrick Gansterer  <paroga@webkit.org>
+
+        Remove remaining WTF_DEPRECATED_STRING_OPERATORS from cpp files
+        https://bugs.webkit.org/show_bug.cgi?id=97412
+
+        Reviewed by Adam Barth.
+
+        * src/WebPageSerializerImpl.cpp:
+        (WebKit::WebPageSerializerImpl::openTagToString): Replaced operator+= with StringBuilder::append().
+        (WebKit::WebPageSerializerImpl::endTagToString): Ditto.
+
 2012-09-24  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebPageSerializerImpl.cpp

@@ -76 +76 @@
 // saved resource files.
 
-#define WTF_DEPRECATED_STRING_OPERATORS
-
 #include "config.h"
 #include "WebPageSerializerImpl.h"
@@ -301 +299 @@
                                             SerializeDomParam* param)
 {
-    // FIXME: use StringBuilder instead of String.
     bool needSkip;
+    StringBuilder result;
     // Do pre action for open tag.
-    String result = preActionBeforeSerializeOpenTag(element, param, &needSkip);
+    result.append(preActionBeforeSerializeOpenTag(element, param, &needSkip));
     if (needSkip)
         return;
     // Add open tag
-    result += "<" + element->nodeName().lower();
+    result.append('<');
+    result.append(element->nodeName().lower());
     // Go through all attributes and serialize them.
     if (element->hasAttributes()) {
         unsigned numAttrs = element->attributeCount();
         for (unsigned i = 0; i < numAttrs; i++) {
-            result += " ";
+            result.append(' ');
             // Add attribute pair
             const Attribute *attribute = element->attributeItem(i);
-            result += attribute->name().toString();
-            result += "=\"";
+            result.append(attribute->name().toString());
+            result.appendLiteral("=\"");
             if (!attribute->value().isEmpty()) {
                 const String& attrValue = attribute->value();
@@ -327 +326 @@
                     // For links start with "javascript:", we do not change it.
                     if (attrValue.startsWith("javascript:", false))
-                        result += attrValue;
+                        result.append(attrValue);
                     else {
                         // Get the absolute link
@@ -335 +334 @@
                         // Check whether we have local files for those link.
                         if (m_localLinks.contains(completeURL)) {
-                            if (!param->directoryName.isEmpty())
-                                result += "./" + param->directoryName + "/";
-                            result += m_localLinks.get(completeURL);
+                            if (!param->directoryName.isEmpty()) {
+                                result.appendLiteral("./");
+                                result.append(param->directoryName);
+                                result.append('/');
+                            }
+                            result.append(m_localLinks.get(completeURL));
                         } else
-                            result += completeURL;
+                            result.append(completeURL);
                     }
                 } else {
                     if (param->isHTMLDocument)
-                        result += m_htmlEntities.convertEntitiesInString(attrValue);
+                        result.append(m_htmlEntities.convertEntitiesInString(attrValue));
                     else
-                        result += m_xmlEntities.convertEntitiesInString(attrValue);
+                        result.append(m_xmlEntities.convertEntitiesInString(attrValue));
                 }
             }
-            result += "\"";
+            result.append('\"');
         }
     }
@@ -356 +358 @@
     // Complete the open tag for element when it has child/children.
     if (element->hasChildNodes() || param->haveAddedContentsBeforeEnd)
-        result += ">";
+        result.append('>');
     // Append the added contents generate in  post action of open tag.
-    result += addedContents;
+    result.append(addedContents);
     // Save the result to data buffer.
-    saveHTMLContentToBuffer(result, param);
+    saveHTMLContentToBuffer(result.toString(), param);
 }
 
@@ -368 +370 @@
 {
     bool needSkip;
+    StringBuilder result;
     // Do pre action for end tag.
-    String result = preActionBeforeSerializeEndTag(element,
-                                                   param,
-                                                   &needSkip);
+    result.append(preActionBeforeSerializeEndTag(element, param, &needSkip));
     if (needSkip)
         return;
     // Write end tag when element has child/children.
     if (element->hasChildNodes() || param->haveAddedContentsBeforeEnd) {
-        result += "</";
-        result += element->nodeName().lower();
-        result += ">";
+        result.appendLiteral("</");
+        result.append(element->nodeName().lower());
+        result.append('>');
     } else {
         // Check whether we have to write end tag for empty element.
         if (param->isHTMLDocument) {
-            result += ">";
+            result.append('>');
             // FIXME: This code is horribly wrong.  WebPageSerializerImpl must die.
             if (!static_cast<const HTMLElement*>(element)->ieForbidsInsertHTML()) {
                 // We need to write end tag when it is required.
-                result += "</";
-                result += element->nodeName().lower();
-                result += ">";
+                result.appendLiteral("</");
+                result.append(element->nodeName().lower());
+                result.append('>');
             }
         } else {
             // For xml base document.
-            result += " />";
+            result.appendLiteral(" />");
         }
     }
     // Do post action for end tag.
-    result += postActionAfterSerializeEndTag(element, param);
+    result.append(postActionAfterSerializeEndTag(element, param));
     // Save the result to data buffer.
-    saveHTMLContentToBuffer(result, param);
+    saveHTMLContentToBuffer(result.toString(), param);
 }