Skip to content

Commit

Permalink
Enable WGC3DIPCBI GLContextVirtual in Android WebView
Browse files Browse the repository at this point in the history
No-op change for now since WGC3DIPCBI is not used yet. But we
will. Also stops https://codereview.chromium.org/14256014/
from crashing.

BUG=166777
NOTRY=true

First landed in r197732 but broke components build fyi bot.

Review URL: https://chromiumcodereview.appspot.com/13979016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198482 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
boliu@chromium.org committed May 6, 2013
1 parent dc7638a commit cd34649
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions android_webview/android_webview.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
'../skia/skia.gyp:skia',
'../gpu/gpu.gyp:gles2_implementation',
'../ui/gl/gl.gyp:gl',
'../webkit/gpu/webkit_gpu.gyp:webkit_gpu',
'android_webview_pak',
],
'include_dirs': [
Expand Down
4 changes: 4 additions & 0 deletions android_webview/lib/main/aw_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "content/public/browser/browser_main_runner.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"

namespace android_webview {

Expand All @@ -30,6 +31,9 @@ AwMainDelegate::~AwMainDelegate() {
bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
content::SetContentClient(&content_client_);

webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl
::EnableVirtualizedContext();

CommandLine* cl = CommandLine::ForCurrentProcess();
// Set the command line to enable synchronous API compatibility.
if (cl->HasSwitch(switches::kMergeUIAndRendererCompositorThreads)) {
Expand Down

0 comments on commit cd34649

Please sign in to comment.