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/rendering/PaintInfo.h" | 31 #include "core/rendering/PaintInfo.h" |
33 #include "core/rendering/RenderMediaControls.h" | 32 #include "core/rendering/RenderMediaControls.h" |
34 #include "core/rendering/RenderObject.h" | 33 #include "core/rendering/RenderObject.h" |
35 #include "core/rendering/RenderProgress.h" | 34 #include "core/rendering/RenderProgress.h" |
36 #include "core/rendering/RenderSlider.h" | 35 #include "core/rendering/RenderSlider.h" |
37 #include "platform/LayoutTestSupport.h" | 36 #include "platform/LayoutTestSupport.h" |
38 #include "platform/graphics/Color.h" | 37 #include "platform/graphics/Color.h" |
39 #include "platform/scroll/ScrollbarTheme.h" | 38 #include "platform/scroll/ScrollbarTheme.h" |
40 #include "public/platform/Platform.h" | 39 #include "public/platform/Platform.h" |
40 #include "public/platform/WebData.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 const blink::WebData& mediaControlsAndroidCssResource = blink::Platform::cur rent()->loadResource("mediaControlsAndroid.css"); |
64 return String(mediaControlsAndroidCssResource.data(), mediaControlsAndroidCs sResource.size()); | |
abarth-chromium
2014/08/01 19:15:15
Should we add a function to WebData that returns a
| |
64 } | 65 } |
65 | 66 |
66 String RenderThemeChromiumAndroid::extraDefaultStyleSheet() | 67 String RenderThemeChromiumAndroid::extraDefaultStyleSheet() |
67 { | 68 { |
69 const blink::WebData& themeChromiumAndroidCssResource = blink::Platform::cur rent()->loadResource("themeChromiumAndroid.css"); | |
68 return RenderThemeChromiumDefault::extraDefaultStyleSheet() + | 70 return RenderThemeChromiumDefault::extraDefaultStyleSheet() + |
69 String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss)); | 71 String(themeChromiumAndroidCssResource.data(), themeChromiumAndroidCssRe source.size()); |
70 } | 72 } |
71 | 73 |
72 void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style, Element*) const | 74 void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style, Element*) const |
73 { | 75 { |
74 if (LayoutTestSupport::isRunningLayoutTest()) { | 76 if (LayoutTestSupport::isRunningLayoutTest()) { |
75 // Match Linux spin button style in layout tests. | 77 // Match Linux spin button style in layout tests. |
76 // 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. |
77 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink: :WebThemeEngine::PartInnerSpinButton); | 79 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink: :WebThemeEngine::PartInnerSpinButton); |
78 | 80 |
79 style->setWidth(Length(size.width(), Fixed)); | 81 style->setWidth(Length(size.width(), Fixed)); |
80 style->setMinWidth(Length(size.width(), Fixed)); | 82 style->setMinWidth(Length(size.width(), Fixed)); |
81 } | 83 } |
82 } | 84 } |
83 | 85 |
84 int RenderThemeChromiumAndroid::menuListArrowPadding() const | 86 int RenderThemeChromiumAndroid::menuListArrowPadding() const |
85 { | 87 { |
86 // 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 . |
87 // Instead, use the width of the scrollbar down arrow. | 89 // Instead, use the width of the scrollbar down arrow. |
88 IntSize scrollbarSize = blink::Platform::current()->themeEngine()->getSize(b link::WebThemeEngine::PartScrollbarDownArrow); | 90 IntSize scrollbarSize = blink::Platform::current()->themeEngine()->getSize(b link::WebThemeEngine::PartScrollbarDownArrow); |
89 return scrollbarSize.width(); | 91 return scrollbarSize.width(); |
90 } | 92 } |
91 | 93 |
92 } // namespace blink | 94 } // namespace blink |
OLD | NEW |