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

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: Created 6 years, 4 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 * 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"
35 #include "platform/graphics/GraphicsContext.h" 34 #include "platform/graphics/GraphicsContext.h"
36 #include "platform/graphics/Image.h" 35 #include "platform/graphics/Image.h"
37 #include "platform/scroll/ScrollbarTheme.h" 36 #include "platform/scroll/ScrollbarTheme.h"
37 #include "public/platform/Platform.h"
38 #include "public/platform/WebData.h"
38 #include "wtf/CurrentTime.h" 39 #include "wtf/CurrentTime.h"
39 #include "wtf/StdLibExtras.h" 40 #include "wtf/StdLibExtras.h"
40 41
41 namespace blink { 42 namespace blink {
42 43
43 enum PaddingType { 44 enum PaddingType {
44 TopPadding, 45 TopPadding,
45 RightPadding, 46 RightPadding,
46 BottomPadding, 47 BottomPadding,
47 LeftPadding 48 LeftPadding
(...skipping 14 matching lines...) Expand all
62 { 63 {
63 } 64 }
64 65
65 RenderThemeChromiumSkia::~RenderThemeChromiumSkia() 66 RenderThemeChromiumSkia::~RenderThemeChromiumSkia()
66 { 67 {
67 } 68 }
68 69
69 // Use the Windows style sheets to match their metrics. 70 // Use the Windows style sheets to match their metrics.
70 String RenderThemeChromiumSkia::extraDefaultStyleSheet() 71 String RenderThemeChromiumSkia::extraDefaultStyleSheet()
71 { 72 {
72 return RenderTheme::extraDefaultStyleSheet() + 73 const WebData& themeWinCssResource = Platform::current()->loadResource("them eWin.css");
73 String(themeWinCss, sizeof(themeWinCss)) + 74 String themeWinRules = themeWinCssResource.toASCIIString();
74 String(themeChromiumSkiaCss, sizeof(themeChromiumSkiaCss)) + 75 ASSERT(!themeWinRules.isEmpty());
75 String(themeChromiumCss, sizeof(themeChromiumCss)); 76
77 const WebData& themeChromiumSkiaCssResource = Platform::current()->loadResou rce("themeChromiumSkia.css");
78 String themeChromiumSkiaRules = themeChromiumSkiaCssResource.toASCIIString() ;
79 ASSERT(!themeChromiumSkiaRules.isEmpty());
80
81 const WebData& themeChromiumCssResource = Platform::current()->loadResource( "themeChromium.css");
82 String themeChromiumRules = themeChromiumCssResource.toASCIIString();
83 ASSERT(!themeChromiumRules.isEmpty());
84
85 return RenderTheme::extraDefaultStyleSheet() + themeWinRules + themeChromium SkiaRules + themeChromiumRules;
76 } 86 }
77 87
78 String RenderThemeChromiumSkia::extraQuirksStyleSheet() 88 String RenderThemeChromiumSkia::extraQuirksStyleSheet()
79 { 89 {
80 return String(themeWinQuirksCss, sizeof(themeWinQuirksCss)); 90 const WebData& themeWinQuirksCssResource = Platform::current()->loadResource ("themeWinQuirks.css");
91 String themeWinQuirksRules = themeWinQuirksCssResource.toASCIIString();
92 ASSERT(!themeWinQuirksRules.isEmpty());
93 return themeWinQuirksRules;
81 } 94 }
82 95
83 bool RenderThemeChromiumSkia::supportsHover(const RenderStyle* style) const 96 bool RenderThemeChromiumSkia::supportsHover(const RenderStyle* style) const
84 { 97 {
85 return true; 98 return true;
86 } 99 }
87 100
88 bool RenderThemeChromiumSkia::supportsFocusRing(const RenderStyle* style) const 101 bool RenderThemeChromiumSkia::supportsFocusRing(const RenderStyle* style) const
89 { 102 {
90 // This causes WebKit to draw the focus rings for us. 103 // This causes WebKit to draw the focus rings for us.
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 } 494 }
482 495
483 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope() 496 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope()
484 { 497 {
485 if (!m_needsFlipping) 498 if (!m_needsFlipping)
486 return; 499 return;
487 m_paintInfo.context->restore(); 500 m_paintInfo.context->restore();
488 } 501 }
489 502
490 } // namespace blink 503 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698