| Index: content/browser/gpu/gpu_data_manager.cc
|
| ===================================================================
|
| --- content/browser/gpu/gpu_data_manager.cc (revision 112878)
|
| +++ content/browser/gpu/gpu_data_manager.cc (working copy)
|
| @@ -485,49 +485,14 @@
|
| }
|
| }
|
|
|
| -void GpuDataManager::SetBuiltInGpuBlacklist(GpuBlacklist* built_in_list) {
|
| +void GpuDataManager::SetGpuBlacklist(GpuBlacklist* gpu_blacklist) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - DCHECK(built_in_list);
|
| - uint16 version_major, version_minor;
|
| - bool succeed = built_in_list->GetVersion(
|
| - &version_major, &version_minor);
|
| - DCHECK(succeed);
|
| - gpu_blacklist_.reset(built_in_list);
|
| + DCHECK(gpu_blacklist);
|
| + gpu_blacklist_.reset(gpu_blacklist);
|
| UpdateGpuFeatureFlags();
|
| preliminary_gpu_feature_flags_ = gpu_feature_flags_;
|
| - VLOG(1) << "Using software rendering list version "
|
| - << version_major << "." << version_minor;
|
| }
|
|
|
| -void GpuDataManager::UpdateGpuBlacklist(
|
| - GpuBlacklist* gpu_blacklist, bool preliminary) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - DCHECK(gpu_blacklist);
|
| -
|
| - scoped_ptr<GpuBlacklist> updated_list(gpu_blacklist);
|
| -
|
| - uint16 updated_version_major, updated_version_minor;
|
| - if (!updated_list->GetVersion(
|
| - &updated_version_major, &updated_version_minor))
|
| - return;
|
| -
|
| - uint16 current_version_major, current_version_minor;
|
| - bool succeed = gpu_blacklist_->GetVersion(
|
| - ¤t_version_major, ¤t_version_minor);
|
| - DCHECK(succeed);
|
| - if (updated_version_major < current_version_major ||
|
| - (updated_version_major == current_version_major &&
|
| - updated_version_minor <= current_version_minor))
|
| - return;
|
| -
|
| - gpu_blacklist_.reset(updated_list.release());
|
| - UpdateGpuFeatureFlags();
|
| - if (preliminary)
|
| - preliminary_gpu_feature_flags_ = gpu_feature_flags_;
|
| - VLOG(1) << "Using software rendering list version "
|
| - << updated_version_major << "." << updated_version_minor;
|
| -}
|
| -
|
| void GpuDataManager::HandleGpuSwitch() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| content::GPUInfo gpu_info;
|
|
|