Bug 867426 - Remove RawLinearString typedef; r=jonco
authorTerrence Cole <terrence@mozilla.com>
Tue, 30 Apr 2013 15:39:19 -0700
changeset 141443 3a8fec8d23932d5627be5584ba01d481f6a0e9e9
parent 141442 fa6176c9b03fb96691fd035fa73e1ba7bb795086
child 141444 f234cb1b600e79cea8af39cd7721d78d515808bb
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjonco
bugs867426
milestone23.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 867426 - Remove RawLinearString typedef; r=jonco
js/src/jsdate.cpp
js/src/vm/String.h
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -758,17 +758,17 @@ DaysInMonth(int year, int month)
  *   hh   = two digits of hour (00 through 23) (am/pm NOT allowed)
  *   mm   = two digits of minute (00 through 59)
  *   ss   = two digits of second (00 through 59)
  *   s    = one or more digits representing a decimal fraction of a second
  *   TZD  = time zone designator (Z or +hh:mm or -hh:mm or missing for local)
  */
 
 static JSBool
-date_parseISOString(RawLinearString str, double *result, DateTimeInfo *dtInfo)
+date_parseISOString(JSLinearString *str, double *result, DateTimeInfo *dtInfo)
 {
     double msec;
 
     const jschar *s;
     size_t limit;
     size_t i = 0;
     int tzMul = 1;
     int dateMul = 1;
@@ -897,17 +897,17 @@ date_parseISOString(RawLinearString str,
 
 #undef PEEK
 #undef NEED
 #undef DONE_UNLESS
 #undef NEED_NDIGITS
 }
 
 static JSBool
-date_parseString(RawLinearString str, double *result, DateTimeInfo *dtInfo)
+date_parseString(JSLinearString *str, double *result, DateTimeInfo *dtInfo)
 {
     double msec;
 
     const jschar *s;
     size_t limit;
     size_t i = 0;
     int year = -1;
     int mon = -1;
@@ -1181,17 +1181,17 @@ date_parse(JSContext *cx, unsigned argc,
         vp->setDouble(js_NaN);
         return true;
     }
 
     RawString str = ToString<CanGC>(cx, args[0]);
     if (!str)
         return false;
 
-    RawLinearString linearStr = str->ensureLinear(cx);
+    JSLinearString *linearStr = str->ensureLinear(cx);
     if (!linearStr)
         return false;
 
     double result;
     if (!date_parseString(linearStr, &result, &cx->runtime->dateTimeInfo)) {
         vp->setDouble(js_NaN);
         return true;
     }
@@ -3070,17 +3070,17 @@ js_Date(JSContext *cx, unsigned argc, Va
             return false;
 
         if (args[0].isString()) {
             /* Step 2. */
             RawString str = args[0].toString();
             if (!str)
                 return false;
 
-            RawLinearString linearStr = str->ensureLinear(cx);
+            JSLinearString *linearStr = str->ensureLinear(cx);
             if (!linearStr)
                 return false;
 
             if (!date_parseString(linearStr, &d, &cx->runtime->dateTimeInfo))
                 d = js_NaN;
             else
                 d = TimeClip(d);
         } else {
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -21,17 +21,16 @@
 #include "js/CharacterEncoding.h"
 #include "js/RootingAPI.h"
 
 ForwardDeclareJS(String);
 class JSDependentString;
 class JSUndependedString;
 class JSExtensibleString;
 class JSExternalString;
-ForwardDeclareJS(LinearString);
 class JSStableString;
 ForwardDeclareJS(InlineString);
 class JSRope;
 
 namespace js {
 
 class StaticStrings;
 class PropertyName;