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..ede700109143c67a78c758a659e5017ac572efc2 100644 |
--- a/ui/base/cocoa/underlay_opengl_hosting_window.mm |
+++ b/ui/base/cocoa/underlay_opengl_hosting_window.mm |
@@ -104,43 +104,41 @@ 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]; |
- } |
+ // Hole punching is used when IOSurfaces are used to transport. |
+ // Therefore the window must always be non-opaque whether or not it's |
+ // titled if we want hole punching to work. |
Avi (use Gerrit)
2012/08/10 20:29:07
This comment is now a little awkward. Try:
OpenGL
Nico
2012/08/10 20:40:12
Done.
|
+ [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.) |
Avi (use Gerrit)
2012/08/10 20:29:07
Remove the parenthesized sentence; it is obsolete
Nico
2012/08/10 20:40:12
Done.
|
+ [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]; |
} |
} |