O2D: Several (unrelated) improvements:...

core/cross/cairo/renderer_cairo.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 134 matching lines @@
   // current platform.
   virtual const int* GetRGBAUByteNSwizzleTable();
 
   // Overriden from Renderer
   void PushRenderStates(State* state);
 
   // Overrider from Renderer
   void PopRenderStates();
 
  protected:
-  typedef std::list<Layer::Ref> LayerRefList;
+  typedef std::list<Layer*> LayerList;
 
   // Keep the constructor protected so only factory methods can create
   // renderers.
   explicit RendererCairo(ServiceLocator* service_locator);
 
   // Sets rendering to the back buffer.
   virtual void SetBackBufferPlatformSpecific();
 
   // Sets the render surfaces on a specific platform.
   virtual void SetRenderSurfacesPlatformSpecific(
@@ skipping 46 matching lines @@
 
   // Sets the viewport. This is the platform specific version.
   virtual void SetViewportInPixels(int left,
                                    int top,
                                    int width,
                                    int height,
                                    float min_z,
                                    float max_z);
 
   // Mask the area of the current layer that will collide with other images.
-  void MaskArea(cairo_t* cr,  LayerRefList::iterator it);
+  void MaskArea(cairo_t* cr, LayerList::iterator it);
 
   // Paint the background with black color.
   // TODO(fransiskusx): Support changing the background color.
   void PaintBackground(cairo_t* cr);
 
   // Linux Client Display
   Display* display_;
   // Linux Client Window
   Window window_;
 
   // Main surface to render cairo
   cairo_surface_t* main_surface_;
 
   // Draw the background
   cairo_t* bg_drawing_;
 
   // Array of Layer
-  LayerRefList layer_list_;
+  LayerList layer_list_;
 };
 
 }  // namespace o2d
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_CAIRO_RENDERER_CAIRO_H_