From fd47ca5cea3be4a3a8336a7c54e6e2775b041335 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 16 Mar 2017 19:21:24 +0000 Subject: [PATCH] Revert "Revert "Revert "Detect Chrome either by renderer or version strings.""" This reverts commit c551fa4218fe931171801cc2d601f7523e1b7ead. Reason for revert: Original change's description: > Revert "Revert "Detect Chrome either by renderer or version strings."" > > This reverts commit 1165b1ef6f069d512c6d5a43ef431b3be6f8c80f. > > Reason for revert: > > Original change's description: > > Revert "Detect Chrome either by renderer or version strings." > > > > This reverts commit be4eed2ef77d5e8c3e3920664fdc787e196ac6b0. > > > > Reason for revert: > > > > Original change's description: > > > Detect Chrome either by renderer or version strings. > > > > > > We currently detect Chrome by GL_RENDERER. In anticipation of changes in Chrome to no longer override the renderer string we now also check the version string. > > > > > > Change-Id: Ice4ac3ae8ced5ac3d8fd2099300f0a3285f9c197 > > > Reviewed-on: https://skia-review.googlesource.com/9807 > > > Reviewed-by: Greg Daniel > > > Commit-Queue: Brian Salomon > > > > > > > TBR=egdaniel@google.com,bsalomon@google.com,reviews@skia.org > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > > > Change-Id: I0100ce266ca9bf7b71a752495e509e67ff323870 > > Reviewed-on: https://skia-review.googlesource.com/9811 > > Reviewed-by: Brian Salomon > > Commit-Queue: Brian Salomon > > > > TBR=egdaniel@google.com,bsalomon@google.com,reviews@skia.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: I43acf948b4f2339a79abc2b5c4e2bb3183a3c350 > Reviewed-on: https://skia-review.googlesource.com/9812 > Reviewed-by: Brian Salomon > Commit-Queue: Brian Salomon > TBR=egdaniel@google.com,bsalomon@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ifc458640f05c87861909530c8901ad2d7e3e1f6c Reviewed-on: https://skia-review.googlesource.com/9813 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- src/gpu/gl/GrGLUtil.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gpu/gl/GrGLUtil.cpp b/src/gpu/gl/GrGLUtil.cpp index d87a17a..6d8337e 100644 --- a/src/gpu/gl/GrGLUtil.cpp +++ b/src/gpu/gl/GrGLUtil.cpp @@ -111,8 +111,7 @@ void GrGLGetDriverInfo(GrGLStandard standard, versionString = ""; } - if (0 == strcmp(rendererString, "Chromium") || - 2 == sscanf(versionString, "OpenGL ES %d.%d Chromium", &major, &minor)) { + if (0 == strcmp(rendererString, "Chromium")) { *outDriver = kChromium_GrGLDriver; return; } -- 2.7.4