From fedc693be132235dbf0499cc0f741730ab1a23e7 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 28 Oct 2010 14:32:21 +0000 Subject: [PATCH] Update to Chromium revision 64233. - Enable the WebGL desktop implementation which is now working in combination with accelerated compositing (issue #136). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@129 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 1 + libcef/browser_webkit_init.h | 2 +- libcef/cef_process_ui_thread.cc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index caebb6775..0daf20a89 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -57,3 +57,4 @@ Date | CEF Revision | Chromium Revision 2010-10-15 | /trunk@116 | /trunk@62731 2010-10-21 | /trunk@122 | /trunk@63396 2010-10-26 | /trunk@127 | /trunk@63876 +2010-10-28 | /trunk@129 | /trunk@64233 diff --git a/libcef/browser_webkit_init.h b/libcef/browser_webkit_init.h index 2b0110cb5..3622d20a2 100644 --- a/libcef/browser_webkit_init.h +++ b/libcef/browser_webkit_init.h @@ -55,7 +55,7 @@ class BrowserWebKitInit : public webkit_glue::WebKitClientImpl { WebKit::WebRuntimeFeatures::enableSockets(true); WebKit::WebRuntimeFeatures::enableApplicationCache(true); WebKit::WebRuntimeFeatures::enableDatabase(true); - WebKit::WebRuntimeFeatures::enableWebGL(false); + WebKit::WebRuntimeFeatures::enableWebGL(true); WebKit::WebRuntimeFeatures::enablePushState(true); WebKit::WebRuntimeFeatures::enableNotifications(true); WebKit::WebRuntimeFeatures::enableTouch(true); diff --git a/libcef/cef_process_ui_thread.cc b/libcef/cef_process_ui_thread.cc index dd033bbbb..6e33961ee 100644 --- a/libcef/cef_process_ui_thread.cc +++ b/libcef/cef_process_ui_thread.cc @@ -147,7 +147,7 @@ void CefProcessUIThread::Init() { net::SSLClientSocketNSSFactory); #endif - gfx::InitializeGLBindings(gfx::kGLImplementationNone); + gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL); URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory); }