| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 } | 64 } |
| 65 | 65 |
| 66 String LayoutThemeAndroid::extraDefaultStyleSheet() | 66 String LayoutThemeAndroid::extraDefaultStyleSheet() |
| 67 { | 67 { |
| 68 return LayoutThemeDefault::extraDefaultStyleSheet() + | 68 return LayoutThemeDefault::extraDefaultStyleSheet() + |
| 69 loadResourceAsASCIIString("themeChromiumLinux.css") + | 69 loadResourceAsASCIIString("themeChromiumLinux.css") + |
| 70 loadResourceAsASCIIString("themeChromiumAndroid.css"); | 70 loadResourceAsASCIIString("themeChromiumAndroid.css"); |
| 71 | 71 |
| 72 } | 72 } |
| 73 | 73 |
| 74 void LayoutThemeAndroid::adjustInnerSpinButtonStyle(LayoutStyle& style, Element*
) const | 74 void LayoutThemeAndroid::adjustInnerSpinButtonStyle(ComputedStyle& style, Elemen
t*) const |
| 75 { | 75 { |
| 76 if (LayoutTestSupport::isRunningLayoutTest()) { | 76 if (LayoutTestSupport::isRunningLayoutTest()) { |
| 77 // Match Linux spin button style in layout tests. | 77 // Match Linux spin button style in layout tests. |
| 78 // FIXME: Consider removing the conditional if a future Android theme ma
tches this. | 78 // FIXME: Consider removing the conditional if a future Android theme ma
tches this. |
| 79 IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngin
e::PartInnerSpinButton); | 79 IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngin
e::PartInnerSpinButton); |
| 80 | 80 |
| 81 style.setWidth(Length(size.width(), Fixed)); | 81 style.setWidth(Length(size.width(), Fixed)); |
| 82 style.setMinWidth(Length(size.width(), Fixed)); | 82 style.setMinWidth(Length(size.width(), Fixed)); |
| 83 } | 83 } |
| 84 } | 84 } |
| 85 | 85 |
| 86 int LayoutThemeAndroid::menuListArrowPadding() const | 86 int LayoutThemeAndroid::menuListArrowPadding() const |
| 87 { | 87 { |
| 88 // We cannot use the scrollbar thickness here, as it's width is 0 on Android
. | 88 // We cannot use the scrollbar thickness here, as it's width is 0 on Android
. |
| 89 // Instead, use the width of the scrollbar down arrow. | 89 // Instead, use the width of the scrollbar down arrow. |
| 90 IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebTheme
Engine::PartScrollbarDownArrow); | 90 IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebTheme
Engine::PartScrollbarDownArrow); |
| 91 return scrollbarSize.width(); | 91 return scrollbarSize.width(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace blink | 94 } // namespace blink |
| OLD | NEW |