| 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 860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 871 NSPopUpButtonCell* popupButton = this->popupButton(); | 871 NSPopUpButtonCell* popupButton = this->popupButton(); |
| 872 | 872 |
| 873 // Set the control size based off the rectangle we're painting into. | 873 // Set the control size based off the rectangle we're painting into. |
| 874 setControlSize(popupButton, popupButtonSizes(), r.size(), o->style()->effect
iveZoom()); | 874 setControlSize(popupButton, popupButtonSizes(), r.size(), o->style()->effect
iveZoom()); |
| 875 | 875 |
| 876 // Update the various states we respond to. | 876 // Update the various states we respond to. |
| 877 updateActiveState(popupButton, o); | 877 updateActiveState(popupButton, o); |
| 878 updateCheckedState(popupButton, o); | 878 updateCheckedState(popupButton, o); |
| 879 updateEnabledState(popupButton, o); | 879 updateEnabledState(popupButton, o); |
| 880 updatePressedState(popupButton, o); | 880 updatePressedState(popupButton, o); |
| 881 #if BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING | |
| 882 updateFocusedState(popupButton, o); | 881 updateFocusedState(popupButton, o); |
| 883 #endif | |
| 884 } | 882 } |
| 885 | 883 |
| 886 const IntSize* LayoutThemeMac::menuListSizes() const | 884 const IntSize* LayoutThemeMac::menuListSizes() const |
| 887 { | 885 { |
| 888 static const IntSize sizes[3] = { IntSize(9, 0), IntSize(5, 0), IntSize(0, 0
) }; | 886 static const IntSize sizes[3] = { IntSize(9, 0), IntSize(5, 0), IntSize(0, 0
) }; |
| 889 return sizes; | 887 return sizes; |
| 890 } | 888 } |
| 891 | 889 |
| 892 int LayoutThemeMac::minimumMenuListSize(const ComputedStyle& style) const | 890 int LayoutThemeMac::minimumMenuListSize(const ComputedStyle& style) const |
| 893 { | 891 { |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 | 1166 |
| 1169 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const | 1167 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const |
| 1170 { | 1168 { |
| 1171 ControlPart part = style.appearance(); | 1169 ControlPart part = style.appearance(); |
| 1172 if (part == CheckboxPart || part == RadioPart) | 1170 if (part == CheckboxPart || part == RadioPart) |
| 1173 return style.effectiveZoom() != 1; | 1171 return style.effectiveZoom() != 1; |
| 1174 return false; | 1172 return false; |
| 1175 } | 1173 } |
| 1176 | 1174 |
| 1177 } // namespace blink | 1175 } // namespace blink |
| OLD | NEW |