| Index: gpu/config/gpu_blacklist.cc
|
| diff --git a/gpu/config/gpu_blacklist.cc b/gpu/config/gpu_blacklist.cc
|
| index 7d51e123457c3c810b4a76af289bad1c8ba09de7..38d03092246df583f047f7ad9c8f4ec86404d47a 100644
|
| --- a/gpu/config/gpu_blacklist.cc
|
| +++ b/gpu/config/gpu_blacklist.cc
|
| @@ -5,44 +5,48 @@
|
| #include "gpu/config/gpu_blacklist.h"
|
|
|
| #include "gpu/config/gpu_feature_type.h"
|
| +#include "gpu/config/software_rendering_list_autogen.h"
|
|
|
| namespace gpu {
|
|
|
| -GpuBlacklist::GpuBlacklist()
|
| - : GpuControlList() {
|
| -}
|
| +GpuBlacklist::GpuBlacklist(const GpuControlListData& data)
|
| + : GpuControlList(data) {}
|
|
|
| GpuBlacklist::~GpuBlacklist() {
|
| }
|
|
|
| // static
|
| -GpuBlacklist* GpuBlacklist::Create() {
|
| - GpuBlacklist* list = new GpuBlacklist();
|
| +std::unique_ptr<GpuBlacklist> GpuBlacklist::Create() {
|
| + GpuControlListData data(kSoftwareRenderingListVersion,
|
| + kSoftwareRenderingListEntryCount,
|
| + kSoftwareRenderingListEntries);
|
| + return Create(data);
|
| +}
|
| +
|
| +// static
|
| +std::unique_ptr<GpuBlacklist> GpuBlacklist::Create(
|
| + const GpuControlListData& data) {
|
| + std::unique_ptr<GpuBlacklist> list(new GpuBlacklist(data));
|
| list->AddSupportedFeature("accelerated_2d_canvas",
|
| GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS);
|
| list->AddSupportedFeature("gpu_compositing",
|
| GPU_FEATURE_TYPE_GPU_COMPOSITING);
|
| list->AddSupportedFeature("accelerated_webgl",
|
| GPU_FEATURE_TYPE_ACCELERATED_WEBGL);
|
| - list->AddSupportedFeature("flash_3d",
|
| - GPU_FEATURE_TYPE_FLASH3D);
|
| - list->AddSupportedFeature("flash_stage3d",
|
| - GPU_FEATURE_TYPE_FLASH_STAGE3D);
|
| + list->AddSupportedFeature("flash3d", GPU_FEATURE_TYPE_FLASH3D);
|
| + list->AddSupportedFeature("flash_stage3d", GPU_FEATURE_TYPE_FLASH_STAGE3D);
|
| list->AddSupportedFeature("flash_stage3d_baseline",
|
| GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE);
|
| list->AddSupportedFeature("accelerated_video_decode",
|
| GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE);
|
| list->AddSupportedFeature("accelerated_video_encode",
|
| GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE);
|
| - list->AddSupportedFeature("panel_fitting",
|
| - GPU_FEATURE_TYPE_PANEL_FITTING);
|
| + list->AddSupportedFeature("panel_fitting", GPU_FEATURE_TYPE_PANEL_FITTING);
|
| list->AddSupportedFeature("gpu_rasterization",
|
| GPU_FEATURE_TYPE_GPU_RASTERIZATION);
|
| list->AddSupportedFeature("accelerated_vpx_decode",
|
| GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE);
|
| - list->AddSupportedFeature("webgl2",
|
| - GPU_FEATURE_TYPE_WEBGL2);
|
| - list->set_supports_feature_type_all(true);
|
| + list->AddSupportedFeature("webgl2", GPU_FEATURE_TYPE_WEBGL2);
|
| return list;
|
| }
|
|
|
|
|