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

Unified Diff: ui/views/cocoa/bridged_native_widget.h

Issue 1796773003: Implement NativeWidgetMac::ReorderNativeViews (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits and xcode 7 compilation. Created 4 years, 9 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 | ui/views/cocoa/bridged_native_widget.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/cocoa/bridged_native_widget.h
diff --git a/ui/views/cocoa/bridged_native_widget.h b/ui/views/cocoa/bridged_native_widget.h
index 8f6523042de9eead7500964bd6d0daee8883ae63..fc521597ee7fc79d28bc3a367c2d08a99890ee7b 100644
--- a/ui/views/cocoa/bridged_native_widget.h
+++ b/ui/views/cocoa/bridged_native_widget.h
@@ -49,6 +49,9 @@ class VIEWS_EXPORT BridgedNativeWidget
public ui::AcceleratedWidgetMacNSView,
public BridgedNativeWidgetOwner {
public:
+ // Contains NativeViewHost->gfx::NativeView associations.
+ using AssociatedViews = std::map<const views::View*, NSView*>;
+
// Ways of changing the visibility of the bridged NSWindow.
enum WindowVisibilityState {
HIDE_WINDOW, // Hides with -[NSWindow orderOut:].
@@ -156,6 +159,12 @@ class VIEWS_EXPORT BridgedNativeWidget
// Creates a ui::Compositor which becomes responsible for drawing the window.
void CreateLayer(ui::LayerType layer_type, bool translucent);
+ // Updates |associated_views_| on NativeViewHost::Attach()/Detach().
+ void SetAssociationForView(const views::View* view, NSView* native_view);
+ void ClearAssociationForView(const views::View* view);
+ // Sorts child NSViews according to NativeViewHosts order in views hierarchy.
+ void ReorderChildViews();
+
NativeWidgetMac* native_widget_mac() { return native_widget_mac_; }
BridgedContentView* ns_view() { return bridged_view_; }
NSWindow* ns_window() { return window_; }
@@ -289,6 +298,8 @@ class VIEWS_EXPORT BridgedNativeWidget
// shadow needs to be invalidated when a frame is received for the new shape.
bool invalidate_shadow_on_frame_swap_ = false;
+ AssociatedViews associated_views_;
+
DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidget);
};
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_native_widget.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698