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

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

Issue 438843004: 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: Rebased patch Created 6 years, 3 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
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumMac.mm ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 * 21 *
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/rendering/RenderThemeChromiumSkia.h" 25 #include "core/rendering/RenderThemeChromiumSkia.h"
26 26
27 #include "core/UserAgentStyleSheets.h"
28 #include "core/rendering/PaintInfo.h" 27 #include "core/rendering/PaintInfo.h"
29 #include "core/rendering/RenderBox.h" 28 #include "core/rendering/RenderBox.h"
30 #include "core/rendering/RenderMediaControls.h" 29 #include "core/rendering/RenderMediaControls.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 "core/rendering/RenderThemeChromiumFontProvider.h" 32 #include "core/rendering/RenderThemeChromiumFontProvider.h"
34 #include "platform/LayoutTestSupport.h" 33 #include "platform/LayoutTestSupport.h"
34 #include "platform/PlatformResourceLoader.h"
35 #include "platform/graphics/GraphicsContext.h" 35 #include "platform/graphics/GraphicsContext.h"
36 #include "platform/graphics/Image.h" 36 #include "platform/graphics/Image.h"
37 #include "platform/scroll/ScrollbarTheme.h" 37 #include "platform/scroll/ScrollbarTheme.h"
38 #include "wtf/CurrentTime.h" 38 #include "wtf/CurrentTime.h"
39 #include "wtf/StdLibExtras.h" 39 #include "wtf/StdLibExtras.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 enum PaddingType { 43 enum PaddingType {
44 TopPadding, 44 TopPadding,
(...skipping 18 matching lines...) Expand all
63 } 63 }
64 64
65 RenderThemeChromiumSkia::~RenderThemeChromiumSkia() 65 RenderThemeChromiumSkia::~RenderThemeChromiumSkia()
66 { 66 {
67 } 67 }
68 68
69 // Use the Windows style sheets to match their metrics. 69 // Use the Windows style sheets to match their metrics.
70 String RenderThemeChromiumSkia::extraDefaultStyleSheet() 70 String RenderThemeChromiumSkia::extraDefaultStyleSheet()
71 { 71 {
72 return RenderTheme::extraDefaultStyleSheet() + 72 return RenderTheme::extraDefaultStyleSheet() +
73 String(themeWinCss, sizeof(themeWinCss)) + 73 loadResourceAsASCIIString("themeWin.css") +
74 String(themeChromiumSkiaCss, sizeof(themeChromiumSkiaCss)) + 74 loadResourceAsASCIIString("themeChromiumSkia.css") +
75 String(themeChromiumCss, sizeof(themeChromiumCss)); 75 loadResourceAsASCIIString("themeChromium.css");
76 } 76 }
77 77
78 String RenderThemeChromiumSkia::extraQuirksStyleSheet() 78 String RenderThemeChromiumSkia::extraQuirksStyleSheet()
79 { 79 {
80 return String(themeWinQuirksCss, sizeof(themeWinQuirksCss)); 80 return loadResourceAsASCIIString("themeWinQuirks.css");
81 } 81 }
82 82
83 bool RenderThemeChromiumSkia::supportsHover(const RenderStyle* style) const 83 bool RenderThemeChromiumSkia::supportsHover(const RenderStyle* style) const
84 { 84 {
85 return true; 85 return true;
86 } 86 }
87 87
88 bool RenderThemeChromiumSkia::supportsFocusRing(const RenderStyle* style) const 88 bool RenderThemeChromiumSkia::supportsFocusRing(const RenderStyle* style) const
89 { 89 {
90 // This causes WebKit to draw the focus rings for us. 90 // This causes WebKit to draw the focus rings for us.
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 } 481 }
482 482
483 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope() 483 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope()
484 { 484 {
485 if (!m_needsFlipping) 485 if (!m_needsFlipping)
486 return; 486 return;
487 m_paintInfo.context->restore(); 487 m_paintInfo.context->restore();
488 } 488 }
489 489
490 } // namespace blink 490 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumMac.mm ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698