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

Side by Side Diff: Source/core/rendering/RenderThemeChromiumDefault.cpp

Issue 573553002: Move the user agent styles sheets to blink_resources.grd (Part 3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase! Created 5 years, 11 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) 2007 Apple Inc. 2 * Copyright (C) 2007 Apple Inc.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2008 Collabora Ltd. 4 * Copyright (C) 2008 Collabora Ltd.
5 * Copyright (C) 2008, 2009 Google Inc. 5 * Copyright (C) 2008, 2009 Google Inc.
6 * Copyright (C) 2009 Kenneth Rohde Christiansen 6 * Copyright (C) 2009 Kenneth Rohde Christiansen
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIB. If not, write to 19 * along with this library; see the file COPYING.LIB. If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 * 22 *
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "core/rendering/RenderThemeChromiumDefault.h" 26 #include "core/rendering/RenderThemeChromiumDefault.h"
27 27
28 #include "core/CSSValueKeywords.h" 28 #include "core/CSSValueKeywords.h"
29 #include "core/UserAgentStyleSheets.h"
30 #include "core/rendering/PaintInfo.h" 29 #include "core/rendering/PaintInfo.h"
31 #include "core/rendering/RenderObject.h" 30 #include "core/rendering/RenderObject.h"
32 #include "core/rendering/RenderProgress.h" 31 #include "core/rendering/RenderProgress.h"
33 #include "platform/LayoutTestSupport.h" 32 #include "platform/LayoutTestSupport.h"
33 #include "platform/PlatformResourceLoader.h"
34 #include "platform/graphics/Color.h" 34 #include "platform/graphics/Color.h"
35 #include "platform/graphics/GraphicsContext.h" 35 #include "platform/graphics/GraphicsContext.h"
36 #include "platform/graphics/GraphicsContextStateSaver.h" 36 #include "platform/graphics/GraphicsContextStateSaver.h"
37 #include "public/platform/Platform.h" 37 #include "public/platform/Platform.h"
38 #include "public/platform/WebRect.h" 38 #include "public/platform/WebRect.h"
39 #include "public/platform/WebThemeEngine.h" 39 #include "public/platform/WebThemeEngine.h"
40 #include "wtf/StdLibExtras.h" 40 #include "wtf/StdLibExtras.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 } 108 }
109 if (cssValueId == CSSValueMenu) 109 if (cssValueId == CSSValueMenu)
110 return defaultMenuColor; 110 return defaultMenuColor;
111 return RenderTheme::systemColor(cssValueId); 111 return RenderTheme::systemColor(cssValueId);
112 } 112 }
113 113
114 String RenderThemeChromiumDefault::extraDefaultStyleSheet() 114 String RenderThemeChromiumDefault::extraDefaultStyleSheet()
115 { 115 {
116 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) 116 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
117 return RenderThemeChromiumSkia::extraDefaultStyleSheet() 117 return RenderThemeChromiumSkia::extraDefaultStyleSheet()
118 + String(themeInputMultipleFieldsCss, sizeof(themeInputMultipleFieldsCss )); 118 + loadResourceAsASCIIString("themeInputMultipleFields.css");
119 #else 119 #else
120 return RenderThemeChromiumSkia::extraDefaultStyleSheet(); 120 return RenderThemeChromiumSkia::extraDefaultStyleSheet();
121 #endif 121 #endif
122 } 122 }
123 123
124 Color RenderThemeChromiumDefault::activeListBoxSelectionBackgroundColor() const 124 Color RenderThemeChromiumDefault::activeListBoxSelectionBackgroundColor() const
125 { 125 {
126 return Color(0x28, 0x28, 0x28); 126 return Color(0x28, 0x28, 0x28);
127 } 127 }
128 128
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 if (useMockTheme()) { 494 if (useMockTheme()) {
495 // The mock theme can't handle zoomed controls, so we fall back to the " fallback" theme. 495 // The mock theme can't handle zoomed controls, so we fall back to the " fallback" theme.
496 ControlPart part = style->appearance(); 496 ControlPart part = style->appearance();
497 if (part == CheckboxPart || part == RadioPart) 497 if (part == CheckboxPart || part == RadioPart)
498 return style->effectiveZoom() != 1; 498 return style->effectiveZoom() != 1;
499 } 499 }
500 return RenderTheme::shouldUseFallbackTheme(style); 500 return RenderTheme::shouldUseFallbackTheme(style);
501 } 501 }
502 502
503 } // namespace blink 503 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumAndroid.cpp ('k') | Source/core/rendering/RenderThemeChromiumLinux.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698