| OLD | NEW |
| 1 /** | 1 /** |
| 2 * This file is part of the theme implementation for form controls in WebCore. | 2 * This file is part of the theme implementation for form controls in WebCore. |
| 3 * | 3 * |
| 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. | 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 (LayoutThemeMobile::create())); | 70 (LayoutThemeMobile::create())); |
| 71 return *layoutThemeMobile; | 71 return *layoutThemeMobile; |
| 72 } | 72 } |
| 73 return nativeTheme(); | 73 return nativeTheme(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 LayoutTheme::LayoutTheme(Theme* platformTheme) | 76 LayoutTheme::LayoutTheme(Theme* platformTheme) |
| 77 : m_hasCustomFocusRingColor(false), m_platformTheme(platformTheme) {} | 77 : m_hasCustomFocusRingColor(false), m_platformTheme(platformTheme) {} |
| 78 | 78 |
| 79 void LayoutTheme::adjustStyle(ComputedStyle& style, Element* e) { | 79 void LayoutTheme::adjustStyle(ComputedStyle& style, Element* e) { |
| 80 ASSERT(style.hasAppearance()); | 80 DCHECK(style.hasAppearance()); |
| 81 | 81 |
| 82 // Force inline and table display styles to be inline-block (except for table- | 82 // Force inline and table display styles to be inline-block (except for table- |
| 83 // which is block) | 83 // which is block) |
| 84 ControlPart part = style.appearance(); | 84 ControlPart part = style.appearance(); |
| 85 if (style.display() == EDisplay::kInline || | 85 if (style.display() == EDisplay::kInline || |
| 86 style.display() == EDisplay::kInlineTable || | 86 style.display() == EDisplay::kInlineTable || |
| 87 style.display() == EDisplay::kTableRowGroup || | 87 style.display() == EDisplay::kTableRowGroup || |
| 88 style.display() == EDisplay::kTableHeaderGroup || | 88 style.display() == EDisplay::kTableHeaderGroup || |
| 89 style.display() == EDisplay::kTableFooterGroup || | 89 style.display() == EDisplay::kTableFooterGroup || |
| 90 style.display() == EDisplay::kTableRow || | 90 style.display() == EDisplay::kTableRow || |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 911 // padding - not honored by WinIE, needs to be removed. | 911 // padding - not honored by WinIE, needs to be removed. |
| 912 style.resetPadding(); | 912 style.resetPadding(); |
| 913 | 913 |
| 914 // border - honored by WinIE, but looks terrible (just paints in the control | 914 // border - honored by WinIE, but looks terrible (just paints in the control |
| 915 // box and turns off the Windows XP theme) | 915 // box and turns off the Windows XP theme) |
| 916 // for now, we will not honor it. | 916 // for now, we will not honor it. |
| 917 style.resetBorder(); | 917 style.resetBorder(); |
| 918 } | 918 } |
| 919 | 919 |
| 920 } // namespace blink | 920 } // namespace blink |
| OLD | NEW |