Title: [190949] releases/WebKitGTK/webkit-2.10/Source/WebCore
- Revision
- 190949
- Author
- [email protected]
- Date
- 2015-10-13 03:26:35 -0700 (Tue, 13 Oct 2015)
Log Message
Merge r190382 - GraphicsContext3D::mappedSymbolName should initialize count variable
https://bugs.webkit.org/show_bug.cgi?id=149692
<rdar://problem/22871304>
Reviewed by Simon Fraser.
While debugging another WebGL issue, I noticed that some
OpenGL renderers can get into a state where they
drop resources (e.g. a GPU reset). If we don't detect that
in time, we might try to ask for the currently attached
resources and our in-parameter will not be set. In this
case, initialize it to zero so that we don't do silly things.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::mappedSymbolName): Initialize count to 0.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190948 => 190949)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:25:31 UTC (rev 190948)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:26:35 UTC (rev 190949)
@@ -1,3 +1,21 @@
+2015-09-30 Dean Jackson <[email protected]>
+
+ GraphicsContext3D::mappedSymbolName should initialize count variable
+ https://bugs.webkit.org/show_bug.cgi?id=149692
+ <rdar://problem/22871304>
+
+ Reviewed by Simon Fraser.
+
+ While debugging another WebGL issue, I noticed that some
+ OpenGL renderers can get into a state where they
+ drop resources (e.g. a GPU reset). If we don't detect that
+ in time, we might try to ask for the currently attached
+ resources and our in-parameter will not be set. In this
+ case, initialize it to zero so that we don't do silly things.
+
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::mappedSymbolName): Initialize count to 0.
+
2015-09-30 Myles C. Maxfield <[email protected]>
Crash when using an SVG font with > 390 glyphs
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (190948 => 190949)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-10-13 10:25:31 UTC (rev 190948)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-10-13 10:26:35 UTC (rev 190949)
@@ -871,7 +871,7 @@
String GraphicsContext3D::mappedSymbolName(Platform3DObject program, ANGLEShaderSymbolType symbolType, const String& name)
{
- GC3Dsizei count;
+ GC3Dsizei count = 0;
Platform3DObject shaders[2] = { };
getAttachedShaders(program, 2, &count, shaders);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
