Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(905)

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 2033163003: cc : Fix hit testing bug in resourceless software draw mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 27540d1263f03e008dba25fcdcd53d489582a2c1..a8d787c71e629a039116de6bfd87773656749c02 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -816,8 +816,7 @@ bool LayerTreeImpl::UpdateDrawProperties(bool update_lcd_text) {
"cc", "LayerTreeImpl::UpdateDrawProperties::CalculateDrawProperties",
"IsActive", IsActiveTree(), "SourceFrameNumber", source_frame_number_);
bool can_render_to_separate_surface =
- (layer_tree_host_impl_->GetDrawMode() !=
- DRAW_MODE_RESOURCELESS_SOFTWARE);
+ (!is_in_resourceless_software_draw_mode());
LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
root_layer(), DrawViewportSize(),
@@ -930,7 +929,7 @@ bool LayerTreeImpl::UpdateDrawProperties(bool update_lcd_text) {
// Resourceless draw do not need tiles and should not affect existing tile
// priorities.
- if (layer_tree_host_impl_->GetDrawMode() != DRAW_MODE_RESOURCELESS_SOFTWARE) {
+ if (!is_in_resourceless_software_draw_mode()) {
TRACE_EVENT_BEGIN2("cc", "LayerTreeImpl::UpdateDrawProperties::UpdateTiles",
"IsActive", IsActiveTree(), "SourceFrameNumber",
source_frame_number_);
@@ -1599,9 +1598,12 @@ static bool PointIsClippedByAncestorClipNode(
const LayerImpl* target_layer =
layer->layer_tree_impl()->LayerById(transform_node->owner_id);
- DCHECK(transform_node->id == 0 || target_layer->render_surface());
+ DCHECK(transform_node->id == 0 || target_layer->render_surface() ||
+ layer->layer_tree_impl()->is_in_resourceless_software_draw_mode());
gfx::Transform surface_screen_space_transform =
- transform_node->id == 0
+ transform_node->id == 0 ||
+ (layer->layer_tree_impl()
+ ->is_in_resourceless_software_draw_mode())
? gfx::Transform()
: SurfaceScreenSpaceTransform(target_layer, transform_tree);
if (!PointHitsRect(screen_space_point, surface_screen_space_transform,
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698