| 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 10 matching lines...) Expand all Loading... |
| 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/rendering/RenderThemeChromiumAndroid.h" | 27 #include "core/rendering/RenderThemeChromiumAndroid.h" |
| 28 | 28 |
| 29 #include "core/CSSValueKeywords.h" | 29 #include "core/CSSValueKeywords.h" |
| 30 #include "core/InputTypeNames.h" | 30 #include "core/InputTypeNames.h" |
| 31 #include "core/UserAgentStyleSheets.h" | |
| 32 #include "core/layout/LayoutSlider.h" | 31 #include "core/layout/LayoutSlider.h" |
| 33 #include "core/rendering/PaintInfo.h" | 32 #include "core/rendering/PaintInfo.h" |
| 34 #include "core/rendering/RenderMediaControls.h" | 33 #include "core/rendering/RenderMediaControls.h" |
| 35 #include "core/rendering/RenderObject.h" | 34 #include "core/rendering/RenderObject.h" |
| 36 #include "core/rendering/RenderProgress.h" | 35 #include "core/rendering/RenderProgress.h" |
| 37 #include "platform/LayoutTestSupport.h" | 36 #include "platform/LayoutTestSupport.h" |
| 37 #include "platform/PlatformResourceLoader.h" |
| 38 #include "platform/graphics/Color.h" | 38 #include "platform/graphics/Color.h" |
| 39 #include "platform/scroll/ScrollbarTheme.h" | 39 #include "platform/scroll/ScrollbarTheme.h" |
| 40 #include "public/platform/Platform.h" | 40 #include "public/platform/Platform.h" |
| 41 #include "public/platform/WebThemeEngine.h" | 41 #include "public/platform/WebThemeEngine.h" |
| 42 #include "wtf/StdLibExtras.h" | 42 #include "wtf/StdLibExtras.h" |
| 43 | 43 |
| 44 namespace blink { | 44 namespace blink { |
| 45 | 45 |
| 46 PassRefPtr<RenderTheme> RenderThemeChromiumAndroid::create() | 46 PassRefPtr<RenderTheme> RenderThemeChromiumAndroid::create() |
| 47 { | 47 { |
| 48 return adoptRef(new RenderThemeChromiumAndroid()); | 48 return adoptRef(new RenderThemeChromiumAndroid()); |
| 49 } | 49 } |
| 50 | 50 |
| 51 RenderTheme& RenderTheme::theme() | 51 RenderTheme& RenderTheme::theme() |
| 52 { | 52 { |
| 53 DEFINE_STATIC_REF(RenderTheme, renderTheme, (RenderThemeChromiumAndroid::cre
ate())); | 53 DEFINE_STATIC_REF(RenderTheme, renderTheme, (RenderThemeChromiumAndroid::cre
ate())); |
| 54 return *renderTheme; | 54 return *renderTheme; |
| 55 } | 55 } |
| 56 | 56 |
| 57 RenderThemeChromiumAndroid::~RenderThemeChromiumAndroid() | 57 RenderThemeChromiumAndroid::~RenderThemeChromiumAndroid() |
| 58 { | 58 { |
| 59 } | 59 } |
| 60 | 60 |
| 61 String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet() | 61 String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet() |
| 62 { | 62 { |
| 63 return String(mediaControlsAndroidCss, sizeof(mediaControlsAndroidCss)); | 63 return loadResourceAsASCIIString("mediaControlsAndroid.css"); |
| 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 loadResourceAsASCIIString("themeChromiumLinux.css") + |
| 70 String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss)); | 70 loadResourceAsASCIIString("themeChromiumAndroid.css"); |
| 71 |
| 71 } | 72 } |
| 72 | 73 |
| 73 void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style,
Element*) const | 74 void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style,
Element*) const |
| 74 { | 75 { |
| 75 if (LayoutTestSupport::isRunningLayoutTest()) { | 76 if (LayoutTestSupport::isRunningLayoutTest()) { |
| 76 // Match Linux spin button style in layout tests. | 77 // Match Linux spin button style in layout tests. |
| 77 // 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. |
| 78 IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngin
e::PartInnerSpinButton); | 79 IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngin
e::PartInnerSpinButton); |
| 79 | 80 |
| 80 style->setWidth(Length(size.width(), Fixed)); | 81 style->setWidth(Length(size.width(), Fixed)); |
| 81 style->setMinWidth(Length(size.width(), Fixed)); | 82 style->setMinWidth(Length(size.width(), Fixed)); |
| 82 } | 83 } |
| 83 } | 84 } |
| 84 | 85 |
| 85 int RenderThemeChromiumAndroid::menuListArrowPadding() const | 86 int RenderThemeChromiumAndroid::menuListArrowPadding() const |
| 86 { | 87 { |
| 87 // 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
. |
| 88 // Instead, use the width of the scrollbar down arrow. | 89 // Instead, use the width of the scrollbar down arrow. |
| 89 IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebTheme
Engine::PartScrollbarDownArrow); | 90 IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebTheme
Engine::PartScrollbarDownArrow); |
| 90 return scrollbarSize.width(); | 91 return scrollbarSize.width(); |
| 91 } | 92 } |
| 92 | 93 |
| 93 } // namespace blink | 94 } // namespace blink |
| OLD | NEW |