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

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

Issue 9838071: Implement pepper flash fullscreen on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 8 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 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 #pragma once 7 #pragma once
8 8
9 #import <Cocoa/Cocoa.h> 9 #import <Cocoa/Cocoa.h>
10 10
11 #include "base/memory/scoped_nsobject.h" 11 #include "base/memory/scoped_nsobject.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/time.h" 14 #include "base/time.h"
15 #include "content/browser/accessibility/browser_accessibility_delegate_mac.h" 15 #include "content/browser/accessibility/browser_accessibility_delegate_mac.h"
16 #include "content/browser/renderer_host/accelerated_surface_container_manager_ma c.h" 16 #include "content/browser/renderer_host/accelerated_surface_container_manager_ma c.h"
17 #include "content/browser/renderer_host/render_widget_host_view_base.h" 17 #include "content/browser/renderer_host/render_widget_host_view_base.h"
18 #include "content/common/edit_command.h" 18 #include "content/common/edit_command.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderli ne.h" 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderli ne.h"
20 #include "ui/base/cocoa/base_view.h" 20 #include "ui/base/cocoa/base_view.h"
21 #include "webkit/glue/webcursor.h" 21 #include "webkit/glue/webcursor.h"
22 22
23 @class AcceleratedPluginView; 23 @class AcceleratedPluginView;
24 @class FullscreenWindowManager;
24 class RenderWidgetHostImpl; 25 class RenderWidgetHostImpl;
25 class RenderWidgetHostViewMac; 26 class RenderWidgetHostViewMac;
26 @protocol RenderWidgetHostViewMacDelegate; 27 @protocol RenderWidgetHostViewMacDelegate;
27 class RenderWidgetHostViewMacEditCommandHelper; 28 class RenderWidgetHostViewMacEditCommandHelper;
28 @class ToolTip; 29 @class ToolTip;
29 30
30 @protocol RenderWidgetHostViewMacOwner 31 @protocol RenderWidgetHostViewMacOwner
31 - (RenderWidgetHostViewMac*)renderWidgetHostViewMac; 32 - (RenderWidgetHostViewMac*)renderWidgetHostViewMac;
32 @end 33 @end
33 34
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 ui::TextInputType text_input_type_; 341 ui::TextInputType text_input_type_;
341 bool can_compose_inline_; 342 bool can_compose_inline_;
342 343
343 typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*> 344 typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*>
344 PluginViewMap; 345 PluginViewMap;
345 PluginViewMap plugin_views_; // Weak values. 346 PluginViewMap plugin_views_; // Weak values.
346 347
347 // Helper class for managing instances of accelerated plug-ins. 348 // Helper class for managing instances of accelerated plug-ins.
348 AcceleratedSurfaceContainerManagerMac plugin_container_manager_; 349 AcceleratedSurfaceContainerManagerMac plugin_container_manager_;
349 350
351 NSWindow* fullscreen_window() const { return fullscreen_window_; }
Nico 2012/03/30 19:33:57 pepper_fullscreen_window()?
sail 2012/03/30 23:06:06 Done.
352
350 private: 353 private:
351 friend class content::RenderWidgetHostView; 354 friend class content::RenderWidgetHostView;
352 355
353 // The view will associate itself with the given widget. The native view must 356 // The view will associate itself with the given widget. The native view must
354 // be hooked up immediately to the view hierarchy, or else when it is 357 // be hooked up immediately to the view hierarchy, or else when it is
355 // deleted it will delete this out from under the caller. 358 // deleted it will delete this out from under the caller.
356 explicit RenderWidgetHostViewMac(RenderWidgetHost* widget); 359 explicit RenderWidgetHostViewMac(RenderWidgetHost* widget);
357 360
358 // If the window is at the root of the plugin container hierachy, 361 // If the window is at the root of the plugin container hierachy,
359 // we need to update the geometry manually. 362 // we need to update the geometry manually.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 398
396 bool accelerated_compositing_active_; 399 bool accelerated_compositing_active_;
397 400
398 // When rendering transitions from gpu to software, the gpu widget can't be 401 // When rendering transitions from gpu to software, the gpu widget can't be
399 // hidden until the software backing store has been updated. This variable is 402 // hidden until the software backing store has been updated. This variable is
400 // set when the gpu widget needs to be hidden once a paint is completed. 403 // set when the gpu widget needs to be hidden once a paint is completed.
401 bool needs_gpu_visibility_update_after_repaint_; 404 bool needs_gpu_visibility_update_after_repaint_;
402 405
403 gfx::PluginWindowHandle compositing_surface_; 406 gfx::PluginWindowHandle compositing_surface_;
404 407
408 // The fullscreen window used for pepper flash.
409 scoped_nsobject<NSWindow> fullscreen_window_;
410 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
411
405 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 412 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
406 }; 413 };
407 414
408 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 415 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698