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

Unified Diff: ui/base/cocoa/underlay_opengl_hosting_window.mm

Issue 10825302: mac: Remove more 10.5-only code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak comments Created 8 years, 4 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 | « remoting/host/video_frame_capturer_unittest.cc ('k') | webkit/plugins/npapi/plugin_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/underlay_opengl_hosting_window.mm
diff --git a/ui/base/cocoa/underlay_opengl_hosting_window.mm b/ui/base/cocoa/underlay_opengl_hosting_window.mm
index 4ef7092144e253e9d6ebb18776768d1c31c34d7a..48833e8fbb2671ebd8220d34a14b26a8847b571b 100644
--- a/ui/base/cocoa/underlay_opengl_hosting_window.mm
+++ b/ui/base/cocoa/underlay_opengl_hosting_window.mm
@@ -104,43 +104,39 @@ void RootDidAddSubview(id self, SEL _cmd, NSView* subview) {
styleMask:windowStyle
backing:bufferingType
defer:deferCreation])) {
- if (base::mac::IsOSSnowLeopardOrLater()) {
- // Hole punching is used when IOSurfaces are used to transport, which is
- // only on > 10.5. Therefore, on > 10.5, the window must always be
- // non-opaque whether or not it's titled if we want hole punching to work.
- [self setOpaque:NO];
-
- if (windowStyle & NSTitledWindowMask) {
- // Only fiddle with shadows if the window is a proper window with a
- // title bar and all. (The invisible opaque area technique only works on
- // > 10.5, but that is guaranteed by this point.)
- [self _setContentHasShadow:NO];
-
- NSView* rootView = [[self contentView] superview];
- const NSRect rootBounds = [rootView bounds];
-
- // On 10.7/8, the bottom corners of the window are rounded by magic at a
- // deeper level than the NSThemeFrame, so it is OK to have the opaques
- // go all the way to the bottom.
- const CGFloat kTopEdgeInset = 16;
- const CGFloat kAlphaValueJustOpaqueEnough = 0.002;
-
- scoped_nsobject<NSView> leftOpaque([[OpaqueView alloc] initWithFrame:
- NSMakeRect(NSMinX(rootBounds), NSMinY(rootBounds),
- 1, NSHeight(rootBounds) - kTopEdgeInset)]);
- [leftOpaque setAutoresizingMask:NSViewMaxXMargin |
- NSViewHeightSizable];
- [leftOpaque setAlphaValue:kAlphaValueJustOpaqueEnough];
- [rootView addSubview:leftOpaque];
-
- scoped_nsobject<NSView> rightOpaque([[OpaqueView alloc] initWithFrame:
- NSMakeRect(NSMaxX(rootBounds) - 1, NSMinY(rootBounds),
- 1, NSHeight(rootBounds) - kTopEdgeInset)]);
- [rightOpaque setAutoresizingMask:NSViewMinXMargin |
- NSViewHeightSizable];
- [rightOpaque setAlphaValue:kAlphaValueJustOpaqueEnough];
- [rootView addSubview:rightOpaque];
- }
+ // OpenGL-accelerated content works by punching holes in windows. Therefore
+ // all windows hosting OpenGL content must not be opaque.
+ [self setOpaque:NO];
+
+ if (windowStyle & NSTitledWindowMask) {
+ // Only fiddle with shadows if the window is a proper window with a
+ // title bar and all.
+ [self _setContentHasShadow:NO];
+
+ NSView* rootView = [[self contentView] superview];
+ const NSRect rootBounds = [rootView bounds];
+
+ // On 10.7/8, the bottom corners of the window are rounded by magic at a
+ // deeper level than the NSThemeFrame, so it is OK to have the opaques
+ // go all the way to the bottom.
+ const CGFloat kTopEdgeInset = 16;
+ const CGFloat kAlphaValueJustOpaqueEnough = 0.002;
+
+ scoped_nsobject<NSView> leftOpaque([[OpaqueView alloc] initWithFrame:
+ NSMakeRect(NSMinX(rootBounds), NSMinY(rootBounds),
+ 1, NSHeight(rootBounds) - kTopEdgeInset)]);
+ [leftOpaque setAutoresizingMask:NSViewMaxXMargin |
+ NSViewHeightSizable];
+ [leftOpaque setAlphaValue:kAlphaValueJustOpaqueEnough];
+ [rootView addSubview:leftOpaque];
+
+ scoped_nsobject<NSView> rightOpaque([[OpaqueView alloc] initWithFrame:
+ NSMakeRect(NSMaxX(rootBounds) - 1, NSMinY(rootBounds),
+ 1, NSHeight(rootBounds) - kTopEdgeInset)]);
+ [rightOpaque setAutoresizingMask:NSViewMinXMargin |
+ NSViewHeightSizable];
+ [rightOpaque setAlphaValue:kAlphaValueJustOpaqueEnough];
+ [rootView addSubview:rightOpaque];
}
}
« no previous file with comments | « remoting/host/video_frame_capturer_unittest.cc ('k') | webkit/plugins/npapi/plugin_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698