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

Unified Diff: cc/trees/layer_tree_host.cc

Issue 12876006: Revert 189830 "cc: Chromify LayerTreeHostCommon" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1451/src/
Patch Set: 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/damage_tracker_unittest.cc ('k') | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host.cc
===================================================================
--- cc/trees/layer_tree_host.cc (revision 190264)
+++ cc/trees/layer_tree_host.cc (working copy)
@@ -293,7 +293,7 @@
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 {
@@ -702,14 +702,14 @@
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.
@@ -907,18 +907,18 @@
for (size_t i = 0; i < info.scrolls.size(); ++i) {
Layer* layer =
- LayerTreeHostCommon::FindLayerInSubtree(root_layer_.get(),
- info.scrolls[i].layer_id);
+ LayerTreeHostCommon::findLayerInSubtree(root_layer_.get(),
+ info.scrolls[i].layerId);
if (!layer)
continue;
if (layer == root_scroll_layer)
- root_scroll_delta += info.scrolls[i].scroll_delta;
+ root_scroll_delta += info.scrolls[i].scrollDelta;
else
layer->SetScrollOffset(layer->scroll_offset() +
- info.scrolls[i].scroll_delta);
+ info.scrolls[i].scrollDelta);
}
- if (!root_scroll_delta.IsZero() || info.page_scale_delta != 1.f)
- client_->ApplyScrollAndScale(root_scroll_delta, info.page_scale_delta);
+ if (!root_scroll_delta.IsZero() || info.pageScaleDelta != 1.f)
+ client_->ApplyScrollAndScale(root_scroll_delta, info.pageScaleDelta);
}
void LayerTreeHost::SetImplTransform(const gfx::Transform& transform) {
« no previous file with comments | « cc/trees/damage_tracker_unittest.cc ('k') | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698