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

Unified Diff: ash/common/wm/forwarding_layer_delegate.h

Issue 2254733003: Add ui::LayerObserver and use it to update Alt+Tab previews as needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix for other test Created 4 years, 4 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 | ash/common/wm/forwarding_layer_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/forwarding_layer_delegate.h
diff --git a/ash/common/wm/forwarding_layer_delegate.h b/ash/common/wm/forwarding_layer_delegate.h
index f8542a3ce7d8699d63c47bf27d0b89bf62ab4649..446db9c747a7f508b2896232ad3e5e8cb59b789e 100644
--- a/ash/common/wm/forwarding_layer_delegate.h
+++ b/ash/common/wm/forwarding_layer_delegate.h
@@ -6,7 +6,9 @@
#define ASH_COMMON_WM_FORWARDING_LAYER_DELEGATE_H_
#include "base/macros.h"
+#include "base/scoped_observer.h"
#include "ui/compositor/layer_delegate.h"
+#include "ui/compositor/layer_observer.h"
namespace ui {
class Layer;
@@ -19,25 +21,33 @@ class WmWindow;
namespace wm {
// A layer delegate to paint the content of a recreated layer by delegating
-// the paint request to the original delegate. It checks if the original
-// delegate is still valid by traversing the original layers.
-class ForwardingLayerDelegate : public ui::LayerDelegate {
+// the paint request to the original delegate. It is a delegate of the recreated
+// layer and an observer of the original layer.
+class ForwardingLayerDelegate : public ui::LayerDelegate,
+ public ui::LayerObserver {
public:
- ForwardingLayerDelegate(WmWindow* original_window,
- ui::LayerDelegate* delegate);
+ ForwardingLayerDelegate(ui::Layer* new_layer, ui::Layer* original_layer);
~ForwardingLayerDelegate() override;
- private:
- bool IsDelegateValid(ui::Layer* layer) const;
-
// ui:LayerDelegate:
void OnPaintLayer(const ui::PaintContext& context) override;
void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override;
void OnDeviceScaleFactorChanged(float device_scale_factor) override;
base::Closure PrepareForLayerBoundsChange() override;
- WmWindow* original_window_;
- ui::LayerDelegate* original_delegate_;
+ // ui::LayerObserver:
+ void DidPaintLayer(ui::Layer* layer, const gfx::Rect& rect) override;
+ void SurfaceChanged(ui::Layer* layer) override;
+ void LayerDestroyed(ui::Layer* layer) override;
+
+ private:
+ // The layer for which |this| is the delegate.
+ ui::Layer* client_layer_;
+
+ // The layer that was recreated to replace |new_layer_|.
+ ui::Layer* original_layer_;
+
+ ScopedObserver<ui::Layer, ui::LayerObserver> scoped_observer_;
DISALLOW_COPY_AND_ASSIGN(ForwardingLayerDelegate);
};
« no previous file with comments | « no previous file | ash/common/wm/forwarding_layer_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698