Index: Source/core/rendering/RenderThemeChromiumAndroid.cpp |
diff --git a/Source/core/rendering/RenderThemeChromiumAndroid.cpp b/Source/core/rendering/RenderThemeChromiumAndroid.cpp |
index 61401f1e606eff0956fe607f174ca404cb47eba0..4496ad70eb39e251834387f7733f8d0894fdf428 100644 |
--- a/Source/core/rendering/RenderThemeChromiumAndroid.cpp |
+++ b/Source/core/rendering/RenderThemeChromiumAndroid.cpp |
@@ -28,7 +28,6 @@ |
#include "core/CSSValueKeywords.h" |
#include "core/InputTypeNames.h" |
-#include "core/UserAgentStyleSheets.h" |
#include "core/rendering/PaintInfo.h" |
#include "core/rendering/RenderMediaControls.h" |
#include "core/rendering/RenderObject.h" |
@@ -38,6 +37,7 @@ |
#include "platform/graphics/Color.h" |
#include "platform/scroll/ScrollbarTheme.h" |
#include "public/platform/Platform.h" |
+#include "public/platform/WebData.h" |
#include "public/platform/WebThemeEngine.h" |
#include "wtf/StdLibExtras.h" |
@@ -60,13 +60,18 @@ RenderThemeChromiumAndroid::~RenderThemeChromiumAndroid() |
String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet() |
{ |
- return String(mediaControlsAndroidCss, sizeof(mediaControlsAndroidCss)); |
+ const WebData& mediaControlsAndroidCssResource = Platform::current()->loadResource("mediaControlsAndroid.css"); |
+ String mediaControlsAndroidRules = mediaControlsAndroidCssResource.toASCIIString(); |
+ ASSERT(!mediaControlsAndroidRules.isEmpty()); |
+ return mediaControlsAndroidRules; |
} |
String RenderThemeChromiumAndroid::extraDefaultStyleSheet() |
{ |
- return RenderThemeChromiumDefault::extraDefaultStyleSheet() + |
- String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss)); |
+ const WebData& themeChromiumAndroidCssResource = Platform::current()->loadResource("themeChromiumAndroid.css"); |
+ String themeChromiumAndroidRules = themeChromiumAndroidCssResource.toASCIIString(); |
+ ASSERT(!themeChromiumAndroidRules.isEmpty()); |
+ return RenderThemeChromiumDefault::extraDefaultStyleSheet() + themeChromiumAndroidRules; |
} |
void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style, Element*) const |