Index: chrome/browser/ui/cocoa/fast_resize_view.mm |
diff --git a/chrome/browser/ui/cocoa/fast_resize_view.mm b/chrome/browser/ui/cocoa/fast_resize_view.mm |
index fdbc3e80e90253b1f1d1fac591b9c29f2265f5e4..b5bfb1eabe4908c8c91f0841c98e448e8f0a4b8f 100644 |
--- a/chrome/browser/ui/cocoa/fast_resize_view.mm |
+++ b/chrome/browser/ui/cocoa/fast_resize_view.mm |
@@ -10,23 +10,6 @@ |
#include "base/mac/scoped_nsobject.h" |
#include "ui/base/cocoa/animation_utils.h" |
-namespace { |
- |
-// The radius of the rounded corners. |
-const CGFloat kRoundedCornerRadius = 4; |
- |
-} // namespace |
- |
-@interface FastResizeView (PrivateMethods) |
-// Creates a path whose bottom two corners are rounded. |
-// Caller takes ownership of the path. |
-- (CGPathRef)createRoundedBottomCornersPath:(NSSize)size; |
- |
-// Updates the path of the layer mask to reflect the current value of |
-// roundedBottomCorners_. |
-- (void)updateLayerMask; |
-@end |
- |
@implementation FastResizeView |
- (id)initWithFrame:(NSRect)frameRect { |
@@ -36,9 +19,6 @@ const CGFloat kRoundedCornerRadius = 4; |
[layer setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)]; |
[self setLayer:layer]; |
[self setWantsLayer:YES]; |
- |
- roundedBottomCorners_ = YES; |
- [self updateLayerMask]; |
} |
return self; |
} |
@@ -47,77 +27,5 @@ const CGFloat kRoundedCornerRadius = 4; |
return YES; |
} |
-- (void)setRoundedBottomCorners:(BOOL)roundedBottomCorners { |
- if (roundedBottomCorners == roundedBottomCorners_) |
- return; |
- |
- roundedBottomCorners_ = roundedBottomCorners; |
- [self updateLayerMask]; |
-} |
- |
-// Every time the frame's size changes, the layer mask needs to be updated. |
-- (void)setFrameSize:(NSSize)newSize { |
- [super setFrameSize:newSize]; |
- [self updateLayerMask]; |
-} |
- |
@end |
-@implementation FastResizeView (PrivateMethods) |
- |
-- (CGPathRef)createRoundedBottomCornersPath:(NSSize)size { |
- CGMutablePathRef path = CGPathCreateMutable(); |
- CGFloat width = size.width; |
- CGFloat height = size.height; |
- CGFloat cornerRadius = kRoundedCornerRadius; |
- |
- // Top left corner. |
- CGPathMoveToPoint(path, NULL, 0, height); |
- |
- // Top right corner. |
- CGPathAddLineToPoint(path, NULL, width, height); |
- |
- // Bottom right corner. |
- CGPathAddArc(path, |
- NULL, |
- width - cornerRadius, |
- cornerRadius, |
- cornerRadius, |
- 0, |
- -M_PI_2, |
- true); |
- |
- // Bottom left corner. |
- CGPathAddArc(path, |
- NULL, |
- cornerRadius, |
- cornerRadius, |
- cornerRadius, |
- -M_PI_2, |
- -M_PI, |
- true); |
- |
- // Draw line back to top-left corner. |
- CGPathAddLineToPoint(path, NULL, 0, height); |
- CGPathCloseSubpath(path); |
- return path; |
-} |
- |
-- (void)updateLayerMask { |
- if (!roundedBottomCorners_) { |
- [self layer].mask = nil; |
- layerMask_ = nil; |
- return; |
- } |
- |
- if (![self layer].mask) { |
- layerMask_ = [CAShapeLayer layer]; |
- [self layer].mask = layerMask_; |
- } |
- |
- CGPathRef path = [self createRoundedBottomCornersPath:self.bounds.size]; |
- layerMask_.path = path; |
- CGPathRelease(path); |
-} |
- |
-@end |