Commit 4739a2c5 authored by ajuma's avatar ajuma Committed by Commit bot

Delete obsolete GPU rasterization content whitelist code

This deletes code that was previously used for deciding if the
expanded content whitelist for GPU rasterization should be used.
Blink now uses the expanded whitelist by default (that is,
WebSettings::setUseExpandedHeuristicsForGpuRasterization is
now a no-op), so this code is no longer needed.

BUG=404866

Review URL: https://codereview.chromium.org/496503002

Cr-Commit-Position: refs/heads/master@{#291744}
parent ca24846f
...@@ -699,12 +699,6 @@ void GpuDataManagerImplPrivate::UpdateRendererWebPrefs( ...@@ -699,12 +699,6 @@ void GpuDataManagerImplPrivate::UpdateRendererWebPrefs(
switches::kDisableAcceleratedVideoDecode)) { switches::kDisableAcceleratedVideoDecode)) {
prefs->pepper_accelerated_video_decode_enabled = true; prefs->pepper_accelerated_video_decode_enabled = true;
} }
if (!IsFeatureBlacklisted(
gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION_EXPANDED_HEURISTICS) ||
base::FieldTrialList::FindFullName(
"GpuRasterizationExpandedContentWhitelist") == "Enabled")
prefs->use_expanded_heuristics_for_gpu_rasterization = true;
} }
void GpuDataManagerImplPrivate::DisableHardwareAcceleration() { void GpuDataManagerImplPrivate::DisableHardwareAcceleration() {
......
...@@ -169,7 +169,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) ...@@ -169,7 +169,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(supports_multiple_windows) IPC_STRUCT_TRAITS_MEMBER(supports_multiple_windows)
IPC_STRUCT_TRAITS_MEMBER(viewport_enabled) IPC_STRUCT_TRAITS_MEMBER(viewport_enabled)
IPC_STRUCT_TRAITS_MEMBER(viewport_meta_enabled) IPC_STRUCT_TRAITS_MEMBER(viewport_meta_enabled)
IPC_STRUCT_TRAITS_MEMBER(use_expanded_heuristics_for_gpu_rasterization)
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes) IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale) IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled) IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
......
...@@ -123,7 +123,6 @@ WebPreferences::WebPreferences() ...@@ -123,7 +123,6 @@ WebPreferences::WebPreferences()
supports_multiple_windows(true), supports_multiple_windows(true),
viewport_enabled(false), viewport_enabled(false),
viewport_meta_enabled(false), viewport_meta_enabled(false),
use_expanded_heuristics_for_gpu_rasterization(false),
main_frame_resizes_are_orientation_changes(false), main_frame_resizes_are_orientation_changes(false),
initialize_at_minimum_page_scale(true), initialize_at_minimum_page_scale(true),
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
......
...@@ -133,7 +133,6 @@ struct CONTENT_EXPORT WebPreferences { ...@@ -133,7 +133,6 @@ struct CONTENT_EXPORT WebPreferences {
bool supports_multiple_windows; bool supports_multiple_windows;
bool viewport_enabled; bool viewport_enabled;
bool viewport_meta_enabled; bool viewport_meta_enabled;
bool use_expanded_heuristics_for_gpu_rasterization;
bool main_frame_resizes_are_orientation_changes; bool main_frame_resizes_are_orientation_changes;
bool initialize_at_minimum_page_scale; bool initialize_at_minimum_page_scale;
bool smart_insert_delete_enabled; bool smart_insert_delete_enabled;
......
...@@ -1061,8 +1061,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, ...@@ -1061,8 +1061,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setViewportEnabled(prefs.viewport_enabled); settings->setViewportEnabled(prefs.viewport_enabled);
settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
settings->setUseExpandedHeuristicsForGpuRasterization(
prefs.use_expanded_heuristics_for_gpu_rasterization);
settings->setMainFrameResizesAreOrientationChanges( settings->setMainFrameResizesAreOrientationChanges(
prefs.main_frame_resizes_are_orientation_changes); prefs.main_frame_resizes_are_orientation_changes);
......
...@@ -38,9 +38,6 @@ GpuBlacklist* GpuBlacklist::Create() { ...@@ -38,9 +38,6 @@ GpuBlacklist* GpuBlacklist::Create() {
GPU_FEATURE_TYPE_PANEL_FITTING); GPU_FEATURE_TYPE_PANEL_FITTING);
list->AddSupportedFeature("gpu_rasterization", list->AddSupportedFeature("gpu_rasterization",
GPU_FEATURE_TYPE_GPU_RASTERIZATION); GPU_FEATURE_TYPE_GPU_RASTERIZATION);
list->AddSupportedFeature(
"gpu_rasterization_expanded_heuristics",
GPU_FEATURE_TYPE_GPU_RASTERIZATION_EXPANDED_HEURISTICS);
list->set_supports_feature_type_all(true); list->set_supports_feature_type_all(true);
return list; return list;
} }
......
...@@ -128,9 +128,4 @@ GPU_BLACKLIST_FEATURE_TEST(GpuRasterization, ...@@ -128,9 +128,4 @@ GPU_BLACKLIST_FEATURE_TEST(GpuRasterization,
"gpu_rasterization", "gpu_rasterization",
GPU_FEATURE_TYPE_GPU_RASTERIZATION) GPU_FEATURE_TYPE_GPU_RASTERIZATION)
GPU_BLACKLIST_FEATURE_TEST(
GpuRasterizationExpandedHeuristics,
"gpu_rasterization_expanded_heuristics",
GPU_FEATURE_TYPE_GPU_RASTERIZATION_EXPANDED_HEURISTICS)
} // namespace gpu } // namespace gpu
...@@ -21,7 +21,6 @@ enum GpuFeatureType { ...@@ -21,7 +21,6 @@ enum GpuFeatureType {
GPU_FEATURE_TYPE_PANEL_FITTING, GPU_FEATURE_TYPE_PANEL_FITTING,
GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE, GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE,
GPU_FEATURE_TYPE_GPU_RASTERIZATION, GPU_FEATURE_TYPE_GPU_RASTERIZATION,
GPU_FEATURE_TYPE_GPU_RASTERIZATION_EXPANDED_HEURISTICS,
NUMBER_OF_GPU_FEATURE_TYPES NUMBER_OF_GPU_FEATURE_TYPES
}; };
......
...@@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( ...@@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
{ {
"name": "software rendering list", "name": "software rendering list",
// Please update the version number whenever you change this file. // Please update the version number whenever you change this file.
"version": "9.3", "version": "9.4",
"entries": [ "entries": [
{ {
"id": 1, "id": 1,
...@@ -1084,25 +1084,6 @@ LONG_STRING_CONST( ...@@ -1084,25 +1084,6 @@ LONG_STRING_CONST(
"gpu_rasterization" "gpu_rasterization"
] ]
}, },
{
"id": 98,
"description": "Whitelist for using GPU rasterization for a broader set of content",
"cr_bugs": [399306],
"exceptions": [
{
"os": {
"type": "android",
"version": {
"op": ">=",
"value": "4.4.99"
}
}
}
],
"features": [
"gpu_rasterization_expanded_heuristics"
]
},
{ {
"id": 99, "id": 99,
"description": "GPU rasterization is blacklisted on non-Android", "description": "GPU rasterization is blacklisted on non-Android",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment