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

Side by Side Diff: cc/trees/layer_tree_host.cc

Issue 26112002: cc: Fix hit-testing in zero-opacity layers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/test/fake_picture_layer_impl.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 #include <string> 9 #include <string>
10 10
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 for (LayerIteratorType it = 1050 for (LayerIteratorType it =
1051 LayerIteratorType::Begin(&render_surface_layer_list); 1051 LayerIteratorType::Begin(&render_surface_layer_list);
1052 it != end; 1052 it != end;
1053 ++it) { 1053 ++it) {
1054 bool prevent_occlusion = it.target_render_surface_layer()->HasCopyRequest(); 1054 bool prevent_occlusion = it.target_render_surface_layer()->HasCopyRequest();
1055 occlusion_tracker.EnterLayer(it, prevent_occlusion); 1055 occlusion_tracker.EnterLayer(it, prevent_occlusion);
1056 1056
1057 if (it.represents_target_render_surface()) { 1057 if (it.represents_target_render_surface()) {
1058 PaintMasksForRenderSurface( 1058 PaintMasksForRenderSurface(
1059 *it, queue, did_paint_content, need_more_updates); 1059 *it, queue, did_paint_content, need_more_updates);
1060 } else if (it.represents_itself() && it->DrawsContent()) { 1060 } else if (it.represents_itself() && !it->draw_properties().skip_drawing) {
1061 devtools_instrumentation::ScopedLayerTreeTask 1061 devtools_instrumentation::ScopedLayerTreeTask
1062 update_layer(devtools_instrumentation::kUpdateLayer, it->id(), id()); 1062 update_layer(devtools_instrumentation::kUpdateLayer, it->id(), id());
1063 DCHECK(!it->paint_properties().bounds.IsEmpty()); 1063 DCHECK(!it->paint_properties().bounds.IsEmpty());
1064 *did_paint_content |= it->Update(queue, &occlusion_tracker); 1064 *did_paint_content |= it->Update(queue, &occlusion_tracker);
1065 *need_more_updates |= it->NeedMoreUpdates(); 1065 *need_more_updates |= it->NeedMoreUpdates();
1066 } 1066 }
1067 1067
1068 occlusion_tracker.LeaveLayer(it); 1068 occlusion_tracker.LeaveLayer(it);
1069 } 1069 }
1070 1070
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1284 1284
1285 bool LayerTreeHost::ScheduleMicroBenchmark( 1285 bool LayerTreeHost::ScheduleMicroBenchmark(
1286 const std::string& benchmark_name, 1286 const std::string& benchmark_name,
1287 scoped_ptr<base::Value> value, 1287 scoped_ptr<base::Value> value,
1288 const MicroBenchmark::DoneCallback& callback) { 1288 const MicroBenchmark::DoneCallback& callback) {
1289 return micro_benchmark_controller_.ScheduleRun( 1289 return micro_benchmark_controller_.ScheduleRun(
1290 benchmark_name, value.Pass(), callback); 1290 benchmark_name, value.Pass(), callback);
1291 } 1291 }
1292 1292
1293 } // namespace cc 1293 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_picture_layer_impl.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698