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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 388803003: [Mac] Replace SetOverlayView with AllowOtherViews. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
Index: content/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 74f0c0b0c7e996260cad79e822e30c62b9f4a053..abf144677e6f73afdbec15575063b404860e7da6 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -235,6 +235,7 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
CONTENT_EXPORT void SetDelegate(
NSObject<RenderWidgetHostViewMacDelegate>* delegate);
void SetAllowOverlappingViews(bool overlapping);
+ void SetAllowPauseForResizeOrRepaint(bool allow);
// RenderWidgetHostView implementation.
virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
@@ -372,15 +373,6 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
// compositing state.
void GotAcceleratedCompositingError();
- // Sets the overlay view, which should be drawn in the same IOSurface
- // atop of this view, if both views are drawing accelerated content.
- // Overlay is stored as a weak ptr.
- void SetOverlayView(RenderWidgetHostViewMac* overlay,
- const gfx::Point& offset);
-
- // Removes the previously set overlay view.
- void RemoveOverlayView();
-
// Returns true and stores first rectangle for character range if the
// requested |range| is already cached, otherwise returns false.
// Exposed for testing.
@@ -593,6 +585,9 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
// in.
bool is_paused_for_resize_or_repaint_;
+ // Whether it's allowed to pause waiting for a new frame.
+ bool allow_pause_for_resize_or_repaint_;
+
// The text to be shown in the tooltip, supplied by the renderer.
base::string16 tooltip_text_;
@@ -611,20 +606,6 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
// Our parent host view, if this is fullscreen. NULL otherwise.
RenderWidgetHostViewMac* fullscreen_parent_host_view_;
- // The overlay view which is rendered above this one in the same
- // accelerated IOSurface.
- // Overlay view has |underlay_view_| set to this view.
- base::WeakPtr<RenderWidgetHostViewMac> overlay_view_;
-
- // The underlay view which this view is rendered above in the same
- // accelerated IOSurface.
- // Underlay view has |overlay_view_| set to this view.
- base::WeakPtr<RenderWidgetHostViewMac> underlay_view_;
-
- // Factory used to safely reference overlay view set in SetOverlayView.
- base::WeakPtrFactory<RenderWidgetHostViewMac>
- overlay_view_weak_factory_;
-
// Display link for getting vsync info.
scoped_refptr<DisplayLinkMac> display_link_;

Powered by Google App Engine
This is Rietveld 408576698