| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2009 Google, Inc. | 3 * Copyright (C) 2008, 2009 Google, Inc. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 includeFocus:(BOOL)includeFocus; | 84 includeFocus:(BOOL)includeFocus; |
| 85 @end | 85 @end |
| 86 | 86 |
| 87 @implementation BlinkTextFieldCell | 87 @implementation BlinkTextFieldCell |
| 88 - (CFDictionaryRef)_coreUIDrawOptionsWithFrame:(NSRect)cellFrame | 88 - (CFDictionaryRef)_coreUIDrawOptionsWithFrame:(NSRect)cellFrame |
| 89 inView:(NSView*)controlView | 89 inView:(NSView*)controlView |
| 90 includeFocus:(BOOL)includeFocus { | 90 includeFocus:(BOOL)includeFocus { |
| 91 // FIXME: This is a post-Lion-only workaround for <rdar://problem/11385461>. | 91 // FIXME: This is a post-Lion-only workaround for <rdar://problem/11385461>. |
| 92 // When that bug is resolved, we should remove this code. | 92 // When that bug is resolved, we should remove this code. |
| 93 CFMutableDictionaryRef coreUIDrawOptions = CFDictionaryCreateMutableCopy( | 93 CFMutableDictionaryRef coreUIDrawOptions = CFDictionaryCreateMutableCopy( |
| 94 NULL, 0, [super _coreUIDrawOptionsWithFrame:cellFrame | 94 NULL, 0, |
| 95 inView:controlView | 95 [super _coreUIDrawOptionsWithFrame:cellFrame |
| 96 includeFocus:includeFocus]); | 96 inView:controlView |
| 97 includeFocus:includeFocus]); |
| 97 CFDictionarySetValue(coreUIDrawOptions, @"borders only", kCFBooleanTrue); | 98 CFDictionarySetValue(coreUIDrawOptions, @"borders only", kCFBooleanTrue); |
| 98 return (CFDictionaryRef)[NSMakeCollectable(coreUIDrawOptions) autorelease]; | 99 return (CFDictionaryRef)[NSMakeCollectable(coreUIDrawOptions) autorelease]; |
| 99 } | 100 } |
| 100 @end | 101 @end |
| 101 | 102 |
| 102 @interface BlinkFlippedView : NSView | 103 @interface BlinkFlippedView : NSView |
| 103 @end | 104 @end |
| 104 | 105 |
| 105 @implementation BlinkFlippedView | 106 @implementation BlinkFlippedView |
| 106 | 107 |
| (...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1115 } | 1116 } |
| 1116 | 1117 |
| 1117 bool LayoutThemeMac::ShouldUseFallbackTheme(const ComputedStyle& style) const { | 1118 bool LayoutThemeMac::ShouldUseFallbackTheme(const ComputedStyle& style) const { |
| 1118 ControlPart part = style.Appearance(); | 1119 ControlPart part = style.Appearance(); |
| 1119 if (part == kCheckboxPart || part == kRadioPart) | 1120 if (part == kCheckboxPart || part == kRadioPart) |
| 1120 return style.EffectiveZoom() != 1; | 1121 return style.EffectiveZoom() != 1; |
| 1121 return false; | 1122 return false; |
| 1122 } | 1123 } |
| 1123 | 1124 |
| 1124 } // namespace blink | 1125 } // namespace blink |
| OLD | NEW |