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

Unified Diff: ui/compositor/compositor.cc

Issue 12774006: cc: Chromify Layer and LayerImpl classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MoreAndroidCompilings 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 | « content/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 4cb912297bb40c16604125d0115971c9ae9e55ac..0adfaaa5d59ec62ce6ec228124a097fbca4c9557 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -362,8 +362,8 @@ Compositor::Compositor(CompositorDelegate* delegate,
last_ended_frame_(0),
disable_schedule_composite_(false),
compositor_lock_(NULL) {
- root_web_layer_ = cc::Layer::create();
- root_web_layer_->setAnchorPoint(gfx::PointF(0.f, 0.f));
+ root_web_layer_ = cc::Layer::Create();
+ root_web_layer_->SetAnchorPoint(gfx::PointF(0.f, 0.f));
CommandLine* command_line = CommandLine::ForCurrentProcess();
cc::LayerTreeSettings settings;
@@ -438,9 +438,9 @@ void Compositor::SetRootLayer(Layer* root_layer) {
root_layer_ = root_layer;
if (root_layer_ && !root_layer_->GetCompositor())
root_layer_->SetCompositor(this);
- root_web_layer_->removeAllChildren();
+ root_web_layer_->RemoveAllChildren();
if (root_layer_)
- root_web_layer_->addChild(root_layer_->cc_layer());
+ root_web_layer_->AddChild(root_layer_->cc_layer());
}
void Compositor::SetHostHasTransparentBackground(
@@ -490,7 +490,7 @@ void Compositor::SetScaleAndSize(float scale, const gfx::Size& size_in_pixel) {
if (!size_in_pixel.IsEmpty()) {
size_ = size_in_pixel;
host_->setViewportSize(size_in_pixel, size_in_pixel);
- root_web_layer_->setBounds(size_in_pixel);
+ root_web_layer_->SetBounds(size_in_pixel);
}
if (device_scale_factor_ != scale) {
device_scale_factor_ = scale;
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698