diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-05-15 14:11:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-16 13:26:00 +0200 |
| commit | 8a7d064a63b9a443359b0b418469fbc0ff9a4fd5 (patch) | |
| tree | 7077e0c6e79262539bf927a3e7403c7637af7924 /src/core/web_engine_context.cpp | |
| parent | 9e4cbda50ad3b3bc4b7911f5ec8e2591103e997f (diff) | |
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 <andras.becsi@digia.com>
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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); |