From cb3878f277e3f8800a7c1b4756b4bfc9262acb83 Mon Sep 17 00:00:00 2001 From: Milan Sreckovic Date: Wed, 1 Apr 2015 15:23:20 -0400 Subject: [PATCH] Bug 1149954 - Only Skia canvases need be considered for acceleration. Carry r=jmuizelaar from bug 1124249 --- dom/canvas/CanvasRenderingContext2D.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp index 4f74a0046da..302ef5f4e24 100644 --- a/dom/canvas/CanvasRenderingContext2D.cpp +++ b/dom/canvas/CanvasRenderingContext2D.cpp @@ -1349,7 +1349,9 @@ CanvasRenderingContext2D::EnsureTarget(RenderingMode aRenderingMode) } if (layerManager) { - if (mode == RenderingMode::OpenGLBackendMode && CheckSizeForSkiaGL(size)) { + if (mode == RenderingMode::OpenGLBackendMode && + gfxPlatform::GetPlatform()->UseAcceleratedSkiaCanvas() && + CheckSizeForSkiaGL(size)) { DemoteOldestContextIfNecessary(); #if USE_SKIA_GPU