Changeset 148854 in webkit

Timestamp:

Apr 21, 2013 10:54:11 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

Fix some minor bad use of strings in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=114907

Reviewed by Darin Adler.

• editing/Editor.cpp:

(WebCore::Editor::selectedText): This was implicitly getting the emptyString()
for the argument "".

• editing/markup.cpp:

(WebCore::StyledMarkupAccumulator::takeResults): ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (2 diffs)
• editing/markup.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-21  Benjamin Poulain  <benjamin@webkit.org>
+
+        Fix some minor bad use of strings in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=114907
+
+        Reviewed by Darin Adler.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::selectedText): This was implicitly getting the emptyString()
+        for the argument "".
+        * editing/markup.cpp:
+        (WebCore::StyledMarkupAccumulator::takeResults): ditto.
+
 2013-04-21  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2011, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
@@ -2648 +2648 @@
 {
     // We remove '\0' characters because they are not visibly rendered to the user.
-    return plainText(m_frame->selection()->toNormalizedRange().get(), behavior).replace(0, "");
+    return plainText(m_frame->selection()->toNormalizedRange().get(), behavior).replaceWithLiteral('\0', "");
 }
 

trunk/Source/WebCore/editing/markup.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Igalia S.L.
@@ -219 +219 @@
 
     // We remove '\0' characters because they are not visibly rendered to the user.
-    return result.toString().replace(0, "");
+    return result.toString().replaceWithLiteral('\0', "");
 }