From 5338c02793e7b6674b6882318606ec91df9279f3 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Thu, 5 Nov 2015 12:33:12 -0500
Subject: [PATCH] Bug 1222083 - verify that a Skia GL context is actually
 available before trying to use it in Canvas2D drawImage. r=jmuizelaar

--HG--
extra : rebase_source : 2ddd185d711bc5cbdee08747b2fcc58a66719306
---
 dom/canvas/CanvasRenderingContext2D.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 4dbbb2f1d7d2..9782b7b929c7 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -4402,6 +4402,7 @@ CanvasRenderingContext2D::DrawImage(const CanvasImageSource& image,
 
 #ifdef USE_SKIA_GPU
   if (mRenderingMode == RenderingMode::OpenGLBackendMode &&
+      mIsSkiaGL &&
       !srcSurf &&
       image.IsHTMLVideoElement() &&
       gfxPlatform::GetPlatform()->GetSkiaGLGlue()) {