Merge WebKit at r59636: Update v8 to r4660.
Will build and run with current webkit.
Change-Id: I57bae621fd894da363ba84e1757ad09eb7c502b9
diff --git a/src/flags.cc b/src/flags.cc
index d444c97..bbe6bb7 100644
--- a/src/flags.cc
+++ b/src/flags.cc
@@ -470,12 +470,12 @@
// static
int FlagList::SetFlagsFromString(const char* str, int len) {
// make a 0-terminated copy of str
- char* copy0 = NewArray<char>(len + 1);
- memcpy(copy0, str, len);
+ ScopedVector<char> copy0(len + 1);
+ memcpy(copy0.start(), str, len);
copy0[len] = '\0';
// strip leading white space
- char* copy = SkipWhiteSpace(copy0);
+ char* copy = SkipWhiteSpace(copy0.start());
// count the number of 'arguments'
int argc = 1; // be compatible with SetFlagsFromCommandLine()
@@ -485,7 +485,7 @@
}
// allocate argument array
- char** argv = NewArray<char*>(argc);
+ ScopedVector<char*> argv(argc);
// split the flags string into arguments
argc = 1; // be compatible with SetFlagsFromCommandLine()
@@ -497,11 +497,7 @@
}
// set the flags
- int result = SetFlagsFromCommandLine(&argc, argv, false);
-
- // cleanup
- DeleteArray(argv);
- DeleteArray(copy0);
+ int result = SetFlagsFromCommandLine(&argc, argv.start(), false);
return result;
}