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

Side by Side Diff: Source/platform/mac/WebCoreNSCellExtras.mm

Issue 1184073004: Revert of Check if drawFocusRingMaskWithFrame:inView: exists when drawing focus ring (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/mac/WebCoreNSCellExtras.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #import "platform/mac/WebCoreNSCellExtras.h" 26 #import "platform/mac/WebCoreNSCellExtras.h"
27 27
28 #if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
29
28 @implementation NSCell (WebCoreFocusRingDrawing) 30 @implementation NSCell (WebCoreFocusRingDrawing)
29 31
30 - (void)cr_drawFocusRingWithFrame:(NSRect)cellFrame inView:(NSView *)controlView 32 - (void)_web_drawFocusRingWithFrame:(NSRect)cellFrame inView:(NSView *)controlVi ew
31 { 33 {
32 // FIXME: Remove this check when we drop support for Mac OS X 10.6
33 if (![self respondsToSelector:@selector(drawFocusRingMaskWithFrame:inView:)] )
34 return;
35 CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] g raphicsPort]; 34 CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] g raphicsPort];
36 CGContextSaveGState(cgContext); 35 CGContextSaveGState(cgContext);
37 NSSetFocusRingStyle(NSFocusRingOnly); 36 NSSetFocusRingStyle(NSFocusRingOnly);
38 CGContextBeginTransparencyLayerWithRect(cgContext, NSRectToCGRect(cellFrame) , 0); 37 CGContextBeginTransparencyLayerWithRect(cgContext, NSRectToCGRect(cellFrame) , 0);
39 [self drawFocusRingMaskWithFrame:cellFrame inView:controlView]; 38 [self drawFocusRingMaskWithFrame:cellFrame inView:controlView];
40 CGContextEndTransparencyLayer(cgContext); 39 CGContextEndTransparencyLayer(cgContext);
41 CGContextRestoreGState(cgContext); 40 CGContextRestoreGState(cgContext);
42 } 41 }
43 42
44 @end 43 @end
44
45 #endif // !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
OLDNEW
« no previous file with comments | « Source/platform/mac/WebCoreNSCellExtras.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698