summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 01:33:32 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 01:33:32 +0000
commit54eba1ed0ea2f050a5fa59839954cd30f2261455 (patch)
tree81e4c88c32ebc4242b116f70abc782b02485ba99 /webkit
parent1a865956ce9f7e5451a0a7146561e7499f280e1c (diff)
downloadchromium_src-54eba1ed0ea2f050a5fa59839954cd30f2261455.zip
chromium_src-54eba1ed0ea2f050a5fa59839954cd30f2261455.tar.gz
chromium_src-54eba1ed0ea2f050a5fa59839954cd30f2261455.tar.bz2
Fix incorrect computation of antialias flag in implementations of WebGraphicsContext3D::getContextAttributes.
Ran WebGL conformance tests on Android to verify fix. A more complete fix will be done in the linked WebKit bug. BUG=180797 Review URL: https://chromiumcodereview.appspot.com/12573002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index e3a8400..692aedb 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -634,9 +634,9 @@ bool WebGraphicsContext3DInProcessCommandBufferImpl::Initialize(
GLint stencil_bits = 0;
getIntegerv(GL_STENCIL_BITS, &stencil_bits);
attributes_.stencil = stencil_bits > 0;
- GLint samples = 0;
- getIntegerv(GL_SAMPLES, &samples);
- attributes_.antialias = samples > 0;
+ GLint sample_buffers = 0;
+ getIntegerv(GL_SAMPLE_BUFFERS, &sample_buffers);
+ attributes_.antialias = sample_buffers > 0;
}
makeContextCurrent();