Index: cc/trees/layer_tree_host_impl.cc |
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
index f5d61590fc92298ce666ef4bc98d379c68f9f6d4..e0330a5e014d1713da8fd8ed2f6cbb52b3f92e69 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -1822,14 +1822,13 @@ bool LayerTreeHostImpl::UpdateGpuRasterizationStatus() { |
gpu_rasterization_status_ = GpuRasterizationStatus::OFF_DEVICE; |
} else if (!has_gpu_rasterization_trigger_) { |
gpu_rasterization_status_ = GpuRasterizationStatus::OFF_VIEWPORT; |
- } else if (content_is_suitable_for_gpu_rasterization_) { |
- use_gpu = true; |
- gpu_rasterization_status_ = GpuRasterizationStatus::ON; |
- } else if (using_msaa_for_complex_content) { |
+ } else if (!content_is_suitable_for_gpu_rasterization_ && |
enne (OOO)
2017/04/05 22:20:09
Sorry to bikeshed, but maybe this should be called
|
+ using_msaa_for_complex_content) { |
use_gpu = use_msaa = true; |
gpu_rasterization_status_ = GpuRasterizationStatus::MSAA_CONTENT; |
} else { |
- gpu_rasterization_status_ = GpuRasterizationStatus::OFF_CONTENT; |
+ use_gpu = true; |
+ gpu_rasterization_status_ = GpuRasterizationStatus::ON; |
} |
if (use_gpu && !use_gpu_rasterization_) { |