From 5a112a21ddc087e6e2f9fc9174bf25f20260abc2 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Thu, 19 Jan 2012 19:12:15 +0000
Subject: [PATCH] Don't add the "--expose-gc" V8 flag by default for all CEF
 users (issue #483).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@470 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 libcef/cef_process_ui_thread.cc | 14 ++++----------
 tests/unittests/test_suite.cc   |  8 +++++++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libcef/cef_process_ui_thread.cc b/libcef/cef_process_ui_thread.cc
index dbb8dc146..f3b3c33b5 100644
--- a/libcef/cef_process_ui_thread.cc
+++ b/libcef/cef_process_ui_thread.cc
@@ -22,7 +22,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/gl/gl_implementation.h"
-#include "webkit/extensions/v8/gc_extension.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_list.h"
@@ -107,15 +106,10 @@ void CefProcessUIThread::Init() {
       kStatsFileCounters);
   base::StatsTable::set_current(statstable_);
 
-  // CEF always exposes the GC.
-  std::string javascript_flags = "--expose-gc";
-  if (settings.javascript_flags.length > 0)
-    javascript_flags += " " + CefString(&settings.javascript_flags).ToString();
-  webkit_glue::SetJavaScriptFlags(javascript_flags);
-
-  // Expose GCController to JavaScript.
-  WebKit::WebScriptController::registerExtension(
-      extensions_v8::GCExtension::Get());
+  if (settings.javascript_flags.length > 0) {
+    // Pass the JavaScript flags to V8.
+    webkit_glue::SetJavaScriptFlags(CefString(&settings.javascript_flags));
+  }
 
 #if defined(OS_WIN)
   if (settings.graphics_implementation == ANGLE_IN_PROCESS ||
diff --git a/tests/unittests/test_suite.cc b/tests/unittests/test_suite.cc
index 7fa2d9129..7f49d9ea1 100644
--- a/tests/unittests/test_suite.cc
+++ b/tests/unittests/test_suite.cc
@@ -108,8 +108,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