O2D: Several (unrelated) improvements:...

core/cross/cairo/renderer_cairo.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 54 matching lines @@
   DLOG(INFO) << "To Destroy";
 
   if (main_surface_ != NULL) {
     cairo_surface_destroy(main_surface_);
     main_surface_= NULL;
   }
 
   display_ = NULL;
 }
 
+// Comparison predicate for STL sort.
+bool LayerZValueLessThan(const Layer* first, const Layer* second) {
+  return first->z() < second->z();
+}
+
 void RendererCairo::Paint() {
+  // TODO(tschmelcher): Don't keep creating and destroying the drawing context.
   cairo_t* current_drawing = cairo_create(main_surface_);
 
+  // Redirect drawing to an off-screen surface (holding only colour information,
+  // without an alpha channel).
+  cairo_push_group_with_content(current_drawing, CAIRO_CONTENT_COLOR);
+
+  // Sort layers by z value.
+  // TODO(tschmelcher): Only sort when changes are made.
+  layer_list_.sort(LayerZValueLessThan);
+
   // Paint the background.
   PaintBackground(current_drawing);
 
   // Core process of painting.
-  for (LayerRefList::iterator i = layer_list_.begin();
+  for (LayerList::iterator i = layer_list_.begin();
        i != layer_list_.end(); i++) {
     // Put the state with no mask to the stack.
     cairo_save(current_drawing);
 
     // Preparing and updating the Layer.
     Layer* cur = *i;
     Pattern* pattern = cur->pattern();
     if (!pattern) {
       // Skip layers with no pattern assigned.
       continue;
     }
 
     // Masking areas for other scene.
-    LayerRefList::iterator start_mask_it = i;
+    LayerList::iterator start_mask_it = i;
     start_mask_it++;
     MaskArea(current_drawing, start_mask_it);
 
     cairo_translate(current_drawing, cur->x(), cur->y());
 
     cairo_scale(current_drawing, cur->scale_x(), cur->scale_y());
 
     // Painting the image to the surface.
     cairo_set_source(current_drawing, pattern->pattern());
 
     cairo_paint_with_alpha(current_drawing, cur->alpha());
 
     // Restore to the state with no mask.
     cairo_restore(current_drawing);
   }
+
+  // Finish off-screen drawing and make the off-screen surface the source for
+  // paints to the screen.
+  cairo_pop_group_to_source(current_drawing);
+
+  // Paint the off-screen surface to the screen.
+  cairo_paint(current_drawing);
+
   cairo_destroy(current_drawing);
 }
 
 void RendererCairo::PaintBackground(cairo_t* cr) {
   cairo_save(cr);
   MaskArea(cr, layer_list_.begin());
 
   cairo_rectangle(cr, 0, 0, display_width(), display_height());
   cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
   cairo_fill(cr);
   cairo_restore(cr);
 }
 
-void RendererCairo::MaskArea(cairo_t* cr,  LayerRefList::iterator it) {
+void RendererCairo::MaskArea(cairo_t* cr,  LayerList::iterator it) {
   cairo_set_fill_rule(cr, CAIRO_FILL_RULE_EVEN_ODD);
 
-  for (LayerRefList::iterator i = it; i != layer_list_.end(); i++) {
+  for (LayerList::iterator i = it; i != layer_list_.end(); i++) {
     // Preparing and updating the Layer.
     Layer* cur_mask = *i;
 
     cairo_rectangle(cr, 0, 0, display_width(), display_height());
     cairo_rectangle(cr,
                     cur_mask->x(),
                     cur_mask->y(),
                     cur_mask->width(),
                     cur_mask->height());
     cairo_clip(cr);
   }
 }
 
 void RendererCairo::AddLayer(Layer* image) {
-  layer_list_.push_front(Layer::Ref(image));
+  layer_list_.push_front(image);
+}
+
+void RendererCairo::RemoveLayer(Layer* image) {
+  layer_list_.remove(image);
 }
 
 void RendererCairo::InitCommon() {
   main_surface_ = cairo_xlib_surface_create(display_, window_,
                                             XDefaultVisual(display_, 0),
                                             display_width(), display_height());
 }
 
 void RendererCairo::UninitCommon() {
   // Don't need to do anything.
@@ skipping 53 matching lines @@
 void RendererCairo::PlatformSpecificFinishRendering() {
   Paint();
 }
 
 // The platform specific part of Present.
 void RendererCairo::PlatformSpecificPresent() {
   // Don't need to do anything.
 }
 
 // TODO(fransiskusx): DO need to implement before shipped.
-// Removes the Layer from the array.
-void RendererCairo::RemoveLayer(Layer* image) {
-  NOTIMPLEMENTED();
-}
-
-// TODO(fransiskusx): DO need to implement before shipped.
 // Get a single fullscreen display mode by id.
 // Returns true on success, false on error.
 bool RendererCairo::GetDisplayMode(int id, DisplayMode* mode) {
   NOTIMPLEMENTED();
   return true;
 }
 
 // TODO(fransiskusx):  DO need to implement before shipped.
 // Get a vector of the available fullscreen display modes.
 // Clears *modes on error.
@@ skipping 179 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void RendererCairo::PopRenderStates() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace o2d
 
 }  // namespace o3d