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 129376.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@579 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-04-04 22:32:24 +00:00
parent f94336aade
commit 0930631a5f
39 changed files with 404 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cef1/libcef/browser_webkit_glue.cc
View File

@@ -20,6 +20,7 @@ MSVC_POP_WARNING();
#include "base/string_util.h"
#include "net/base/mime_util.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h"
@@ -137,6 +138,7 @@ bool IsPluginEnabled(const webkit::WebPluginInfo& plugin) {
WebKit::WebGraphicsContext3D* CreateGraphicsContext3D(
cef_graphics_implementation_t graphics_implementation,
const WebKit::WebGraphicsContext3D::Attributes& attributes,
WebKit::WebView* web_view,
bool renderDirectlyToWebView) {
#if defined(OS_WIN)
bool use_command_buffer =
@@ -148,15 +150,18 @@ WebKit::WebGraphicsContext3D* CreateGraphicsContext3D(
#endif
if (use_command_buffer) {
WebKit::WebGraphicsContext3D* view_context = NULL;
if (!renderDirectlyToWebView)
view_context = web_view->graphicsContext3D();
scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl>
context(
new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl());
if (!context->initialize(attributes, NULL, renderDirectlyToWebView))
if (!context->Initialize(attributes, view_context))
return NULL;
return context.release();
} else {
return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
attributes, NULL, renderDirectlyToWebView);
attributes, renderDirectlyToWebView);
}
}