summaryrefslogtreecommitdiffstats
path: root/android_webview/lib
diff options
context:
space:
mode:
authorsievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 04:08:04 +0000
committersievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 04:08:04 +0000
commitd7cf393aac07d1db221d3899b62098bcd26e2fd0 (patch)
tree5d009c371b420fe8a1a312c0b95dd3912b4bac3d /android_webview/lib
parentabb786b1feaabd3318a436fac1245d978581fad1 (diff)
downloadchromium_src-d7cf393aac07d1db221d3899b62098bcd26e2fd0.zip
chromium_src-d7cf393aac07d1db221d3899b62098bcd26e2fd0.tar.gz
chromium_src-d7cf393aac07d1db221d3899b62098bcd26e2fd0.tar.bz2
Factor out code from WebGraphicsContext3DInProcessImpl
Move the internal GLInProcessContext class to gpu/command_buffer/client. This works towards these goals: - Unifying the WGC3D impls to be able to have one unified class that is simply a shim from WGC3D to GLES2 - Factor out the in-process version so that non-webkit code can use it without depending on webkit TBR=jamesr@chromium.org, piman@chromium.org Review URL: https://codereview.chromium.org/16851003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/lib')
-rw-r--r--android_webview/lib/main/aw_main_delegate.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 210131c..476f705 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -20,6 +20,7 @@
#include "content/public/browser/browser_main_runner.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
+#include "gpu/command_buffer/client/gl_in_process_context.h"
#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
namespace android_webview {
@@ -42,8 +43,7 @@ AwMainDelegate::~AwMainDelegate() {
bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
content::SetContentClient(&content_client_);
- webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl
- ::EnableVirtualizedContext();
+ gpu::GLInProcessContext::EnableVirtualizedContext();
CommandLine* cl = CommandLine::ForCurrentProcess();
cl->AppendSwitch(switches::kEnableBeginFrameScheduling);