| 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 ee98af38e5ca78eac7265068d239d0a1d957927b..d5e874ecf82b50209244ce62fa3414103210eadc 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -709,9 +709,9 @@ static void RemoveRenderPassesRecursive(RenderPass::Id remove_render_pass_id,
|
| // Now follow up for all RenderPass quads and remove their RenderPasses
|
| // recursively.
|
| const QuadList& quad_list = removed_pass->quad_list;
|
| - QuadList::constBackToFrontIterator quad_list_iterator =
|
| - quad_list.backToFrontBegin();
|
| - for (; quad_list_iterator != quad_list.backToFrontEnd();
|
| + QuadList::ConstBackToFrontIterator quad_list_iterator =
|
| + quad_list.BackToFrontBegin();
|
| + for (; quad_list_iterator != quad_list.BackToFrontEnd();
|
| ++quad_list_iterator) {
|
| DrawQuad* current_quad = (*quad_list_iterator);
|
| if (current_quad->material != DrawQuad::RENDER_PASS)
|
| @@ -749,9 +749,9 @@ bool LayerTreeHostImpl::CullRenderPassesWithNoQuads::ShouldRemoveRenderPass(
|
|
|
| // If any quad or RenderPass draws into this RenderPass, then keep it.
|
| const QuadList& quad_list = render_pass->quad_list;
|
| - for (QuadList::constBackToFrontIterator quad_list_iterator =
|
| - quad_list.backToFrontBegin();
|
| - quad_list_iterator != quad_list.backToFrontEnd();
|
| + for (QuadList::ConstBackToFrontIterator quad_list_iterator =
|
| + quad_list.BackToFrontBegin();
|
| + quad_list_iterator != quad_list.BackToFrontEnd();
|
| ++quad_list_iterator) {
|
| DrawQuad* current_quad = *quad_list_iterator;
|
|
|
| @@ -783,10 +783,10 @@ void LayerTreeHostImpl::RemoveRenderPasses(RenderPassCuller culler,
|
| it = culler.RenderPassListNext(it)) {
|
| const RenderPass* current_pass = frame->render_passes[it];
|
| const QuadList& quad_list = current_pass->quad_list;
|
| - QuadList::constBackToFrontIterator quad_list_iterator =
|
| - quad_list.backToFrontBegin();
|
| + QuadList::ConstBackToFrontIterator quad_list_iterator =
|
| + quad_list.BackToFrontBegin();
|
|
|
| - for (; quad_list_iterator != quad_list.backToFrontEnd();
|
| + for (; quad_list_iterator != quad_list.BackToFrontEnd();
|
| ++quad_list_iterator) {
|
| DrawQuad* current_quad = *quad_list_iterator;
|
|
|
| @@ -1040,9 +1040,9 @@ gfx::SizeF LayerTreeHostImpl::VisibleViewportSize() const {
|
| clip_layer->masks_to_bounds())
|
| dip_size = clip_layer->bounds();
|
|
|
| - float topOffset =
|
| + float top_offset =
|
| top_controls_manager_ ? top_controls_manager_->content_top_offset() : 0.f;
|
| - return gfx::SizeF(dip_size.width(), dip_size.height() - topOffset);
|
| + return gfx::SizeF(dip_size.width(), dip_size.height() - top_offset);
|
| }
|
|
|
| const LayerTreeSettings& LayerTreeHostImpl::Settings() const {
|
| @@ -1349,7 +1349,7 @@ bool LayerTreeHostImpl::EnsureRenderSurfaceLayerList() {
|
|
|
| InputHandlerClient::ScrollStatus LayerTreeHostImpl::ScrollBegin(
|
| gfx::Point viewport_point, InputHandlerClient::ScrollInputType type) {
|
| - TRACE_EVENT0("cc", "LayerTreeHostImpl::scrollBegin");
|
| + TRACE_EVENT0("cc", "LayerTreeHostImpl::ScrollBegin");
|
|
|
| if (top_controls_manager_)
|
| top_controls_manager_->ScrollBegin();
|
|
|