bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 470 changes:

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

14
libcef/cef_process_ui_thread.cc
View File

@ -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 ||