| Index: Source/core/rendering/RenderThemeChromiumSkia.cpp
|
| diff --git a/Source/core/rendering/RenderThemeChromiumSkia.cpp b/Source/core/rendering/RenderThemeChromiumSkia.cpp
|
| index b2e10ca97a2324f6e38b21943fae8c0b0b960b1e..583849567848beaaeb64d84f70c03b4c0b4afa61 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
|
|
|