| Index: content/browser/gpu/gpu_data_manager_impl.cc
|
| diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
|
| index 506b2f9370956d7d808bcfe044d6d6c87865d496..6924120c3bd38557c2e490769136e4baf0677c6c 100644
|
| --- a/content/browser/gpu/gpu_data_manager_impl.cc
|
| +++ b/content/browser/gpu/gpu_data_manager_impl.cc
|
| @@ -372,6 +372,7 @@ bool GpuDataManagerImpl::Merge(content::GPUInfo* object,
|
| object->gl_extensions = other.gl_extensions;
|
| }
|
| object->can_lose_context = other.can_lose_context;
|
| + object->software_rendering = other.software_rendering;
|
| #if defined(OS_WIN)
|
| if (object->dx_diagnostics.values.size() == 0 &&
|
| object->dx_diagnostics.children.size() == 0) {
|
|
|