Bug 913953 - Part a: Remove unused JavascriptDoubleQuote functions; r=ehsan
authorMs2ger <ms2ger@gmail.com>
Tue, 10 Sep 2013 09:03:31 +0200
changeset 146222 e59f853e6c2699639acb99ac9d4f0c0839758c70
parent 146221 e5ca10a2b3d06ad1ffa9b94ce0c6120afe13504d
child 146223 3d5ec64ea71d7951117729adafb996f892fbcf76
push id25250
push userMs2ger@gmail.com
push dateTue, 10 Sep 2013 07:05:27 +0000
treeherdermozilla-central@be1053dc223b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs913953
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 913953 - Part a: Remove unused JavascriptDoubleQuote functions; r=ehsan
ipc/chromium/moz.build
ipc/chromium/src/base/string_escape.cc
ipc/chromium/src/base/string_escape.h
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -70,17 +70,16 @@ CPP_SOURCES += [
     'path_service.cc',
     'pickle.cc',
     'rand_util.cc',
     'ref_counted.cc',
     'revocable_store.cc',
     'scoped_temp_dir.cc',
     'simple_thread.cc',
     'stats_table.cc',
-    'string_escape.cc',
     'string_piece.cc',
     'string_util.cc',
     'system_monitor.cc',
     'task_queue.cc',
     'thread.cc',
     'thread_collision_warner.cc',
     'time.cc',
     'timer.cc',
deleted file mode 100644
--- a/ipc/chromium/src/base/string_escape.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/string_escape.h"
-
-#include <string>
-
-#include "base/string_util.h"
-
-namespace string_escape {
-
-// Try to escape |c| as a "SingleEscapeCharacter" (\n, etc).  If successful,
-// returns true and appends the escape sequence to |dst|.
-template<typename CHAR>
-static bool JavascriptSingleEscapeChar(const CHAR c, std::string* dst) {
-  // WARNING: if you add a new case here, you need to update the reader as well.
-  switch (c) {
-    case '\b':
-      dst->append("\\b");
-      break;
-    case '\f':
-      dst->append("\\f");
-      break;
-    case '\n':
-      dst->append("\\n");
-      break;
-    case '\r':
-      dst->append("\\r");
-      break;
-    case '\t':
-      dst->append("\\t");
-      break;
-    case '\v':
-      dst->append("\\v");
-      break;
-    case '\\':
-      dst->append("\\\\");
-      break;
-    case '"':
-      dst->append("\\\"");
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
-
-void JavascriptDoubleQuote(const string16& str,
-                           bool put_in_quotes,
-                           std::string* dst) {
-  if (put_in_quotes)
-    dst->push_back('"');
-
-  for (string16::const_iterator it = str.begin(); it != str.end(); ++it) {
-    char16 c = *it;
-    if (!JavascriptSingleEscapeChar(c, dst)) {
-      if (c > 255) {
-        // Non-ascii values need to be unicode dst->
-        // TODO(tc): Some unicode values are handled specially. See
-        // spidermonkey code.
-        StringAppendF(dst, "\\u%04X", c);
-      } else if (c < 32 || c > 126) {
-        // Spidermonkey hex escapes these values.
-        StringAppendF(dst, "\\x%02X", c);
-      } else {
-        dst->push_back(static_cast<char>(c));
-      }
-    }
-  }
-
-  if (put_in_quotes)
-    dst->push_back('"');
-}
-
-void JavascriptDoubleQuote(const std::string& str,
-                           bool put_in_quotes,
-                           std::string* dst) {
-  if (put_in_quotes)
-    dst->push_back('"');
-
-  for (std::string::const_iterator it = str.begin(); it != str.end(); ++it) {
-    unsigned char c = *it;
-    if (!JavascriptSingleEscapeChar(c, dst)) {
-      // Hex encode if the character is non-printable 7bit ascii
-      if (c < 32 || c == 127) {
-        StringAppendF(dst, "\\x%02X", c);
-      } else {
-        dst->push_back(static_cast<char>(c));
-      }
-    }
-  }
-
-  if (put_in_quotes)
-    dst->push_back('"');
-}
-
-}  // namespace string_escape
deleted file mode 100644
--- a/ipc/chromium/src/base/string_escape.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// This file defines utility functions for escaping strings.
-
-#ifndef BASE_STRING_ESCAPE_H__
-#define BASE_STRING_ESCAPE_H__
-
-#include "base/string16.h"
-
-namespace string_escape {
-
-// Escape |str| appropriately for a javascript string litereal, _appending_ the
-// result to |dst|. This will create standard escape sequences (\b, \n),
-// hex escape sequences (\x00), and unicode escape sequences (\uXXXX).
-// If |put_in_quotes| is true, the result will be surrounded in double quotes.
-// The outputted literal, when interpreted by the browser, should result in a
-// javascript string that is identical and the same length as the input |str|.
-void JavascriptDoubleQuote(const string16& str,
-                           bool put_in_quotes,
-                           std::string* dst);
-
-// Similar to the wide version, but for narrow strings.  It will not use
-// \uXXXX unicode escape sequences.  It will pass non-7bit characters directly
-// into the string unencoded, allowing the browser to interpret the encoding.
-// The outputted literal, when interpreted by the browser, could result in a
-// javascript string of a different length than the input |str|.
-void JavascriptDoubleQuote(const std::string& str,
-                           bool put_in_quotes,
-                           std::string* dst);
-
-}  // namespace string_escape
-
-#endif  // BASE_STRING_ESCAPE_H__