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

Unified Diff: src/platform/window_manager/compositor.h

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 | « no previous file | src/platform/window_manager/mock_compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform/window_manager/compositor.h
diff --git a/src/platform/window_manager/compositor.h b/src/platform/window_manager/compositor.h
index ee0a2c6cf0ddfca5e3e1c7f8d89d8da2b27dcd42..ecb211c06c0d88d2998f48d3b8bbe0ab049f52cc 100644
--- a/src/platform/window_manager/compositor.h
+++ b/src/platform/window_manager/compositor.h
@@ -194,7 +194,7 @@ class MockCompositor : public Compositor {
}
// 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_; }
@@ -228,13 +228,14 @@ class MockCompositor : public Compositor {
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_;
@@ -257,6 +258,7 @@ class MockCompositor : public Compositor {
ContainerActor();
virtual ~ContainerActor();
void AddActor(Compositor::Actor* actor);
+ virtual std::string GetDebugString(int indent_level);
Stacker<Actor*>* stacked_children() { return stacked_children_.get(); }
« no previous file with comments | « no previous file | src/platform/window_manager/mock_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698