diff options
| author | skyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 18:57:56 +0000 |
|---|---|---|
| committer | skyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 18:57:56 +0000 |
| commit | 0eb936f3cdcded92a08f9a720e76bb847f6ded9c (patch) | |
| tree | be8f00907ce74aa9bd85e51639f559b0a242a368 /content/browser/gpu | |
| parent | f0e06987a647b8c59b8004c6bc0811480322a81a (diff) | |
| download | chromium_src-0eb936f3cdcded92a08f9a720e76bb847f6ded9c.zip chromium_src-0eb936f3cdcded92a08f9a720e76bb847f6ded9c.tar.gz chromium_src-0eb936f3cdcded92a08f9a720e76bb847f6ded9c.tar.bz2 | |
android: Enable WebGL if context robustess extension is supported
If the GL implementation supports the context robustness extension
(GL_{ARB,EXT}_robustness) and promises to tell us about GPU resets, turn
on support for WebGL.
This patch also removes the Android-only --enable-webgl command line
flag. From now on, WebGL support can be forced on with the
--ignore-gpu-blacklist flag.
BUG=112928
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/18696006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl_private.cc | 4 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_internals_ui.cc | 8 | ||||
| -rw-r--r-- | content/browser/gpu/webgl_conformance_test.cc | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc index 7713cb6..1bd1f6b 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -157,11 +157,7 @@ void UpdateStats(const gpu::GpuBlacklist* blacklist, const bool kGpuFeatureUserFlags[] = { command_line.HasSwitch(switches::kDisableAccelerated2dCanvas), command_line.HasSwitch(switches::kDisableAcceleratedCompositing), -#if defined(OS_ANDROID) - !command_line.HasSwitch(switches::kEnableExperimentalWebGL), -#else command_line.HasSwitch(switches::kDisableExperimentalWebGL), -#endif command_line.HasSwitch(switches::kDisableImageTransportSurface) }; #if defined(OS_WIN) diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index cbc2472..0e778c2 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc @@ -162,6 +162,10 @@ base::DictionaryValue* GpuInfoAsDictionaryValue() { gpu_info.gl_ws_version)); basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); + std::string reset_strategy = + base::StringPrintf("0x%04x", gpu_info.gl_reset_notification_strategy); + basic_info->Append(NewDescriptionValuePair( + "Reset notification strategy", reset_strategy)); base::DictionaryValue* info = new base::DictionaryValue(); info->Set("basic_info", basic_info); @@ -249,11 +253,7 @@ base::Value* GetFeatureStatus() { { "webgl", manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL), -#if defined(OS_ANDROID) - !command_line.HasSwitch(switches::kEnableExperimentalWebGL), -#else command_line.HasSwitch(switches::kDisableExperimentalWebGL), -#endif "WebGL has been disabled, either via about:flags or command line.", false }, diff --git a/content/browser/gpu/webgl_conformance_test.cc b/content/browser/gpu/webgl_conformance_test.cc index c58653c..79f3078 100644 --- a/content/browser/gpu/webgl_conformance_test.cc +++ b/content/browser/gpu/webgl_conformance_test.cc @@ -27,7 +27,6 @@ class WebGLConformanceTest : public ContentBrowserTest { // Allow privileged WebGL extensions. command_line->AppendSwitch(switches::kEnablePrivilegedWebGLExtensions); #if defined(OS_ANDROID) - command_line->AppendSwitch(switches::kEnableExperimentalWebGL); command_line->AppendSwitch( switches::kDisableGestureRequirementForMediaPlayback); #endif |