[cleanup] Merge harmony-string-padding.js into string.js

Change-Id: I9973858f2596a9bc4d66afbb26612189fbded7f3
Reviewed-on: https://chromium-review.googlesource.com/478413Reviewed-by: Caitlin Potter <caitp@igalia.com>
Commit-Queue: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#44658}

BUILD.gn

@@ -515,7 +515,6 @@ action("js2c") {
     "src/js/templates.js",
     "src/js/spread.js",
     "src/js/proxy.js",
-    "src/js/harmony-string-padding.js",
     "src/debug/mirrors.js",
     "src/debug/debug.js",
     "src/debug/liveedit.js",

src/js/harmony-string-padding.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function(global, utils) {
-
-%CheckIsBootstrapping();
-
-// -------------------------------------------------------------------
-// Imports
-
-var GlobalString = global.String;
-
-// -------------------------------------------------------------------
-// http://tc39.github.io/proposal-string-pad-start-end/
-
-function StringPad(thisString, maxLength, fillString) {
-  maxLength = TO_LENGTH(maxLength);
-  var stringLength = thisString.length;
-
-  if (maxLength <= stringLength) return "";
-
-  if (IS_UNDEFINED(fillString)) {
-    fillString = " ";
-  } else {
-    fillString = TO_STRING(fillString);
-    if (fillString === "") {
-      // If filler is the empty String, return S.
-      return "";
-    }
-  }
-
-  var fillLength = maxLength - stringLength;
-  var repetitions = (fillLength / fillString.length) | 0;
-  var remainingChars = (fillLength - fillString.length * repetitions) | 0;
-
-  var filler = "";
-  while (true) {
-    if (repetitions & 1) filler += fillString;
-    repetitions >>= 1;
-    if (repetitions === 0) break;
-    fillString += fillString;
-  }
-
-  if (remainingChars) {
-    filler += %_SubString(fillString, 0, remainingChars);
-  }
-
-  return filler;
-}
-
-function StringPadStart(maxLength, fillString) {
-  CHECK_OBJECT_COERCIBLE(this, "String.prototype.padStart")
-  var thisString = TO_STRING(this);
-
-  return StringPad(thisString, maxLength, fillString) + thisString;
-}
-%FunctionSetLength(StringPadStart, 1);
-
-function StringPadEnd(maxLength, fillString) {
-  CHECK_OBJECT_COERCIBLE(this, "String.prototype.padEnd")
-  var thisString = TO_STRING(this);
-
-  return thisString + StringPad(thisString, maxLength, fillString);
-}
-%FunctionSetLength(StringPadEnd, 1);
-
-utils.InstallFunctions(GlobalString.prototype, DONT_ENUM, [
-  "padStart", StringPadStart,
-  "padEnd", StringPadEnd
-]);
-
-});

src/js/string.js

@@ -240,6 +240,60 @@ function StringCodePointAt(pos) {
   return (first - 0xD800) * 0x400 + second + 0x2400;
 }
 
+function StringPad(thisString, maxLength, fillString) {
+  maxLength = TO_LENGTH(maxLength);
+  var stringLength = thisString.length;
+
+  if (maxLength <= stringLength) return "";
+
+  if (IS_UNDEFINED(fillString)) {
+    fillString = " ";
+  } else {
+    fillString = TO_STRING(fillString);
+    if (fillString === "") {
+      // If filler is the empty String, return S.
+      return "";
+    }
+  }
+
+  var fillLength = maxLength - stringLength;
+  var repetitions = (fillLength / fillString.length) | 0;
+  var remainingChars = (fillLength - fillString.length * repetitions) | 0;
+
+  var filler = "";
+  while (true) {
+    if (repetitions & 1) filler += fillString;
+    repetitions >>= 1;
+    if (repetitions === 0) break;
+    fillString += fillString;
+  }
+
+  if (remainingChars) {
+    filler += %_SubString(fillString, 0, remainingChars);
+  }
+
+  return filler;
+}
+
+// ES#sec-string.prototype.padstart
+// String.prototype.padStart(maxLength [, fillString])
+function StringPadStart(maxLength, fillString) {
+  CHECK_OBJECT_COERCIBLE(this, "String.prototype.padStart");
+  var thisString = TO_STRING(this);
+
+  return StringPad(thisString, maxLength, fillString) + thisString;
+}
+%FunctionSetLength(StringPadStart, 1);
+
+// ES#sec-string.prototype.padend
+// String.prototype.padEnd(maxLength [, fillString])
+function StringPadEnd(maxLength, fillString) {
+  CHECK_OBJECT_COERCIBLE(this, "String.prototype.padEnd");
+  var thisString = TO_STRING(this);
+
+  return thisString + StringPad(thisString, maxLength, fillString);
+}
+%FunctionSetLength(StringPadEnd, 1);
 
 // -------------------------------------------------------------------
 // String methods related to templates
@@ -276,6 +330,8 @@ utils.InstallFunctions(GlobalString, DONT_ENUM, [
 utils.InstallFunctions(GlobalString.prototype, DONT_ENUM, [
   "codePointAt", StringCodePointAt,
   "match", StringMatchJS,
+  "padEnd", StringPadEnd,
+  "padStart", StringPadStart,
   "repeat", StringRepeat,
   "search", StringSearch,
   "slice", StringSlice,

src/v8.gyp

@@ -2311,7 +2311,6 @@
           'js/templates.js',
           'js/spread.js',
           'js/proxy.js',
-          'js/harmony-string-padding.js',
           'debug/mirrors.js',
           'debug/debug.js',
           'debug/liveedit.js',