Prepare ui/compositor for WebLayer type change

ui/compositor/compositor.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/compositor.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 132 matching lines @@
       disable_schedule_composite_(false) {
   WebKit::WebLayerTreeView::Settings settings;
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   settings.showFPSCounter =
       command_line->HasSwitch(switches::kUIShowFPSCounter);
   settings.showPlatformLayerTree =
       command_line->HasSwitch(switches::kUIShowLayerTree);
   settings.refreshRate =
       test_compositor_enabled ? kTestRefreshRate : kDefaultRefreshRate;
 
+#if defined(WEBLAYER_IS_PURE_VIRTUAL)
+  host_.initialize(this, *root_web_layer_, settings);
+  root_web_layer_->setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
+#else
   host_.initialize(this, root_web_layer_, settings);
+  root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
+#endif
   host_.setSurfaceReady();
-  root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
 }
 
 Compositor::~Compositor() {
   // Don't call |CompositorDelegate::ScheduleDraw| from this point.
   delegate_ = NULL;
+#if !defined(WEBLAYER_IS_PURE_VIRTUAL)
   // There's a cycle between |root_web_layer_| and |host_|, which results in
   // leaking and/or crashing. Explicitly set the root layer to NULL so the cycle
   // is broken.
   host_.setRootLayer(NULL);
   if (root_layer_)
     root_layer_->SetCompositor(NULL);

[piman, 2012/08/16 23:55:30]

I'm pretty sure we still want to do this

+#endif
 
   // Stop all outstanding draws before telling the ContextFactory to tear
   // down any contexts that the |host_| may rely upon.
   host_.reset();
 
   if (!test_compositor_enabled)
     ContextFactory::GetInstance()->RemoveCompositor(this);
 }
 
 void Compositor::Initialize(bool use_thread) {
@@ skipping 28 matching lines @@
 }
 
 void Compositor::SetRootLayer(Layer* root_layer) {
   if (root_layer_ == root_layer)
     return;
   if (root_layer_)
     root_layer_->SetCompositor(NULL);
   root_layer_ = root_layer;
   if (root_layer_ && !root_layer_->GetCompositor())
     root_layer_->SetCompositor(this);
+#if defined(WEBLAYER_IS_PURE_VIRTUAL)
+  root_web_layer_->removeAllChildren();
+  if (root_layer_)
+    root_web_layer_->addChild(root_layer_->web_layer());
+#else
   root_web_layer_.removeAllChildren();
   if (root_layer_)
     root_web_layer_.addChild(root_layer_->web_layer());
+#endif
 }
 
 void Compositor::Draw(bool force_clear) {
   if (!root_layer_)
     return;
 
   last_started_frame_++;
   if (!g_compositor_thread)
     FOR_EACH_OBSERVER(CompositorObserver,
                       observer_list_,
@@ skipping 33 matching lines @@
   }
   return false;
 }
 
 void Compositor::SetScaleAndSize(float scale, const gfx::Size& size_in_pixel) {
   DCHECK_GT(scale, 0);
   if (size_in_pixel.IsEmpty() || scale <= 0)
     return;
   size_ = size_in_pixel;
   host_.setViewportSize(size_in_pixel);
+#if defined(WEBLAYER_IS_PURE_VIRTUAL)
+  root_web_layer_->setBounds(size_in_pixel);
+#else
   root_web_layer_.setBounds(size_in_pixel);
+#endif
 
   if (device_scale_factor_ != scale) {
     device_scale_factor_ = scale;
     if (root_layer_)
       root_layer_->OnDeviceScaleFactorChanged(scale);
   }
 }
 
 void Compositor::AddObserver(CompositorObserver* observer) {
   observer_list_.AddObserver(observer);
@@ skipping 178 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return test_compositor_enabled;
 }
 
 }  // namespace ui