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

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

Issue 2730015: Mac/clang: Uncontentious fixes. (Closed)
Patch Set: '' Created 10 years, 6 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #import <QuartzCore/CALayer.h> 9 #import <QuartzCore/CALayer.h>
10 10
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 virtual void AcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window); 204 virtual void AcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window);
205 // Draws the current GPU-accelerated plug-in instances into the given context. 205 // Draws the current GPU-accelerated plug-in instances into the given context.
206 virtual void DrawAcceleratedSurfaceInstances(CGLContextObj context); 206 virtual void DrawAcceleratedSurfaceInstances(CGLContextObj context);
207 // Informs the plug-in instances that their drawing context has changed. 207 // Informs the plug-in instances that their drawing context has changed.
208 virtual void AcceleratedSurfaceContextChanged(); 208 virtual void AcceleratedSurfaceContextChanged();
209 209
210 virtual void SetVisuallyDeemphasized(bool deemphasized); 210 virtual void SetVisuallyDeemphasized(bool deemphasized);
211 211
212 void KillSelf(); 212 void KillSelf();
213 213
214 void set_parent_view(BaseView* parent_view) { parent_view_ = parent_view; } 214 void set_parent_view(NSView* parent_view) { parent_view_ = parent_view; }
215 215
216 // These member variables should be private, but the associated ObjC class 216 // These member variables should be private, but the associated ObjC class
217 // needs access to them and can't be made a friend. 217 // needs access to them and can't be made a friend.
218 218
219 // The associated Model. Can be NULL if Destroy() is called when 219 // The associated Model. Can be NULL if Destroy() is called when
220 // someone (other than superview) has retained |cocoa_view_|. 220 // someone (other than superview) has retained |cocoa_view_|.
221 RenderWidgetHost* render_widget_host_; 221 RenderWidgetHost* render_widget_host_;
222 222
223 // This is true when we are currently painting and thus should handle extra 223 // This is true when we are currently painting and thus should handle extra
224 // paint requests by expanding the invalid rect rather than actually painting. 224 // paint requests by expanding the invalid rect rather than actually painting.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // an "external popup." 272 // an "external popup."
273 bool is_popup_menu_; 273 bool is_popup_menu_;
274 274
275 // The text to be shown in the tooltip, supplied by the renderer. 275 // The text to be shown in the tooltip, supplied by the renderer.
276 std::wstring tooltip_text_; 276 std::wstring tooltip_text_;
277 277
278 // Factory used to safely scope delayed calls to ShutdownHost(). 278 // Factory used to safely scope delayed calls to ShutdownHost().
279 ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_; 279 ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_;
280 280
281 // Used for positioning a popup menu. 281 // Used for positioning a popup menu.
282 BaseView* parent_view_; 282 NSView* parent_view_;
283 283
284 // Helper class for managing instances of accelerated plug-ins. 284 // Helper class for managing instances of accelerated plug-ins.
285 AcceleratedSurfaceContainerManagerMac plugin_container_manager_; 285 AcceleratedSurfaceContainerManagerMac plugin_container_manager_;
286 286
287 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 287 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
288 }; 288 };
289 289
290 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 290 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698