O2D: Several (unrelated) improvements:...

core/cross/cairo/layer.h

 /*
  * 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 32 matching lines @@
 namespace o3d {
 
 class IClassManager;
 
 namespace o2d {
 
 class Layer : public ObjectBase {
  public:
   typedef SmartPointer<Layer> Ref;
 
+  virtual ~Layer();
+
   Pattern* pattern() const {
     return pattern_;
   }
 
   void set_pattern(Pattern* pattern) {
     pattern_ = Pattern::Ref(pattern);
   }
 
   double alpha() const {
     return alpha_;
@@ skipping 12 matching lines @@
   }
 
   double y() const {
     return y_;
   }
 
   void set_y(double y) {
     y_ = y;
   }
 
+  double z() const {
+    return z_;
+  }
+
+  void set_z(double z) {
+    z_ = z;
+  }
+
   double width() const {
     return width_;
   }
 
   void set_width(double width) {
     width_ = width;
   }
 
   double height() const {
     return height_;
@@ skipping 30 matching lines @@
 
   // Transparancy of this layer.
   double alpha_;
 
   // The x coordinate of the top-left corner of this layer.
   double x_;
 
   // The y coordinate of the top-left corner of this layer.
   double y_;
 
+  // The z coordinate of the layer (used only to determine stacking order).
+  double z_;
+
   // The width of this layer.
   double width_;
 
   // The height of this layer.
   double height_;
 
   // A scaling factor to apply to the pattern's x-axis.
   double scale_x_;
 
   // A scaling factor to apply to the pattern's y-axis.
   double scale_y_;
 
   O3D_DECL_CLASS(Layer, ObjectBase)
 };  // Layer
 
 }  // namespace o2d
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_CAIRO_LAYER_H_