Merge revision 470 changes:

- Don't add the "--expose-gc" V8 flag by default for all CEF users (issue #483).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@494 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-02-14 18:08:00 +00:00
parent 24788d33b3
commit b5ef1d0e61
2 changed files with 11 additions and 11 deletions

View File

@@ -110,8 +110,14 @@ void CefTestSuite::GetSettings(CefSettings& settings) {
settings.session_storage_quota = atoi(commandline_->GetSwitchValueASCII(
cefclient::kSessionStorageQuota).c_str());
CefString(&settings.javascript_flags) =
// Always expose the V8 gc() function to give tests finer-grained control over
// memory management.
std::string javascript_flags = "--expose-gc";
std::string other_javascript_flags =
commandline_->GetSwitchValueASCII(cefclient::kJavascriptFlags);
if (!other_javascript_flags.empty())
javascript_flags += " " + other_javascript_flags;
CefString(&settings.javascript_flags) = javascript_flags;
}
// static