Roll WebGL conformance and upgrade to 1.0.4

Roll 66dc43ded4472d20dda860acbf22a06e625ea86a:1e318b3f0ad952d22477151eec98d37fa08e5bc7

BUG=485632,485634,485641,485642,483282
TEST=gpu_bots
R=kbr@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/1128343003

Cr-Commit-Position: refs/heads/master@{#328861}

DEPS

@@ -195,7 +195,7 @@ deps = {
     Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0',
 
   'src/third_party/webgl/src':
-   Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '66dc43ded4472d20dda860acbf22a06e625ea86a',
+   Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '1e318b3f0ad952d22477151eec98d37fa08e5bc7',
 
   'src/third_party/webdriver/pylib':
     Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',

content/test/gpu/gpu_tests/webgl_conformance.py

@@ -127,7 +127,7 @@ def Name(cls):
   def AddBenchmarkCommandLineArgs(cls, group):
     group.add_option('--webgl-conformance-version',
         help='Version of the WebGL conformance tests to run.',
-        default='1.0.3')
+        default='1.0.4')
     group.add_option('--webgl2-only',
         help='Whether we include webgl 1 tests if version is 2.0.0 or above.',
         default='false')

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

@@ -44,12 +44,22 @@ def SetExpectations(self):
         bug=478572)
     self.Fail('deqp/data/gles2/shaders/scoping.html',
         bug=478572)
+    self.Fail('conformance/glsl/misc/const-variable-initialization.html',
+        bug=485632)
+    self.Fail('conformance/misc/expando-loss.html',
+        bug=485634)
 
     # Win failures
-    self.Fail('conformance/glsl/misc/ternary-operators-in-global-initializers.html',
+    self.Fail('conformance/glsl/misc/' +
+              'ternary-operators-in-global-initializers.html',
         ['win'], bug=415694)
     self.Fail('conformance/glsl/misc/struct-specifiers-in-uniforms.html',
         ['win'], bug=433412)
+    self.Fail('conformance/glsl/bugs/' +
+              'pow-of-small-constant-in-user-defined-function.html',
+        ['win'], bug=485641)
+    self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
+        ['win'], bug=485642)
 
     # Win7 / Intel failures
     self.Fail('conformance/rendering/gl-scissor-test.html',
@@ -392,7 +402,6 @@ def SetExpectations(self):
 
     self.Fail('conformance2/core/draw-buffers.html', bug=483282)
     self.Fail('conformance2/core/frag-depth.html', bug=483282)
-    self.Fail('conformance2/core/misc-parameters.html', bug=483282)
     self.Fail('conformance2/core/tex-mipmap-levels.html', bug=483282)
 
     self.Fail('conformance2/core/tex-new-formats.html', bug=483282)