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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 11418244: Order the GL overlays above windows if possible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops, null check Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 // references to it must become NULL." 192 // references to it must become NULL."
193 // 193 //
194 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h. 194 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h.
195 class RenderWidgetHostViewMac : public RenderWidgetHostViewBase { 195 class RenderWidgetHostViewMac : public RenderWidgetHostViewBase {
196 public: 196 public:
197 virtual ~RenderWidgetHostViewMac(); 197 virtual ~RenderWidgetHostViewMac();
198 198
199 RenderWidgetHostViewCocoa* cocoa_view() const { return cocoa_view_; } 199 RenderWidgetHostViewCocoa* cocoa_view() const { return cocoa_view_; }
200 200
201 void SetDelegate(NSObject<RenderWidgetHostViewMacDelegate>* delegate); 201 void SetDelegate(NSObject<RenderWidgetHostViewMacDelegate>* delegate);
202 void SetAllowOverlappingViews(bool overlapping);
202 203
203 // RenderWidgetHostView implementation. 204 // RenderWidgetHostView implementation.
204 virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE; 205 virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
205 virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE; 206 virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
206 virtual void SetSize(const gfx::Size& size) OVERRIDE; 207 virtual void SetSize(const gfx::Size& size) OVERRIDE;
207 virtual void SetBounds(const gfx::Rect& rect) OVERRIDE; 208 virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;
208 virtual gfx::NativeView GetNativeView() const OVERRIDE; 209 virtual gfx::NativeView GetNativeView() const OVERRIDE;
209 virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE; 210 virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
210 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; 211 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
211 virtual bool HasFocus() const OVERRIDE; 212 virtual bool HasFocus() const OVERRIDE;
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 419
419 typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*> 420 typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*>
420 PluginViewMap; 421 PluginViewMap;
421 PluginViewMap plugin_views_; // Weak values. 422 PluginViewMap plugin_views_; // Weak values.
422 423
423 // Helper class for managing instances of accelerated plug-ins. 424 // Helper class for managing instances of accelerated plug-ins.
424 AcceleratedSurfaceContainerManagerMac plugin_container_manager_; 425 AcceleratedSurfaceContainerManagerMac plugin_container_manager_;
425 426
426 scoped_ptr<CompositingIOSurfaceMac> compositing_iosurface_; 427 scoped_ptr<CompositingIOSurfaceMac> compositing_iosurface_;
427 428
429 // Whether to allow overlapping views.
430 bool allow_overlapping_views_;
431
428 NSWindow* pepper_fullscreen_window() const { 432 NSWindow* pepper_fullscreen_window() const {
429 return pepper_fullscreen_window_; 433 return pepper_fullscreen_window_;
430 } 434 }
431 435
432 RenderWidgetHostViewMac* fullscreen_parent_host_view() const { 436 RenderWidgetHostViewMac* fullscreen_parent_host_view() const {
433 return fullscreen_parent_host_view_; 437 return fullscreen_parent_host_view_;
434 } 438 }
435 439
436 private: 440 private:
437 friend class RenderWidgetHostView; 441 friend class RenderWidgetHostView;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 492
489 // The current caret bounds. 493 // The current caret bounds.
490 gfx::Rect caret_rect_; 494 gfx::Rect caret_rect_;
491 495
492 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 496 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
493 }; 497 };
494 498
495 } // namespace content 499 } // namespace content
496 500
497 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 501 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698