Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp

Issue 1690493002: Switch to LayoutThemeMobile when emulating mobile device in DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Invalidate tapHighlightColor only Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
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 "core/layout/LayoutThemeAndroid.h" 26 #include "core/layout/LayoutThemeMobile.h"
27 27
28 #include "core/CSSValueKeywords.h" 28 #include "core/CSSValueKeywords.h"
29 #include "core/InputTypeNames.h" 29 #include "core/InputTypeNames.h"
30 #include "core/layout/LayoutObject.h" 30 #include "core/layout/LayoutObject.h"
31 #include "core/layout/LayoutProgress.h" 31 #include "core/layout/LayoutProgress.h"
32 #include "core/layout/LayoutSlider.h" 32 #include "core/layout/LayoutSlider.h"
33 #include "platform/LayoutTestSupport.h" 33 #include "platform/LayoutTestSupport.h"
34 #include "platform/PlatformResourceLoader.h" 34 #include "platform/PlatformResourceLoader.h"
35 #include "platform/graphics/Color.h" 35 #include "platform/graphics/Color.h"
36 #include "platform/scroll/ScrollbarTheme.h" 36 #include "platform/scroll/ScrollbarTheme.h"
37 #include "public/platform/Platform.h" 37 #include "public/platform/Platform.h"
38 #include "public/platform/WebThemeEngine.h" 38 #include "public/platform/WebThemeEngine.h"
39 #include "wtf/StdLibExtras.h" 39 #include "wtf/StdLibExtras.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 PassRefPtr<LayoutTheme> LayoutThemeAndroid::create() 43 PassRefPtr<LayoutTheme> LayoutThemeMobile::create()
44 { 44 {
45 return adoptRef(new LayoutThemeAndroid()); 45 return adoptRef(new LayoutThemeMobile());
46 } 46 }
47 47
48 LayoutTheme& LayoutTheme::theme() 48 LayoutThemeMobile::~LayoutThemeMobile()
49 {
50 DEFINE_STATIC_REF(LayoutTheme, layoutTheme, (LayoutThemeAndroid::create()));
51 return *layoutTheme;
52 }
53
54 LayoutThemeAndroid::~LayoutThemeAndroid()
55 { 49 {
56 } 50 }
57 51
58 String LayoutThemeAndroid::extraMediaControlsStyleSheet() 52 String LayoutThemeMobile::extraMediaControlsStyleSheet()
59 { 53 {
60 return loadResourceAsASCIIString( 54 return loadResourceAsASCIIString(
61 RuntimeEnabledFeatures::newMediaPlaybackUiEnabled() ? 55 RuntimeEnabledFeatures::newMediaPlaybackUiEnabled() ?
62 "mediaControlsAndroidNew.css" : "mediaControlsAndroid.css"); 56 "mediaControlsAndroidNew.css" : "mediaControlsAndroid.css");
63 } 57 }
64 58
65 String LayoutThemeAndroid::extraDefaultStyleSheet() 59 String LayoutThemeMobile::extraDefaultStyleSheet()
66 { 60 {
67 return LayoutThemeDefault::extraDefaultStyleSheet() + 61 return LayoutThemeDefault::extraDefaultStyleSheet() +
68 loadResourceAsASCIIString("themeChromiumLinux.css") + 62 loadResourceAsASCIIString("themeChromiumLinux.css") +
69 loadResourceAsASCIIString("themeChromiumAndroid.css"); 63 loadResourceAsASCIIString("themeChromiumAndroid.css");
70 64
71 } 65 }
72 66
73 void LayoutThemeAndroid::adjustInnerSpinButtonStyle(ComputedStyle& style) const 67 void LayoutThemeMobile::adjustInnerSpinButtonStyle(ComputedStyle& style) const
74 { 68 {
75 if (LayoutTestSupport::isRunningLayoutTest()) { 69 if (LayoutTestSupport::isRunningLayoutTest()) {
76 // Match Linux spin button style in layout tests. 70 // Match Linux spin button style in layout tests.
77 // FIXME: Consider removing the conditional if a future Android theme ma tches this. 71 // FIXME: Consider removing the conditional if a future Android theme ma tches this.
78 IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngin e::PartInnerSpinButton); 72 IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngin e::PartInnerSpinButton);
79 73
80 style.setWidth(Length(size.width(), Fixed)); 74 style.setWidth(Length(size.width(), Fixed));
81 style.setMinWidth(Length(size.width(), Fixed)); 75 style.setMinWidth(Length(size.width(), Fixed));
82 } 76 }
83 } 77 }
84 78
85 } // namespace blink 79 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeMobile.h ('k') | third_party/WebKit/Source/core/layout/LayoutThemeWin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698