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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 12760011: cc: Chromify LayerTreeHostCommon (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 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_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4dee1b3dfab32ce88e1454853b4688989c6ae328..ee98af38e5ca78eac7265068d239d0a1d957927b 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -341,14 +341,14 @@ bool LayerTreeHostImpl::HaveTouchEventHandlersAt(gfx::Point viewport_point) {
// First find out which layer was hit from the saved list of visible layers
// in the most recent frame.
- LayerImpl* layer_impl = LayerTreeHostCommon::findLayerThatIsHitByPoint(
+ LayerImpl* layer_impl = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
device_viewport_point,
active_tree_->RenderSurfaceLayerList());
// Walk up the hierarchy and look for a layer with a touch event handler
// region that the given point hits.
for (; layer_impl; layer_impl = layer_impl->parent()) {
- if (LayerTreeHostCommon::layerHasTouchEventHandlersAt(device_viewport_point,
+ if (LayerTreeHostCommon::LayerHasTouchEventHandlersAt(device_viewport_point,
layer_impl))
return true;
}
@@ -1365,7 +1365,7 @@ InputHandlerClient::ScrollStatus LayerTreeHostImpl::ScrollBegin(
// First find out which layer was hit from the saved list of visible layers
// in the most recent frame.
- LayerImpl* layer_impl = LayerTreeHostCommon::findLayerThatIsHitByPoint(
+ LayerImpl* layer_impl = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
device_viewport_point, active_tree_->RenderSurfaceLayerList());
// Walk up the hierarchy and look for a scrollable layer.
@@ -1645,8 +1645,8 @@ static void CollectScrollDeltas(ScrollAndScaleSet* scroll_info,
gfx::ToFlooredVector2d(layer_impl->scroll_delta());
if (!scroll_delta.IsZero()) {
LayerTreeHostCommon::ScrollUpdateInfo scroll;
- scroll.layerId = layer_impl->id();
- scroll.scrollDelta = scroll_delta;
+ scroll.layer_id = layer_impl->id();
+ scroll.scroll_delta = scroll_delta;
scroll_info->scrolls.push_back(scroll);
layer_impl->SetSentScrollDelta(scroll_delta);
}
@@ -1659,8 +1659,8 @@ scoped_ptr<ScrollAndScaleSet> LayerTreeHostImpl::ProcessScrollDeltas() {
scoped_ptr<ScrollAndScaleSet> scroll_info(new ScrollAndScaleSet());
CollectScrollDeltas(scroll_info.get(), active_tree_->root_layer());
- scroll_info->pageScaleDelta = active_tree_->page_scale_delta();
- active_tree_->set_sent_page_scale_delta(scroll_info->pageScaleDelta);
+ scroll_info->page_scale_delta = active_tree_->page_scale_delta();
+ active_tree_->set_sent_page_scale_delta(scroll_info->page_scale_delta);
return scroll_info.Pass();
}
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698