Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index b023f8506fd6b56fd11dea3735ce4fca39bb83db..ea17e79da787bd1c7ad8c4e38597270bd2d1af1e 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -292,7 +292,7 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) { |
needs_full_tree_sync_ = false; |
if (root_layer_ && hud_layer_) { |
- LayerImpl* hud_impl = LayerTreeHostCommon::findLayerInSubtree( |
+ LayerImpl* hud_impl = LayerTreeHostCommon::FindLayerInSubtree( |
sync_tree->root_layer(), hud_layer_->id()); |
sync_tree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>(hud_impl)); |
} else { |
@@ -692,14 +692,14 @@ void LayerTreeHost::UpdateLayers(Layer* root_layer, |
UpdateHudLayer(); |
TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::calcDrawProps"); |
- LayerTreeHostCommon::calculateDrawProperties( |
+ LayerTreeHostCommon::CalculateDrawProperties( |
root_layer, |
device_viewport_size(), |
device_scale_factor_, |
page_scale_factor_, |
GetRendererCapabilities().max_texture_size, |
settings_.can_use_lcd_text, |
- update_list); |
+ &update_list); |
} |
// Reset partial texture update requests. |
@@ -897,18 +897,18 @@ void LayerTreeHost::ApplyScrollAndScale(const ScrollAndScaleSet& info) { |
for (size_t i = 0; i < info.scrolls.size(); ++i) { |
Layer* layer = |
- LayerTreeHostCommon::findLayerInSubtree(root_layer_.get(), |
- info.scrolls[i].layerId); |
+ LayerTreeHostCommon::FindLayerInSubtree(root_layer_.get(), |
+ info.scrolls[i].layer_id); |
if (!layer) |
continue; |
if (layer == root_scroll_layer) |
- root_scroll_delta += info.scrolls[i].scrollDelta; |
+ root_scroll_delta += info.scrolls[i].scroll_delta; |
else |
layer->SetScrollOffset(layer->scroll_offset() + |
- info.scrolls[i].scrollDelta); |
+ info.scrolls[i].scroll_delta); |
} |
- if (!root_scroll_delta.IsZero() || info.pageScaleDelta != 1.f) |
- client_->ApplyScrollAndScale(root_scroll_delta, info.pageScaleDelta); |
+ if (!root_scroll_delta.IsZero() || info.page_scale_delta != 1.f) |
+ client_->ApplyScrollAndScale(root_scroll_delta, info.page_scale_delta); |
} |
void LayerTreeHost::SetImplTransform(const gfx::Transform& transform) { |