| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 } | 59 } |
| 60 | 60 |
| 61 String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet() | 61 String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet() |
| 62 { | 62 { |
| 63 return String(mediaControlsAndroidCss, sizeof(mediaControlsAndroidCss)); | 63 return String(mediaControlsAndroidCss, sizeof(mediaControlsAndroidCss)); |
| 64 } | 64 } |
| 65 | 65 |
| 66 String RenderThemeChromiumAndroid::extraDefaultStyleSheet() | 66 String RenderThemeChromiumAndroid::extraDefaultStyleSheet() |
| 67 { | 67 { |
| 68 return RenderThemeChromiumDefault::extraDefaultStyleSheet() + | 68 return RenderThemeChromiumDefault::extraDefaultStyleSheet() + |
| 69 String(themeChromiumLinuxCss, sizeof(themeChromiumLinuxCss)) + |
| 69 String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss)); | 70 String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss)); |
| 70 } | 71 } |
| 71 | 72 |
| 72 void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style,
Element*) const | 73 void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style,
Element*) const |
| 73 { | 74 { |
| 74 if (LayoutTestSupport::isRunningLayoutTest()) { | 75 if (LayoutTestSupport::isRunningLayoutTest()) { |
| 75 // Match Linux spin button style in layout tests. | 76 // Match Linux spin button style in layout tests. |
| 76 // FIXME: Consider removing the conditional if a future Android theme ma
tches this. | 77 // FIXME: Consider removing the conditional if a future Android theme ma
tches this. |
| 77 IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngin
e::PartInnerSpinButton); | 78 IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngin
e::PartInnerSpinButton); |
| 78 | 79 |
| 79 style->setWidth(Length(size.width(), Fixed)); | 80 style->setWidth(Length(size.width(), Fixed)); |
| 80 style->setMinWidth(Length(size.width(), Fixed)); | 81 style->setMinWidth(Length(size.width(), Fixed)); |
| 81 } | 82 } |
| 82 } | 83 } |
| 83 | 84 |
| 84 int RenderThemeChromiumAndroid::menuListArrowPadding() const | 85 int RenderThemeChromiumAndroid::menuListArrowPadding() const |
| 85 { | 86 { |
| 86 // We cannot use the scrollbar thickness here, as it's width is 0 on Android
. | 87 // We cannot use the scrollbar thickness here, as it's width is 0 on Android
. |
| 87 // Instead, use the width of the scrollbar down arrow. | 88 // Instead, use the width of the scrollbar down arrow. |
| 88 IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebTheme
Engine::PartScrollbarDownArrow); | 89 IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebTheme
Engine::PartScrollbarDownArrow); |
| 89 return scrollbarSize.width(); | 90 return scrollbarSize.width(); |
| 90 } | 91 } |
| 91 | 92 |
| 92 } // namespace blink | 93 } // namespace blink |
| OLD | NEW |