From 8a7d064a63b9a443359b0b418469fbc0ff9a4fd5 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Thu, 15 May 2014 14:11:09 +0200 Subject: Fix a crash preventing us from using ImplSidePainting Because of an uninvestigated reason, ImplSidePainting can cause more than one quad to use the same resource_id in one delegated frame. Fix the issue by first checking if m_data->mailboxTextures contains a texture for the resource_id before overwriting it. This also re-enables the feature on OS_ANDROID where it is enabled by default. Change-Id: Ie7842f958e1c049db71ffc2a0a768a5725102a3d Reviewed-by: Andras Becsi --- src/core/web_engine_context.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/core/web_engine_context.cpp') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 8af675b81..b5ff11720 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -157,7 +157,6 @@ WebEngineContext::WebEngineContext() parsedCommandLine->AppendSwitch(switches::kDisableGpuShaderDiskCache); parsedCommandLine->AppendSwitch(switches::kDisable2dCanvasAntialiasing); parsedCommandLine->AppendSwitch(switches::kEnableDeadlineScheduling); - parsedCommandLine->AppendSwitch(cc::switches::kDisableImplSidePainting); parsedCommandLine->AppendSwitch(cc::switches::kDisableCompositedAntialiasing); parsedCommandLine->AppendSwitchASCII(switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); -- cgit v1.2.3