wm: Fix override-redirect window stacking bug.

src/platform/window_manager/compositor.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WINDOW_MANAGER_COMPOSITOR_H_
 #define WINDOW_MANAGER_COMPOSITOR_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 176 matching lines @@
     bool visible() const { return visible_; }
     bool is_dimmed() const { return is_dimmed_; }
     int num_moves() const { return num_moves_; }
 
     MockCompositor::ContainerActor* parent() { return parent_; }
     void set_parent(MockCompositor::ContainerActor* new_parent) {
       parent_ = new_parent;
     }
 
     // Begin Compositor::Actor methods
-    void SetName(const std::string& name) {}
+    void SetName(const std::string& name) { name_ = name; }
     int GetWidth() { return width_; }
     int GetHeight() { return height_; }
     int GetX() { return x_; }
     int GetY() { return y_; }
     double GetXScale() { return scale_x_; }
     double GetYScale() { return scale_y_; }
     void SetVisibility(bool visible) { visible_ = visible; }
     void SetSize(int width, int height) {
       width_ = width;
       height_ = height;
@@ skipping 13 matching lines @@
     void SetOpacity(double opacity, int anim_ms) { opacity_ = opacity; }
     void SetTilt(double tilt, int anim_ms) {
       tilt_ = tilt;
     }
     double GetTilt() const { return tilt_; }
     void SetClip(int x, int y, int width, int height) {}
     void Raise(Compositor::Actor* other);
     void Lower(Compositor::Actor* other);
     void RaiseToTop();
     void LowerToBottom();
-    virtual std::string GetDebugString(int debug_level) { return ""; }
+    virtual std::string GetDebugString(int indent_level);
     void ShowDimmed(bool dimmed, int anim_ms) { is_dimmed_ = dimmed; }
     // End Compositor::Actor methods
 
     virtual void SetSizeImpl(int width, int height) {}
 
    protected:
+    std::string name_;
     int x_, y_;
     int width_, height_;
     double scale_x_, scale_y_;
     double opacity_;
     double tilt_;
     bool visible_;
     bool is_dimmed_;
 
     // Number of times that the actor has been moved.
     int num_moves_;
 
     MockCompositor::ContainerActor* parent_;  // not owned
 
     DISALLOW_COPY_AND_ASSIGN(Actor);
   };
 
   class ContainerActor : public MockCompositor::Actor,
                          virtual public Compositor::ContainerActor {
    public:
     ContainerActor();
     virtual ~ContainerActor();
     void AddActor(Compositor::Actor* actor);
+    virtual std::string GetDebugString(int indent_level);
 
     Stacker<Actor*>* stacked_children() { return stacked_children_.get(); }
 
     // Get an index representing an actor's stacking position inside of
     // this container.  Objects stacked higher have lower indexes.
     // Convenient for testing.
     int GetStackingIndex(Compositor::Actor* actor);
 
    private:
     scoped_ptr<Stacker<Actor*> > stacked_children_;
@@ skipping 78 matching lines @@
  private:
   XConnection* xconn_;  // not owned
   StageActor default_stage_;
 
   DISALLOW_COPY_AND_ASSIGN(MockCompositor);
 };
 
 }  // namespace window_manager
 
 #endif  // WINDOW_MANAGER_COMPOSITOR_H_