Index: ui/compositor/compositor.cc |
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc |
index 14ceca4f9085784552b7062b3dc560ec8ccfcd8a..b14fc15635bf8979e8b46e5660c4793bd0e5f8b2 100644 |
--- a/ui/compositor/compositor.cc |
+++ b/ui/compositor/compositor.cc |
@@ -164,7 +164,7 @@ Compositor::~Compositor() { |
DCHECK(begin_frame_observer_list_.empty()); |
if (root_layer_) |
- root_layer_->SetCompositor(NULL); |
+ root_layer_->ResetCompositor(); |
// Stop all outstanding draws before telling the ContextFactory to tear |
// down any contexts that the |host_| may rely upon. |
@@ -186,13 +186,13 @@ void Compositor::SetRootLayer(Layer* root_layer) { |
if (root_layer_ == root_layer) |
return; |
if (root_layer_) |
- root_layer_->SetCompositor(NULL); |
+ root_layer_->ResetCompositor(); |
root_layer_ = root_layer; |
if (root_layer_ && !root_layer_->GetCompositor()) |
root_layer_->SetCompositor(this); |
root_web_layer_->RemoveAllChildren(); |
if (root_layer_) |
- root_web_layer_->AddChild(root_layer_->cc_layer()); |
+ root_layer_->SetCompositorRootLayer(root_web_layer_); |
} |
void Compositor::SetHostHasTransparentBackground( |