Title: [127459] trunk/Source/WebCore
- Revision
- 127459
- Author
- [email protected]
- Date
- 2012-09-04 05:30:35 -0700 (Tue, 04 Sep 2012)
Log Message
Web Inspector: [WebGL] Bugfix: wrong texture binding target in replay for 3D textures
https://bugs.webkit.org/show_bug.cgi?id=95687
Patch by Andrey Adaikin <[email protected]> on 2012-09-04
Reviewed by Vsevolod Vlasov.
gl.bindTexture accepts either TEXTURE_2D or TEXTURE_CUBE_MAP targets, but we tried to replay with TEXTURE_CUBE_MAP_POSITIVE_X and others for 3D textures.
* inspector/InjectedScriptWebGLModuleSource.js:
(.):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (127458 => 127459)
--- trunk/Source/WebCore/ChangeLog 2012-09-04 12:11:13 UTC (rev 127458)
+++ trunk/Source/WebCore/ChangeLog 2012-09-04 12:30:35 UTC (rev 127459)
@@ -1,3 +1,15 @@
+2012-09-04 Andrey Adaikin <[email protected]>
+
+ Web Inspector: [WebGL] Bugfix: wrong texture binding target in replay for 3D textures
+ https://bugs.webkit.org/show_bug.cgi?id=95687
+
+ Reviewed by Vsevolod Vlasov.
+
+ gl.bindTexture accepts either TEXTURE_2D or TEXTURE_CUBE_MAP targets, but we tried to replay with TEXTURE_CUBE_MAP_POSITIVE_X and others for 3D textures.
+
+ * inspector/InjectedScriptWebGLModuleSource.js:
+ (.):
+
2012-09-04 Allan Sandfeld Jensen <[email protected]>
Allow child-frame content in hit-tests.
Modified: trunk/Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js (127458 => 127459)
--- trunk/Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js 2012-09-04 12:11:13 UTC (rev 127458)
+++ trunk/Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js 2012-09-04 12:30:35 UTC (rev 127459)
@@ -1456,19 +1456,20 @@
if (resource)
return resource;
var gl = this.wrappedObject();
- var bindingTarget;
+ var bindingParameter;
var bindMethodName;
+ var bindMethodTarget = target;
switch (target) {
case gl.ARRAY_BUFFER:
- bindingTarget = gl.ARRAY_BUFFER_BINDING;
+ bindingParameter = gl.ARRAY_BUFFER_BINDING;
bindMethodName = "bindBuffer";
break;
case gl.ELEMENT_ARRAY_BUFFER:
- bindingTarget = gl.ELEMENT_ARRAY_BUFFER_BINDING;
+ bindingParameter = gl.ELEMENT_ARRAY_BUFFER_BINDING;
bindMethodName = "bindBuffer";
break;
case gl.TEXTURE_2D:
- bindingTarget = gl.TEXTURE_BINDING_2D;
+ bindingParameter = gl.TEXTURE_BINDING_2D;
bindMethodName = "bindTexture";
break;
case gl.TEXTURE_CUBE_MAP:
@@ -1478,24 +1479,25 @@
case gl.TEXTURE_CUBE_MAP_NEGATIVE_Y:
case gl.TEXTURE_CUBE_MAP_POSITIVE_Z:
case gl.TEXTURE_CUBE_MAP_NEGATIVE_Z:
- bindingTarget = gl.TEXTURE_BINDING_CUBE_MAP;
+ bindingParameter = gl.TEXTURE_BINDING_CUBE_MAP;
+ bindMethodTarget = gl.TEXTURE_CUBE_MAP;
bindMethodName = "bindTexture";
break;
case gl.FRAMEBUFFER:
- bindingTarget = gl.FRAMEBUFFER_BINDING;
+ bindingParameter = gl.FRAMEBUFFER_BINDING;
bindMethodName = "bindFramebuffer";
break;
case gl.RENDERBUFFER:
- bindingTarget = gl.RENDERBUFFER_BINDING;
+ bindingParameter = gl.RENDERBUFFER_BINDING;
bindMethodName = "bindRenderbuffer";
break;
default:
console.error("ASSERT_NOT_REACHED: unknown binding target " + target);
return null;
}
- resource = Resource.forObject(gl.getParameter(bindingTarget));
+ resource = Resource.forObject(gl.getParameter(bindingParameter));
if (resource)
- resource.pushBinding(target, bindMethodName);
+ resource.pushBinding(bindMethodTarget, bindMethodName);
return resource;
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
