autoland: changeset 413890:ebb9f83337a22ae8e77c3e7129f65178f1bedec5

author	Jamie Nicol <jnicol@mozilla.com>
	Wed, 14 Mar 2018 16:42:37 +0000
changeset 413890	ebb9f83337a22ae8e77c3e7129f65178f1bedec5
parent 413889	d8986aead3e05be3a7f15252c098e7da173c42aa
child 413891	208bfd37417ee5ad04d5819029697db901f7a468
push id	62725
push user	jnicol@mozilla.com
push date	Mon, 16 Apr 2018 17:41:28 +0000
treeherder	autoland@ebb9f83337a2 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jrmuizel
bugs	1443149
milestone	61.0a1
first release with	nightly linux32 f94b64e00202 / 61.0a1 / 20180417100054 / files nightly linux64 f94b64e00202 / 61.0a1 / 20180417100054 / files nightly mac f94b64e00202 / 61.0a1 / 20180417100054 / files nightly win32 f94b64e00202 / 61.0a1 / 20180417100054 / files nightly win64 f94b64e00202 / 61.0a1 / 20180417100054 / files
last release without	nightly linux32 6276ec7ebbf3 / 61.0a1 / 20180416100103 / files nightly linux64 6276ec7ebbf3 / 61.0a1 / 20180416100103 / files nightly mac 6276ec7ebbf3 / 61.0a1 / 20180416100103 / files nightly win32 e96685584bf7 / 61.0a1 / 20180415220108 / files nightly win64 e96685584bf7 / 61.0a1 / 20180415220108 / files

Bug 1443149 - Ensure WebGLFBAttachPoint::HasImage() before dereferencing Format(). r=jrmuizel Previously we were checking IsDefined() rather than HasImage(), but were hitting crashes. This was because Format() can return null if the attach point is defined but the attached texture level or renderbuffer aren't themselves defined. HasImage() checks for this case. MozReview-Commit-ID: 8KY3zPXXAFv

dom/canvas/WebGLContextFramebufferOperations.cpp

file | annotate | diff | comparison | revisions

--- a/dom/canvas/WebGLContextFramebufferOperations.cpp
+++ b/dom/canvas/WebGLContextFramebufferOperations.cpp
@@ -28,17 +28,17 @@ WebGLContext::Clear(GLbitfield mask)
         GenerateWarning("Calling gl.clear(0) has no effect.");
     } else if (mRasterizerDiscardEnabled) {
         GenerateWarning("Calling gl.clear() with RASTERIZER_DISCARD enabled has no effects.");
     }
 
     if (mask & LOCAL_GL_COLOR_BUFFER_BIT && mBoundDrawFramebuffer) {
         if (mask & LOCAL_GL_COLOR_BUFFER_BIT) {
             for (const auto& cur : mBoundDrawFramebuffer->ColorDrawBuffers()) {
-                if (!cur->IsDefined())
+                if (!cur->HasImage())
                     continue;
 
                 switch (cur->Format()->format->componentType) {
                 case webgl::ComponentType::Float:
                 case webgl::ComponentType::NormInt:
                 case webgl::ComponentType::NormUInt:
                     break;