O2D: Several (unrelated) improvements:...

core/cross/cairo/layer.cc

 /*
  * Copyright 2010, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 24 matching lines @@
 #include "core/cross/error.h"
 #include "core/cross/renderer.h"
 #include "core/cross/cairo/renderer_cairo.h"
 
 namespace o3d {
 
 namespace o2d {
 
 O3D_DEFN_CLASS(Layer, ObjectBase);
 
+Layer::~Layer() {
+  Renderer* renderer = service_locator()->GetService<Renderer>();
+  RendererCairo* renderer_cairo = down_cast<RendererCairo*>(renderer);
+  renderer_cairo->RemoveLayer(this);
+}
+
 Layer::Layer(ServiceLocator* service_locator)
     : ObjectBase(service_locator),
       alpha_(1.0),
       x_(0),
       y_(0),
+      z_(0),
       width_(0),
       height_(0),
       scale_x_(1.0),
       scale_y_(1.0) {
   DLOG(INFO) << "Create Layer";
+  Renderer* renderer = service_locator->GetService<Renderer>();
+  RendererCairo* renderer_cairo = down_cast<RendererCairo*>(renderer);
+  renderer_cairo->AddLayer(this);
 }
 
 ObjectBase::Ref Layer::Create(ServiceLocator* service_locator) {
   Renderer* renderer = service_locator->GetService<Renderer>();
   if (NULL == renderer) {
     O3D_ERROR(service_locator) << "No Render Device Available";
     return ObjectBase::Ref();
   }
 
-  Layer* image = new Layer(service_locator);
+  Layer* layer = new Layer(service_locator);
 
-  RendererCairo* renderer2d = down_cast<RendererCairo*>(renderer);
-  renderer2d->AddLayer(image);
-
-  return ObjectBase::Ref(image);
+  return ObjectBase::Ref(layer);
 }
 
 }  // namespace o2d
 
 }  // namespace o3d