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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderThemeChromiumSkia.cpp
diff --git a/Source/core/rendering/RenderThemeChromiumSkia.cpp b/Source/core/rendering/RenderThemeChromiumSkia.cpp
index 1ad61a6d3849942cd849cf51e1a95b6302fc363e..aab89cb11706485d625bf770ac633fd36eb17b45 100644
--- a/Source/core/rendering/RenderThemeChromiumSkia.cpp
+++ b/Source/core/rendering/RenderThemeChromiumSkia.cpp
@@ -24,7 +24,6 @@
#include "config.h"
#include "core/rendering/RenderThemeChromiumSkia.h"
-#include "core/UserAgentStyleSheets.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderBox.h"
#include "core/rendering/RenderMediaControls.h"
@@ -35,6 +34,8 @@
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/Image.h"
#include "platform/scroll/ScrollbarTheme.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebData.h"
#include "wtf/CurrentTime.h"
#include "wtf/StdLibExtras.h"
@@ -69,15 +70,27 @@ RenderThemeChromiumSkia::~RenderThemeChromiumSkia()
// Use the Windows style sheets to match their metrics.
String RenderThemeChromiumSkia::extraDefaultStyleSheet()
{
- return RenderTheme::extraDefaultStyleSheet() +
- String(themeWinCss, sizeof(themeWinCss)) +
- String(themeChromiumSkiaCss, sizeof(themeChromiumSkiaCss)) +
- String(themeChromiumCss, sizeof(themeChromiumCss));
+ const WebData& themeWinCssResource = Platform::current()->loadResource("themeWin.css");
+ String themeWinRules = themeWinCssResource.toASCIIString();
+ ASSERT(!themeWinRules.isEmpty());
+
+ const WebData& themeChromiumSkiaCssResource = Platform::current()->loadResource("themeChromiumSkia.css");
+ String themeChromiumSkiaRules = themeChromiumSkiaCssResource.toASCIIString();
+ ASSERT(!themeChromiumSkiaRules.isEmpty());
+
+ const WebData& themeChromiumCssResource = Platform::current()->loadResource("themeChromium.css");
+ String themeChromiumRules = themeChromiumCssResource.toASCIIString();
+ ASSERT(!themeChromiumRules.isEmpty());
+
+ return RenderTheme::extraDefaultStyleSheet() + themeWinRules + themeChromiumSkiaRules + themeChromiumRules;
}
String RenderThemeChromiumSkia::extraQuirksStyleSheet()
{
- return String(themeWinQuirksCss, sizeof(themeWinQuirksCss));
+ const WebData& themeWinQuirksCssResource = Platform::current()->loadResource("themeWinQuirks.css");
+ String themeWinQuirksRules = themeWinQuirksCssResource.toASCIIString();
+ ASSERT(!themeWinQuirksRules.isEmpty());
+ return themeWinQuirksRules;
}
bool RenderThemeChromiumSkia::supportsHover(const RenderStyle* style) const

Powered by Google App Engine
This is Rietveld 408576698