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

Update to Chromium revision 100584.

Browse Source 
- Add a new CefSettings.graphics_implementation option for using different GL implementations.
- Disable accelerated compositing by default due to multiple issues (issue #334, issue #335, issue #337).
- Eliminate the "patcher" project and perform all patching during GYP project generation.
- Fix references to non-existent files in cef.gyp.
- Move BrowserWebKitInit method implementations to a separate .cc file.
- Add support for Flash on Mac (issue #305).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@284 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-09-10 19:40:03 +00:00
parent f4dc2dffa8
commit d260f78cb2
52 changed files with 765 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/cef_process_ui_thread.cc
View File

@ -16,8 +16,10 @@
#include "build/build_config.h"
#include "net/base/net_module.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
#include "ui/gfx/gl/gl_implementation.h"
#include "webkit/extensions/v8/gc_extension.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/npapi/plugin_list.h"
#if defined(OS_WIN)
@ -102,7 +104,12 @@ void CefProcessUIThread::Init() {
extensions_v8::GCExtension::Get());
#if defined(OS_WIN)
gfx::InitializeGLBindings(gfx::kGLImplementationEGLGLES2);
if (settings.graphics_implementation == ANGLE_IN_PROCESS ||
settings.graphics_implementation == ANGLE_IN_PROCESS_COMMAND_BUFFER) {
gfx::InitializeGLBindings(gfx::kGLImplementationEGLGLES2);
} else {
gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
}
#else
gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
#endif