Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Unified Diff: src/platform/window_manager/mock_compositor.cc

Issue 2078031: wm: Fix override-redirect window stacking bug. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222//chromeos.git
Patch Set: LOG(DFATAL) on invalid actor raise/lower Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/platform/window_manager/compositor.h ('k') | src/platform/window_manager/real_compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform/window_manager/mock_compositor.cc
diff --git a/src/platform/window_manager/mock_compositor.cc b/src/platform/window_manager/mock_compositor.cc
index 15af996e45dd6b0cd667aa9d992e2d8f3a579f05..5c9765a0990bdf3768a76bcbbbce185185782c16 100644
--- a/src/platform/window_manager/mock_compositor.cc
+++ b/src/platform/window_manager/mock_compositor.cc
@@ -9,6 +9,7 @@
#include "window_manager/x_connection.h"
using std::list;
+using std::string;
namespace window_manager {
@@ -57,6 +58,13 @@ void MockCompositor::Actor::LowerToBottom() {
parent_->stacked_children()->AddOnBottom(this);
}
+string MockCompositor::Actor::GetDebugString(int indent_level) {
+ string out;
+ out.assign(indent_level * 2, ' ');
+ out += (!name_.empty() ? name_ : "unnamed actor") + "\n";
+ return out;
+}
+
MockCompositor::ContainerActor::ContainerActor()
: stacked_children_(new Stacker<Actor*>) {
@@ -71,6 +79,15 @@ MockCompositor::ContainerActor::~ContainerActor() {
}
}
+string MockCompositor::ContainerActor::GetDebugString(int indent_level) {
+ string out = Actor::GetDebugString(indent_level);
+ for (list<Actor*>::const_iterator it = stacked_children_->items().begin();
+ it != stacked_children_->items().end(); ++it) {
+ out += (*it)->GetDebugString(indent_level + 1);
+ }
+ return out;
+}
+
void MockCompositor::ContainerActor::AddActor(Compositor::Actor* actor) {
MockCompositor::Actor* cast_actor =
dynamic_cast<MockCompositor::Actor*>(actor);
« no previous file with comments | « src/platform/window_manager/compositor.h ('k') | src/platform/window_manager/real_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698